diff docs/CHANGES @ 2180:80fc914af5c8

integrated CHANGES.fpletz into main CHANGES, TODOs/unclear stuff went to MoinMoin:XapianIntegration
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 20 Jun 2007 18:02:10 +0200
parents c9a295039bf7
children 340ae0e7529e
line wrap: on
line diff
--- a/docs/CHANGES	Thu Apr 19 09:42:17 2007 +0200
+++ b/docs/CHANGES	Wed Jun 20 18:02:10 2007 +0200
@@ -49,36 +49,6 @@
       many themes!
 
 
-Branch moin-1.6-xapian:
-  /!\ This needs to be merged together with Franz' CHANGES file into the section
-      below.
-
-  New Features:
-    * Added Xapian (see http://xapian.org/) based indexed search code.
-      Our implementation is still buggy, only use it if you want to help
-      debugging it or to implement / test indexing filters (see
-      MoinMoin/filter/). To use this:
-      * Install xapian-core and xapian-bindings on your machine.
-        We used 0.9.4, but newer code should hopefully work, too.
-      * cfg.xapian_search = True
-      * Execute this to build the index:
-        $ moin ... index build   # indexes pages and attachments
-        $ moin ... index build --files=files.lst  # same plus a list of files
-        You should run those commands as the same user you use for your wiki,
-        usually this is the webserver userid, e.g.:
-        $ sudo -u www-data moin --config=... --wiki-url=wiki.example.org/ \
-               index build --files=files.lst
-  ToDo:
-    * fix/improve query parsing (xapian_term member functions)
-    * fix/improve evaluation of search result
-    * maybe add some "xapian native query" mode (can we make it working without
-      the _moinSearch post-processing (not possible as it uses the same query))
-
-  Other Changes:
-    * Removed Lupy based indexed search code. If you were brave enough to
-      use cfg.lupy_search, you maybe want to try cfg.xapian_search instead.
-
-
 Version 1.6.current:
 
   Developer notes (these should be moved to the end in the release):
@@ -182,6 +152,35 @@
       'quicklinks' which will be lost when downgrading.)
 
   New Features:
+    * Added Xapian (see http://xapian.org/) based indexed search code.
+      To use this:
+      * Install xapian-core and xapian-bindings on your machine.
+        We used 0.9.4, but newer code should hopefully work, too.
+      * cfg.xapian_search = True
+      * Execute this to build the index:
+        $ moin ... index build   # indexes pages and attachments
+        $ moin ... index build --files=files.lst  # same plus a list of files
+        You should run those commands as the same user you use for your wiki,
+        usually this is the webserver userid, e.g.:
+        $ sudo -u www-data moin --config=... --wiki-url=wiki.example.org/ \
+               index build --files=files.lst
+    * New searches:
+        - LanguageSearch: language:de
+        - CategorySearch: category:Homepage
+        - MimetypeSearch: mimetype:image/png (for attachments/files)
+        - DomainSearch: domain:underlay or domain:standard
+        - History Search: available in advanced ui
+      Note: Some currently only available when Xapian is used
+    * New config options:
+        xapian_search        0      enables xapian-powered search
+        xapian_index_dir     None   directory for xapian indices
+                                    (can be shared for wiki farms)
+        xapian_stemming      1      toggles usage of stemmer, fallback
+                                    to False if no stemmer installed
+        search_results_per_page 10  determines how many hits should be
+                                    shown on a fullsearch action
+        xapian_index_history True   indexes all revisions of pages to
+                                    allow searching in their history
     * The action menu now calls the actions for the revision of the page you
       are currently viewing. If you are viewing the current page revision, you
       get the same behaviour as in moin 1.5, but if you are viewing an old
@@ -509,6 +508,8 @@
       Reasons: it had trouble with FCKEditor and was not updated since a longer
                time. OTOH, Microsoft released IE7. And there are lots of
                other and better browsers anyway.
+    * Removed Lupy based indexed search code. If you were brave enough to
+      use cfg.lupy_search, you maybe want to try cfg.xapian_search instead.
 
 
 Version 1.5.current: