Solr doit tout retourner (pour l'instant).

[Plinn.git] / catalog.py

diff --git a/catalog.py b/catalog.py
index 382fc57..da1e4cc 100644 (file)
--- a/catalog.py
+++ b/catalog.py
@@ -11,6 +11,13 @@ from Products.ZCatalog.Catalog import Catalog
 import transaction
 from solr import *
 
 import transaction
 from solr import *
 

+# imports for Catalog class
+from Products.PluginIndexes.interfaces import ILimitedResultIndex
+from Products.ZCatalog.Lazy import LazyMap, LazyCat, LazyValues
+from BTrees.IIBTree import intersection, IISet
+from BTrees.IIBTree import weightedIntersection
+import warnings
+

 class SolrTransactionHook :
     ''' commit solr couplé sur le commit de la ZODB '''
     def __init__(self, connection) :
 class SolrTransactionHook :
     ''' commit solr couplé sur le commit de la ZODB '''
     def __init__(self, connection) :


@@ -34,7 +41,7 @@ class CatalogTool(BaseCatalogTool) :
     
     def __init__(self, idxs=[]) :
         super(CatalogTool, self).__init__()
     
     def __init__(self, idxs=[]) :
         super(CatalogTool, self).__init__()

-        self._catalog = DelegatedCatalog()
+        self._catalog = DelegatedCatalog(self)

         self.solr_url = 'http://localhost:8983/solr'
         self.delegatedIndexes = ('Title', 'Description', 'SearchableText')
     
         self.solr_url = 'http://localhost:8983/solr'
         self.delegatedIndexes = ('Title', 'Description', 'SearchableText')
     


@@ -100,6 +107,33 @@ InitializeClass(CatalogTool)
 class DelegatedCatalog(Catalog) :
     '''C'est ici qu'on délègue effectivement à Solr '''
     
 class DelegatedCatalog(Catalog) :
     '''C'est ici qu'on délègue effectivement à Solr '''
     

+    def __init__(self, zcat, brains=None) :
+        Catalog.__init__(self, brains=brains)
+        self.zcat = zcat
+    
+    def getDelegatedIndexes(self) :
+        return ('Title', 'Description', 'SearchableText') # <= TODO virer cette ligne
+        return self.zcat.delegatedIndexes
+    
+    def delegateSearch(self, query, plan) :
+        '''
+        retours faux : 
+        None signifie : pas de délégation, il faut continuer à interroger les autres index.
+        IISet() vide : pas de résultat lors de la délégation, on peut arrêter la recherche.
+        '''
+        indexes = set(plan).intersection(set(self.getDelegatedIndexes()))
+        delegatedQuery = {}
+        for i in indexes :
+            delegatedQuery[i] = query.pop(i)
+            plan.remove(i)
+        if not delegatedQuery :
+            return None
+        c = SolrConnection('http://localhost:8983/solr')
+        q =' AND '.join(['%s:"%s"' % item for item in delegatedQuery.items()])
+        resp = c.query(q, fields='id', rows=len(self))
+        c.close()
+        return IISet(filter(None, [self.uids.get(r['id']) for r in resp.results])) 
+    

     def search(self, query, sort_index=None, reverse=0, limit=None, merge=1):
         """Iterate through the indexes, applying the query to each one. If
         merge is true then return a lazy result set (sorted if appropriate)
     def search(self, query, sort_index=None, reverse=0, limit=None, merge=1):
         """Iterate through the indexes, applying the query to each one. If
         merge is true then return a lazy result set (sorted if appropriate)


@@ -129,6 +163,11 @@ class DelegatedCatalog(Catalog) :
         plan = cr.plan()
         if not plan:
             plan = self._sorted_search_indexes(query)
         plan = cr.plan()
         if not plan:
             plan = self._sorted_search_indexes(query)

+        
+        # délégation
+        rs = self.delegateSearch(query, plan)
+        if rs is not None and not rs :
+            return LazyCat([])

 
         indexes = self.indexes.keys()
         for i in plan:
 
         indexes = self.indexes.keys()
         for i in plan: