Commit abee73a5 authored by Yusei Tahara's avatar Yusei Tahara

Renamed external method.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18212 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 72804052
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<string>Products.PythonScripts.PythonScript</string> <tuple/>
<string>PythonScript</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -71,7 +68,7 @@ ...@@ -71,7 +68,7 @@
<value> <string>"""\n <value> <string>"""\n
This script receives a request from advanced search form and \n This script receives a request from advanced search form and \n
puts together a search string in a search syntax, depending on\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 method.\n
"""\n """\n
req = context.REQUEST\n req = context.REQUEST\n
...@@ -209,7 +206,9 @@ return search_string\n ...@@ -209,7 +206,9 @@ return search_string\n
<string>search_straight</string> <string>search_straight</string>
<string>search_string</string> <string>search_string</string>
<string>search_phrase</string> <string>search_phrase</string>
<string>_inplacevar_</string>
<string>search_all</string> <string>search_all</string>
<string>_getiter_</string>
<string>search_without</string> <string>search_without</string>
<string>daterange</string> <string>daterange</string>
<string>portal_type_list</string> <string>portal_type_list</string>
...@@ -221,7 +220,6 @@ return search_string\n ...@@ -221,7 +220,6 @@ return search_string\n
<string>ref</string> <string>ref</string>
<string>ver</string> <string>ver</string>
<string>lng</string> <string>lng</string>
<string>_getiter_</string>
<string>category</string> <string>category</string>
<string>category_value</string> <string>category_value</string>
<string>mine</string> <string>mine</string>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
"""\n """\n
The main search script. Receives one big string - a SearchableText, in\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 then does the following:\n
- processes arguments for searching by any category\n - processes arguments for searching by any category\n
- selects search mode\n - selects search mode\n
...@@ -94,7 +94,7 @@ else:\n ...@@ -94,7 +94,7 @@ else:\n
\n \n
if not sstr: return []\n if not sstr: return []\n
\n \n
args = context.parseSearchString(sstr)\n args = context.Base_parseSearchString(sstr)\n
\n \n
# if no portal type specified, take all\n # if no portal type specified, take all\n
if not args.has_key(\'portal_type\') or args[\'portal_type\'] == ():\n if not args.has_key(\'portal_type\') or args[\'portal_type\'] == ():\n
......
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
<string>Products.ExternalMethod.ExternalMethod</string> <tuple/>
<string>ExternalMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -28,7 +25,7 @@ ...@@ -28,7 +25,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>parseSearchString</string> </value> <value> <string>Base_parseSearchString</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
...@@ -100,7 +100,7 @@ if not search_string:\n ...@@ -100,7 +100,7 @@ if not search_string:\n
# (e.g. because the listbox uses its own method)\n # (e.g. because the listbox uses its own method)\n
return document_text[:300]\n return document_text[:300]\n
\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 search_words = search_argument_list.get(\'SearchableText\')\n
\n \n
if search_words in (\'\', None,):\n if search_words in (\'\', None,):\n
......
752 754
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment