Utilisation des attributs.

diff --git a/catalog.py b/catalog.py
index da1e4ccdac00aa67036aa52bb6c6fb2d6d66f359..d353d6d2b7473b5c557acfb71dde0af4856f76a3 100644 (file)
--- a/catalog.py
+++ b/catalog.py
@@ -111,24 +111,20 @@ class DelegatedCatalog(Catalog) :
         Catalog.__init__(self, brains=brains)
         self.zcat = zcat
     
         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.
         '''
     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()))
+        indexes = set(plan).intersection(set(self.zcat.delegatedIndexes))
+        if not indexes :
+            return None

         delegatedQuery = {}
         for i in indexes :
             delegatedQuery[i] = query.pop(i)
             plan.remove(i)
         delegatedQuery = {}
         for i in indexes :
             delegatedQuery[i] = query.pop(i)
             plan.remove(i)

-        if not delegatedQuery :
-            return None
-        c = SolrConnection('http://localhost:8983/solr')
+        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.close()
         q =' AND '.join(['%s:"%s"' % item for item in delegatedQuery.items()])
         resp = c.query(q, fields='id', rows=len(self))
         c.close()

diff --git a/profiles/default/catalog.xml b/profiles/default/catalog.xml
index 10f32c2f5b8a34d68b86b7abd13c344153267c96..41914e76e28588250ad6924c11537b3c9e30a3b1 100644 (file)
--- a/profiles/default/catalog.xml
+++ b/profiles/default/catalog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<object name="portal_catalog" meta_type="CMF Catalog">
+<object name="portal_catalog" meta_type="Plinn Catalog">

  <property name="title"></property>
  <object name="htmltext_lexicon" meta_type="ZCTextIndex Lexicon">
   <element name="UTF-8 HTML Aware splitter with accents removal"
  <property name="title"></property>
  <object name="htmltext_lexicon" meta_type="ZCTextIndex Lexicon">
   <element name="UTF-8 HTML Aware splitter with accents removal"

diff --git a/profiles/default/toolset.xml b/profiles/default/toolset.xml
index 1320220758f487868ce6f02e30e5219ad83dff00..6ec6294c6aaf0f05f3692ebb2e66db85286e5129 100644 (file)
--- a/profiles/default/toolset.xml
+++ b/profiles/default/toolset.xml
@@ -19,7 +19,7 @@
  <required tool_id="portal_calendar"
            class="Products.Plinn.CalendarTool.CalendarTool"/>
  <required tool_id="portal_catalog"
  <required tool_id="portal_calendar"
            class="Products.Plinn.CalendarTool.CalendarTool"/>
  <required tool_id="portal_catalog"

-           class="Products.CMFCore.CatalogTool.CatalogTool"/>
+           class="Products.Plinn.catalog.CatalogTool"/>

  <required tool_id="portal_discussion"
            class="Products.CMFDefault.DiscussionTool.DiscussionTool"/>
  <required tool_id="portal_groupdata"
  <required tool_id="portal_discussion"
            class="Products.CMFDefault.DiscussionTool.DiscussionTool"/>
  <required tool_id="portal_groupdata"