Improved display of found data; changed search_mode identifiers to human readable.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9088 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_dms/ExtensionTemplateItem/cutFound.py

 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 @@ class Part:
 
 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:

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml

@@ -77,7 +77,6 @@ txt=brain.getObject().SearchableText()\n
 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
 

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/search_mode.xml

@@ -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>

bt5/erp5_dms/bt/revision

-19
\ No newline at end of file
+28
\ No newline at end of file