Index has proper tokens.

diff --git a/apps/search/index.py b/apps/search/index.py
index 94e6f09..318e540 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -1,13 +1,37 @@
 
 from django.conf import settings
 
 from django.conf import settings

-from lucene import SimpleFSDirectory, IndexWriter, File, Field, NumericField, PolishAnalyzer, \
-    Version, Document, JavaError, IndexSearcher, QueryParser, Term
+from lucene import SimpleFSDirectory, IndexWriter, File, Field, NumericField, \
+    Version, Document, JavaError, IndexSearcher, QueryParser, Term, PerFieldAnalyzerWrapper, \
+    SimpleAnalyzer, PolishAnalyzer, ArrayList, KeywordAnalyzer, NumericRangeQuery
+    # KeywordAnalyzer

 import os
 import errno
 from librarian import dcparser
 import os
 import errno
 from librarian import dcparser

+from librarian.parser import WLDocument

 from catalogue.models import Book
 
 
 from catalogue.models import Book
 
 

+class WLAnalyzer(PerFieldAnalyzerWrapper):
+    def __init__(self):
+        polish = PolishAnalyzer(Version.LUCENE_34)
+        simple = SimpleAnalyzer(Version.LUCENE_34)
+        keyword = KeywordAnalyzer(Version.LUCENE_34)
+        # not sure if needed: there's NOT_ANALYZED meaning basically the same
+
+        PerFieldAnalyzerWrapper.__init__(self, polish)
+
+        self.addAnalyzer("tags", simple)
+        self.addAnalyzer("technical_editors", simple)
+        self.addAnalyzer("editors", simple)
+        self.addAnalyzer("url", keyword)
+        self.addAnalyzer("source_url", keyword)
+        self.addAnalyzer("source_name", simple)
+        self.addAnalyzer("publisher", simple)
+        self.addAnalyzer("author", simple)
+
+        #self.addanalyzer("fragment_anchor", keyword)
+
+

 class IndexStore(object):
     def __init__(self):
         self.make_index_dir()
 class IndexStore(object):
     def __init__(self):
         self.make_index_dir()


@@ -23,31 +47,76 @@ class IndexStore(object):
 
 
 class Index(IndexStore):
 
 
 class Index(IndexStore):

-    def __init__(self):
+    def __init__(self, analyzer=None):

         IndexStore.__init__(self)
         self.index = None
         IndexStore.__init__(self)
         self.index = None

+        if not analyzer:
+            analyzer = WLAnalyzer()
+        self.analyzer = analyzer

 
     def open(self, analyzer=None):
 
     def open(self, analyzer=None):

-        if not analyzer:
-            analyzer = PolishAnalyzer(Version.LUCENE_34)

         if self.index:
             raise Exception("Index is already opened")
         if self.index:
             raise Exception("Index is already opened")

-        self.index = IndexWriter(self.store, analyzer, IndexWriter.MaxFieldLength.LIMITED)
+        self.index = IndexWriter(self.store, self.analyzer, IndexWriter.MaxFieldLength.LIMITED)

         return self.index
 
     def close(self):
         self.index.optimize()
         self.index.close()
         return self.index
 
     def close(self):
         self.index.optimize()
         self.index.close()

+        self.index = None

 
 

+    def remove_book(self, book):
+        q = NumericRangeQuery.newIntRange("book_id", book.id, book.id, True,True)
+        self.index.deleteDocuments(q)
+        

     def index_book(self, book, overwrite=True):
     def index_book(self, book, overwrite=True):

-        book_info = dcparser.parse(book.xml_file)
-

         if overwrite:
         if overwrite:

-            self.index.deleteDocuments(Term("id", str(book.id)))
+            self.remove_book(book)

 
 

+        doc = self.extract_metadata(book)
+        parts = self.extract_content(book)
+        block = ArrayList().of_(Document)
+        
+        try:
+            self.index.addDocument(doc)
+            for p in parts:
+                self.index.addDocument(p)                
+        except JavaError as e:
+            import nose.tools; nose.tools.set_trace()
+
+            #block.add(p)
+            #self.index.addDocuments(block)
+            
+            #        import nose.tools; nose.tools.set_trace()
+            #block.add(doc)
+
+        #        self.index.addDocuments(block)
+
+    master_tags = [
+        'opowiadanie',
+        'powiesc',
+        'dramat_wierszowany_l',
+        'dramat_wierszowany_lp',
+        'dramat_wspolczesny', 'liryka_l', 'liryka_lp',
+        'wywiad'
+        ]
+
+    def create_book_doc(self, book):
+        """
+        Create a lucene document connected to the book
+        """

         doc = Document()
         doc = Document()

-        doc.add(NumericField("id", Field.Store.YES, True).setIntValue(book.id))
+        doc.add(NumericField("book_id", Field.Store.YES, True).setIntValue(book.id))
+        if book.parent is not None:
+            doc.add(NumericField("parent_id", Field.Store.YES, True).setIntValue(book.parent.id))
+        return doc
+
+    def extract_metadata(self, book):
+        book_info = dcparser.parse(book.xml_file)
+
+        doc = self.create_book_doc(book)

         doc.add(Field("slug", book.slug, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS))
         doc.add(Field("slug", book.slug, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS))

+        doc.add(Field("tags", ','.join([t.name for t in book.tags]), Field.Store.NO, Field.Index.ANALYZED))

 
         # validator, name
         for field in dcparser.BookInfo.FIELDS:
 
         # validator, name
         for field in dcparser.BookInfo.FIELDS:


@@ -67,15 +136,81 @@ class Index(IndexStore):
                 elif type_indicator == dcparser.as_person:
                     p = getattr(book_info, field.name)
                     if isinstance(p, dcparser.Person):
                 elif type_indicator == dcparser.as_person:
                     p = getattr(book_info, field.name)
                     if isinstance(p, dcparser.Person):

-                        persons = str(p)
+                        persons = unicode(p)

                     else:
                     else:

-                        persons = ', '.join(map(str, p))
+                        persons = ', '.join(map(unicode, p))

                     doc.add(Field(field.name, persons, Field.Store.NO, Field.Index.ANALYZED))
                 elif type_indicator == dcparser.as_date:
                     dt = getattr(book_info, field.name)
                     doc.add(Field(field.name, "%04d%02d%02d" % (dt.year, dt.month, dt.day), Field.Store.NO, Field.Index.NOT_ANALYZED))
                     doc.add(Field(field.name, persons, Field.Store.NO, Field.Index.ANALYZED))
                 elif type_indicator == dcparser.as_date:
                     dt = getattr(book_info, field.name)
                     doc.add(Field(field.name, "%04d%02d%02d" % (dt.year, dt.month, dt.day), Field.Store.NO, Field.Index.NOT_ANALYZED))

-
-        self.index.addDocument(doc)
+        return doc
+
+    def get_master(self, root):
+        for master in root.iter():
+            if master.tag in self.master_tags:
+                return master
+
+    def extract_content(self, book):
+        wld = WLDocument.from_file(book.xml_file.path)
+        root = wld.edoc.getroot()
+
+        # first we build a sequence of top-level items.
+        # book_id
+        # header_index - the 0-indexed position of header element.
+        # content
+        master = self.get_master(root)
+        header_docs = []
+        for header, position in zip(list(master), range(len(master))):
+            print("header %s @%d" % (header, position))
+            doc = self.create_book_doc(book)
+            doc.add(NumericField("header_index", Field.Store.YES, True).setIntValue(position))
+            content = u' '.join([t for t in header.itertext()])
+            doc.add(Field("content", content, Field.Store.NO, Field.Index.ANALYZED))
+            header_docs.append(doc)
+
+        def walker(node):
+            yield node, None
+            for child in list(node):
+                for b, e in walker(child):
+                    yield b, e
+            yield None, node
+            return
+
+        # Then we create a document for each fragments
+        # fragment_anchor - the anchor
+        # themes - list of themes [not indexed]
+        fragment_docs = []
+        # will contain (framgent id -> { content: [], themes: [] }
+        fragments = {}
+        for start, end in walker(master):
+            print("%s %s" % (start, end))
+            if start is not None and start.tag == 'begin':
+                fid = start.attrib['id'][1:]
+                fragments[fid] = {'content': [], 'themes': []}
+                fragments[fid]['content'].append(start.tail)
+            elif start is not None and start.tag == 'motyw':
+                fid = start.attrib['id'][1:]
+                fragments[fid]['themes'].append(start.text)
+                fragments[fid]['content'].append(start.tail)
+            elif start is not None and start.tag == 'end':
+                fid = start.attrib['id'][1:]
+                frag = fragments[fid]
+                del fragments[fid]
+                print("Fragment %s complete, themes: %s contents: %s" % (fid, frag['themes'], frag['content']))
+
+                doc = self.create_book_doc(book)
+                doc.add(Field("fragment_anchor", fid, Field.Store.YES, Field.Index.NOT_ANALYZED))
+                doc.add(Field("content", u' '.join(filter(lambda s: s is not None, frag['content'])), Field.Store.NO, Field.Index.ANALYZED))
+                doc.add(Field("themes", u' '.join(frag['themes']), Field.Store.NO, Field.Index.ANALYZED))
+                fragment_docs.append(doc)
+            elif start is not None:
+                for frag in fragments.values():
+                    frag['content'].append(start.text)
+            elif end is not None:
+                for frag in fragments.values():
+                    frag['content'].append(end.tail)
+
+        return header_docs + fragment_docs

 
     def __enter__(self):
         self.open()
 
     def __enter__(self):
         self.open()


@@ -86,9 +221,10 @@ class Index(IndexStore):
 
 
 class Search(IndexStore):
 
 
 class Search(IndexStore):

-    def __init__(self, default_field="description"):
+    def __init__(self, default_field="content"):

         IndexStore.__init__(self)
         self.analyzer = PolishAnalyzer(Version.LUCENE_34)
         IndexStore.__init__(self)
         self.analyzer = PolishAnalyzer(Version.LUCENE_34)

+        ## self.analyzer = WLAnalyzer()

         self.searcher = IndexSearcher(self.store, True)
         self.parser = QueryParser(Version.LUCENE_34, default_field, self.analyzer)
 
         self.searcher = IndexSearcher(self.store, True)
         self.parser = QueryParser(Version.LUCENE_34, default_field, self.analyzer)
 


@@ -103,5 +239,6 @@ class Search(IndexStore):
         bks = []
         for found in tops.scoreDocs:
             doc = self.searcher.doc(found.doc)
         bks = []
         for found in tops.scoreDocs:
             doc = self.searcher.doc(found.doc)

-            bks.append(Book.objects.get(id=doc.get("id")))
+            bks.append(Book.objects.get(id=doc.get("book_id")))

         return (bks, tops.totalHits)
         return (bks, tops.totalHits)

+

diff --git a/apps/search/tests/index.py b/apps/search/tests/index.py
index ed02c23..c2b9110 100644 (file)
--- a/apps/search/tests/index.py
+++ b/apps/search/tests/index.py
@@ -3,6 +3,7 @@ from __future__ import with_statement
 from search import Index, Search
 from catalogue import models
 from catalogue.test_utils import WLTestCase
 from search import Index, Search
 from catalogue import models
 from catalogue.test_utils import WLTestCase

+from lucene import PolishAnalyzer, Version

 #from nose.tools import raises
 from os import path
 
 #from nose.tools import raises
 from os import path
 


@@ -14,7 +15,7 @@ class BookSearchTests(WLTestCase):
         txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
         self.book = models.Book.from_xml_file(txt)
 
         txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
         self.book = models.Book.from_xml_file(txt)
 

-        search = Index()
+        search = Index() #PolishAnalyzer(Version.LUCENE_34))

         with search:
             search.index_book(self.book)
         print "index: %s" % search
         with search:
             search.index_book(self.book)
         print "index: %s" % search