From fbb648d366a408d92a520b0b37d66d7ec7602e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 7 Dec 2011 11:27:01 +0100
Subject: [PATCH] update indexes to use the same mail prefix

---
 themis/search/indexer.py                   |  2 +-
 themis/search/mail.pt                      |  2 +-
 themis/search/mail.py                      | 14 +++++++-------
 themis/search/profiles/default/catalog.xml | 18 +++++++++---------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/themis/search/indexer.py b/themis/search/indexer.py
index 89bf7e7..311c331 100644
--- a/themis/search/indexer.py
+++ b/themis/search/indexer.py
@@ -18,7 +18,7 @@ def dateIndexer(obj):
             return DateTime(getattr(obj, attr).isoformat())
     return None
 
-grok.global_adapter(dateIndexer, name="dateCourrier")
+grok.global_adapter(dateIndexer, name="mailDate")
 
 
 @indexer(plone.dexterity.interfaces.IDexterityItem)
diff --git a/themis/search/mail.pt b/themis/search/mail.pt
index ffa05df..8be427a 100644
--- a/themis/search/mail.pt
+++ b/themis/search/mail.pt
@@ -35,7 +35,7 @@
        <table>
          <tal:entry tal:repeat="item batch">
          <tr tal:define="oddrow repeat/item/odd;" tal:attributes="class python: oddrow and 'odd' or 'even'">
-           <td class="date" tal:content="string: ${item/dateCourrier/day}/${item/dateCourrier/month}/${item/dateCourrier/year}"></td>
+           <td class="date" tal:content="string: ${item/mailDate/day}/${item/mailDate/month}/${item/mailDate/year}"></td>
            <td><a tal:attributes="href item/getURL" tal:content="item/Title"></a></td>
          </tr>
          </tal:entry>
diff --git a/themis/search/mail.py b/themis/search/mail.py
index fdc7b65..24a3ac4 100644
--- a/themis/search/mail.py
+++ b/themis/search/mail.py
@@ -101,17 +101,17 @@ class SearchView(BrowserView):
             return []
 
         if data.get('date'):
-            kw['dateCourrier'] = {'query': [data.get('date'), data.get('date')], 'range': 'minmax'}
+            kw['mailDate'] = {'query': [data.get('date'), data.get('date')], 'range': 'minmax'}
         if data.get('text'):
-            kw['MailSearchableText'] = data.get('text')
+            kw['mailSearchableText'] = data.get('text')
         if data.get('number'):
-            kw['numero_courrier'] = data.get('number')
+            kw['mailNumber'] = data.get('number')
         if data.get('category'):
-            kw['categorie_de_courrier'] = data.get('category')
+            kw['mailCategory'] = data.get('category')
         if data.get('subcategory'):
-            kw['sous_categorie_de_courrier'] = data.get('subcategory')
+            kw['mailSubcategory'] = data.get('subcategory')
         if data.get('contact'):
-            kw['MailContactFuzzy'] = data.get('contact')
+            kw['mailContactFuzzy'] = data.get('contact')
 
         if data.get('scope') == 'all':
             kw['portal_type'] = ['courrier_entrant', 'courrier_sortant']
@@ -120,7 +120,7 @@ class SearchView(BrowserView):
         elif data.get('scope') == 'outgoing':
             kw['portal_type'] = ['courrier_sortant']
 
-        kw['sort_on'] = 'dateCourrier'
+        kw['sort_on'] = 'mailDate'
         kw['sort_order'] = 'descending'
         print 'kw:', kw
         catalog = getToolByName(self.context, 'portal_catalog')
diff --git a/themis/search/profiles/default/catalog.xml b/themis/search/profiles/default/catalog.xml
index 08dd872..39d0075 100644
--- a/themis/search/profiles/default/catalog.xml
+++ b/themis/search/profiles/default/catalog.xml
@@ -5,30 +5,30 @@
    <element name="HTML aware splitter" group="Word Splitter"/>
    <element name="Normalize accented chars (Latin &amp; Western European text)" group="Accent Normalizer"/>
   </object>
-  <index name="themis_mail_number" meta_type="FieldIndex">
+  <index name="mailNumber" meta_type="FieldIndex">
     <indexed_attr value="numero_courrier"/>
   </index>
-  <index name="categorie_de_courrier" meta_type="KeywordIndex">
+  <index name="mailCategory" meta_type="KeywordIndex">
     <indexed_attr value="categorie_de_courrier"/>
   </index>
-  <index name="sous_categorie_de_courrier" meta_type="KeywordIndex">
+  <index name="mailSubcategory" meta_type="KeywordIndex">
     <indexed_attr value="sous_categorie_de_courrier"/>
   </index>
-  <index name="dateCourrier" meta_type="DateIndex">
-    <indexed_attr value="dateCourrier"/>
+  <index name="mailDate" meta_type="DateIndex">
+    <indexed_attr value="mailDate"/>
   </index>
-  <index name="MailContact" meta_type="FieldIndex">
+  <index name="mailContact" meta_type="FieldIndex">
     <indexed_attr value="MailContact"/>
   </index>
-  <index name="MailContactFuzzy" meta_type="ZCTextIndex">
+  <index name="mailContactFuzzy" meta_type="ZCTextIndex">
     <indexed_attr value="MailContactFuzzy"/>
     <extra name="index_type" value="Okapi BM25 Rank"/>
     <extra name="lexicon_id" value="themis_lexicon"/>
   </index>
-  <index name="MailSearchableText" meta_type="ZCTextIndex">
+  <index name="mailSearchableText" meta_type="ZCTextIndex">
     <indexed_attr value="MailSearchableText"/>
     <extra name="index_type" value="Okapi BM25 Rank"/>
     <extra name="lexicon_id" value="themis_lexicon"/>
   </index>
-  <column value="dateCourrier"/>
+  <column value="mailDate"/>
 </object>