[Erp5-report] r18211 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 10 18:11:52 CET 2007
Author: yusei
Date: Mon Dec 10 18:11:51 2007
New Revision: 18211
URL: http://svn.erp5.org?rev=18211&view=rev
Log:
Renamed external method.
Added:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.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=18211&r1=18210&r2=18211&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 Mon Dec 10 18:11:51 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PythonScripts.PythonScript</string>
- <string>PythonScript</string>
- </tuple>
- <none/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -71,7 +68,7 @@
<value> <string>"""\n
This script receives a request from advanced search form and \n
puts together a search string in a search syntax, depending on\n
-parameters received. It is the reverse of parseSearchString external\n
+parameters received. It is the reverse of Base_parseSearchString external\n
method.\n
"""\n
req = context.REQUEST\n
@@ -209,7 +206,9 @@
<string>search_straight</string>
<string>search_string</string>
<string>search_phrase</string>
+ <string>_inplacevar_</string>
<string>search_all</string>
+ <string>_getiter_</string>
<string>search_without</string>
<string>daterange</string>
<string>portal_type_list</string>
@@ -221,7 +220,6 @@
<string>ref</string>
<string>ver</string>
<string>lng</string>
- <string>_getiter_</string>
<string>category</string>
<string>category_value</string>
<string>mine</string>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml?rev=18211&r1=18210&r2=18211&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml Mon Dec 10 18:11:51 2007
@@ -69,7 +69,7 @@
"""\n
The main search script. Receives one big string - a SearchableText, in\n
-the search syntax, parses the string using external method parseSearchString,\n
+the search syntax, parses the string using external method Base_parseSearchString,\n
then does the following:\n
- processes arguments for searching by any category\n
- selects search mode\n
@@ -94,7 +94,7 @@
\n
if not sstr: return []\n
\n
-args = context.parseSearchString(sstr)\n
+args = context.Base_parseSearchString(sstr)\n
\n
# if no portal type specified, take all\n
if not args.has_key(\'portal_type\') or args[\'portal_type\'] == ():\n
Added: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml?rev=18211&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml (added)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml Mon Dec 10 18:11:51 2007
@@ -1,0 +1,37 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_function</string> </key>
+ <value> <string>parseSearchString</string> </value>
+ </item>
+ <item>
+ <key> <string>_module</string> </key>
+ <value> <string>DocumentSearch</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_parseSearchString</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=18211&r1=18210&r2=18211&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 Mon Dec 10 18:11:51 2007
@@ -100,7 +100,7 @@
# (e.g. because the listbox uses its own method)\n
return document_text[:300]\n
\n
-search_argument_list = context.parseSearchString(search_string)\n
+search_argument_list = context.Base_parseSearchString(search_string)\n
search_words = search_argument_list.get(\'SearchableText\')\n
\n
if search_words in (\'\', None,):\n
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=18211&r1=18210&r2=18211&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Mon Dec 10 18:11:51 2007
@@ -1,1 +1,1 @@
-752
+754
More information about the Erp5-report
mailing list