[Erp5-report] r13132 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Mar  1 14:24:42 2007
New Revision: 13132

URL: http://svn.erp5.org?rev=13132&view=rev
Log:
Use the same script for simple text (if SearchableText is provided directly)

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml?rev=13132&r1=13131&r2=13132&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml Thu Mar  1 14:24:42 2007
@@ -74,8 +74,12 @@
 parameters received. It is the reverse of parseSearchString external\n
 method.\n
 """\n
-\n
 req = context.REQUEST\n
+\n
+search_straight = req.get(\'SearchableText\', \'\')\n
+if search_straight != \'\':\n
+  return search_straight\n
+\n
 # words to search in \'any of the words\' form - left intact\n
 search_string = req.get(\'SearchableText_any\',\'\')\n
 \n
@@ -149,6 +153,8 @@
   search_string += \' mode:%s\' % search_mode_map[search_mode]\n
 \n
 return search_string\n
+\n
+# vim: filetype=python syntax=python shiftwidth=2\n
 </string> </value>
         </item>
         <item>
@@ -202,6 +208,7 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>req</string>
+                            <string>search_straight</string>
                             <string>search_string</string>
                             <string>search_phrase</string>
                             <string>search_all</string>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=13132&r1=13131&r2=13132&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Thu Mar  1 14:24:42 2007
@@ -1,1 +1,1 @@
-558
+559