From fe36124d2c5731006e291850726418973ddacd6e Mon Sep 17 00:00:00 2001
From: Yukino Ikegami <yukino0131@me.com>
Date: Mon, 24 Nov 2014 00:12:19 +0900
Subject: [PATCH] v0.3.1

---
 CHANGES.rst             | 9 +++++++--
 MANIFEST.in             | 2 +-
 README.rst              | 7 ++++---
 setup.py                | 4 ++--
 shellinford/__init__.py | 4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7636458..c5da2fd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,11 +1,16 @@
-
 CHANGES
 =======
 
+0.3 (2014-11-24)
+----------------
+
+- "OR" search and "NOT" search are available in `FMIndex.search()`.
+- `FMIndex.size` and `FMIndex.docsize` are available as property
+
 0.2 (2014-03-28)
 ----------------
 
-"AND" search is available by giving Sequence (list, tuple, etc.) FMIndex.search().
+"AND" search is available by giving Sequence (list, tuple, etc.) `FMIndex.search()`
 
 0.1 (2014-03-11)
 ----------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 4d62db6..ceb7d37 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-include shellinford/src/*
+include shellinford_cpp/src/*
 include LICENSE
diff --git a/README.rst b/README.rst
index d72d664..534921d 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ Usage
 =====
 
 Create a new FM-index instance
------------------------------
+-------------------------------
 
 ::
 
@@ -76,9 +76,10 @@ Search word from FM-index
  count: 1
  text:  Milky Holmes
 
-- search(query)
+- search(query, [_or=False, ignores=[]])
 
-  - Giving Sequence data (list, tuple, etc.) enables to "AND" search
+  - If `_or` = True, then "OR" search is executed, else "AND" search
+  - Given `ignores`, "NOT" search is also executed
   - NOTE: The search function is available after FM-index is built or loaded
 
 
diff --git a/setup.py b/setup.py
index 94a2baf..3c9a2e0 100644
--- a/setup.py
+++ b/setup.py
@@ -13,12 +13,12 @@
 
 setup (
     name = 'shellinford',
-    version = '0.3',
+    version = version,
     author = "Yukino Ikegami",
     author_email='yukinoik@icloud.com',
     url='https://github.com/ikegami-yukino/shellinford-python',
     description = """Wavelet Matrix/Tree succinct data structure for full text search (using shellinford C++ library)""",
-    long_description = open('README.rst').read() + "\n\n" + open('CHANGES.rst').read(),
+    long_description = open('README.rst').read() + "\n" + open('CHANGES.rst').read(),
     keywords = ['full text search', 'FM-index', 'Wavelet Matrix'],
 
     ext_modules = [
diff --git a/shellinford/__init__.py b/shellinford/__init__.py
index 8ded874..eed8eea 100644
--- a/shellinford/__init__.py
+++ b/shellinford/__init__.py
@@ -1,7 +1,7 @@
 from . import shellinford
 
-VERSION = (0, 3)
-__version__ = '0.3'
+VERSION = (0, 3, 1)
+__version__ = '0.3.1'
 __all__ = ['FMIndex', 'bit_vector', 'bwt']
 
 FMIndex = shellinford.FMIndex