[Erp5-report] r9088 - in /erp5/trunk/bt5/erp5_dms: ExtensionTemplateItem/ SkinTemplateItem/...

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Aug  8 13:00:45 2006
New Revision: 9088

URL: http://svn.erp5.org?rev=9088&view=rev
Log:
Improved display of found data; changed search_mode identifiers to human readable.

Modified:
    erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/cutFound.py
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/cutFound.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/cutFound.py?rev=9088&r1=9087&r2=9088&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/cutFound.py (original)
+++ erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/cutFound.py Tue Aug  8 13:00:45 2006
@@ -1,6 +1,6 @@
 import string, re
 
-redundant_chars='"\'.:;,-' # chars we need to strip from a word before we see if it matches
+redundant_chars='"\'.:;,-+<>()*~' # chars we need to strip from a word before we see if it matches, and from the searchwords to eliminate boolean mode chars
 tr=string.maketrans(redundant_chars,' '*len(redundant_chars))
 
 class Done(Exception):
@@ -42,6 +42,7 @@
 
 def generateParts(context,text,sw,tags,trail,maxlines):
   par=Part(tags,trail)
+  sw=sw.translate(tr).strip().split()
   test=lambda w:w.translate(tr).strip() in sw
   i=0
   for aw in text:

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml?rev=9088&r1=9087&r2=9088&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml Tue Aug  8 13:00:45 2006
@@ -77,7 +77,6 @@
 sw=context.REQUEST.get(\'SearchableText\',None)\n
 if sw is None:\n
   return \'\'\n
-sw=sw.split()\n
 res=context.cutFound(context,txt,sw,tags,trail,maxlines)\n
 return \' \'.join(map(str,res))\n
 

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml?rev=9088&r1=9087&r2=9088&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml Tue Aug  8 13:00:45 2006
@@ -231,11 +231,11 @@
                         </tuple>
                         <tuple>
                           <string>Boolean</string>
-                          <string>1</string>
+                          <string>in_boolean_mode</string>
                         </tuple>
                         <tuple>
                           <string>With query expansion</string>
-                          <string>2</string>
+                          <string>with_query_expansion</string>
                         </tuple>
                       </list>
                     </value>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=9088&r1=9087&r2=9088&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Tue Aug  8 13:00:45 2006
@@ -1,1 +1,1 @@
-19
+28