Le background défini aussi tard pose des problèmes de prio assez indémerdables.

[Plinn.git] / catalog.py

diff --git a/catalog.py b/catalog.py
index d353d6d..f2736cb 100644 (file)
--- a/catalog.py
+++ b/catalog.py
@@ -5,7 +5,7 @@ from Products.CMFCore.interfaces import IIndexableObject
 from Products.CMFCore.CatalogTool import CatalogTool as BaseCatalogTool
 from Products.CMFCore.CatalogTool import IndexableObjectWrapper
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.CMFCore.CatalogTool import CatalogTool as BaseCatalogTool
 from Products.CMFCore.CatalogTool import IndexableObjectWrapper
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile

-from Products.CMFCore.permissions import ModifyPortalContent
+from Products.CMFCore.permissions import ModifyPortalContent, ManagePortal

 from zope.component import queryMultiAdapter
 from Products.ZCatalog.Catalog import Catalog
 import transaction
 from zope.component import queryMultiAdapter
 from Products.ZCatalog.Catalog import Catalog
 import transaction


@@ -18,25 +18,33 @@ from BTrees.IIBTree import intersection, IISet
 from BTrees.IIBTree import weightedIntersection
 import warnings
 
 from BTrees.IIBTree import weightedIntersection
 import warnings
 

+_VOLATILE_SOLR_NAME = '_v_solrConnection'
+

 class SolrTransactionHook :
     ''' commit solr couplé sur le commit de la ZODB '''
 class SolrTransactionHook :
     ''' commit solr couplé sur le commit de la ZODB '''

-    def __init__(self, connection) :
-        self.connection = connection
+    def __init__(self, context, con) :
+        self.context = context
+        self.con = con

     
     def __call__(self, status) :
         if status :
     
     def __call__(self, status) :
         if status :

-            self.connection.commit()
-            self.connection.close()
+            self.con.commit()
+            self.con.close()

         else :
         else :

-            self.connection.close()
+            self.con.close()
+        try :
+            delattr(self.context, _VOLATILE_SOLR_NAME)
+        except AttributeError :
+            pass

 
 class CatalogTool(BaseCatalogTool) :
 
 class CatalogTool(BaseCatalogTool) :

-    meta_type = 'Legivoc Catalog'
+    meta_type = 'Plinn Catalog'

     security = ClassSecurityInfo()
     manage_options = (BaseCatalogTool.manage_options[:5] +
                       ({'label' : 'Solr', 'action' : 'manage_solr'},) +
                       BaseCatalogTool.manage_options[5:])
     security = ClassSecurityInfo()
     manage_options = (BaseCatalogTool.manage_options[:5] +
                       ({'label' : 'Solr', 'action' : 'manage_solr'},) +
                       BaseCatalogTool.manage_options[5:])

-    manage_solr = PageTemplateFile('www/manage_solr', globals())
+    manage_solr = PageTemplateFile('www/manage_solr.pt', globals(), __name__='manage_solr')
+    

     
     
     def __init__(self, idxs=[]) :
     
     
     def __init__(self, idxs=[]) :


@@ -45,6 +53,26 @@ class CatalogTool(BaseCatalogTool) :
         self.solr_url = 'http://localhost:8983/solr'
         self.delegatedIndexes = ('Title', 'Description', 'SearchableText')
     
         self.solr_url = 'http://localhost:8983/solr'
         self.delegatedIndexes = ('Title', 'Description', 'SearchableText')
     

+    security.declarePublic('getDelegatedIndexes')
+    def getDelegatedIndexes(self) :
+        """ read the method name """
+        return self.delegatedIndexes
+    
+    security.declareProtected(ManagePortal, 'setDelegatedIndexes')
+    def setDelegatedIndexes(self, indexes, REQUEST=None) :
+        """setDelegatedIndexes documentation"""
+        self.delegatedIndexes = tuple([i.strip() for i in indexes if i.strip()])
+        if REQUEST :
+            REQUEST.RESPONSE.redirect(self.absolute_url() + '/manage_solr?manage_tabs_message=Saved changes.')
+    
+    def _getSolrConnection(self) :
+        if not hasattr(self, _VOLATILE_SOLR_NAME) :
+            con = SolrConnection(self.solr_url)
+            setattr(self, _VOLATILE_SOLR_NAME, con)
+            txn = transaction.get()
+            txn.addAfterCommitHook(SolrTransactionHook(self, con))
+        return getattr(self, _VOLATILE_SOLR_NAME)
+    

     security.declarePrivate('solrAdd')
     def solrAdd(self, object, idxs=[], uid=None) :
         if IIndexableObject.providedBy(object):
     security.declarePrivate('solrAdd')
     def solrAdd(self, object, idxs=[], uid=None) :
         if IIndexableObject.providedBy(object):


@@ -61,10 +89,8 @@ class CatalogTool(BaseCatalogTool) :
         for name in idxs :
             attr = getattr(w, name, '')
             data[name] = attr() if callable(attr) else attr
         for name in idxs :
             attr = getattr(w, name, '')
             data[name] = attr() if callable(attr) else attr

-        c = SolrConnection(self.solr_url)
+        c = self._getSolrConnection()

         c.add(**data)
         c.add(**data)

-        txn = transaction.get()
-        txn.addAfterCommitHook(SolrTransactionHook(c))

     
     
     # PortalCatalog api overloads
     
     
     # PortalCatalog api overloads


@@ -95,11 +121,9 @@ class CatalogTool(BaseCatalogTool) :
         """Remove from catalog.
         """
         super(CatalogTool, self).unindexObject(object)
         """Remove from catalog.
         """
         super(CatalogTool, self).unindexObject(object)

-        c = SolrConnection(self.solr_url)
+        c = self._getSolrConnection()

         url = self.__url(object)
         c.delete(id=url)
         url = self.__url(object)
         c.delete(id=url)

-        txn = transaction.get()
-        txn.addAfterCommitHook(SolrTransactionHook(c))

         
 InitializeClass(CatalogTool)
 
         
 InitializeClass(CatalogTool)
 


@@ -117,13 +141,14 @@ class DelegatedCatalog(Catalog) :
         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.
         '''
         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.zcat.delegatedIndexes))
+        indexes = set(query.keys()).intersection(set(self.zcat.delegatedIndexes))

         if not indexes :
             return None
         delegatedQuery = {}
         for i in indexes :
             delegatedQuery[i] = query.pop(i)
         if not indexes :
             return None
         delegatedQuery = {}
         for i in indexes :
             delegatedQuery[i] = query.pop(i)

-            plan.remove(i)
+            try : plan.remove(i)
+            except ValueError : pass

         c = SolrConnection(self.zcat.solr_url)
         q =' AND '.join(['%s:"%s"' % item for item in delegatedQuery.items()])
         resp = c.query(q, fields='id', rows=len(self))
         c = SolrConnection(self.zcat.solr_url)
         q =' AND '.join(['%s:"%s"' % item for item in delegatedQuery.items()])
         resp = c.query(q, fields='id', rows=len(self))