Renamed external method.

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

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml

@@ -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 @@ return search_string\n
                             <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 @@ return search_string\n
                             <string>ref</string>
                             <string>ver</string>
                             <string>lng</string>
-                            <string>_getiter_</string>
                             <string>category</string>
                             <string>category_value</string>
                             <string>mine</string>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml

@@ -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 @@ else:\n
 \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

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/parseSearchString.xml → bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_parseSearchString.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ExternalMethod.ExternalMethod</string>
-          <string>ExternalMethod</string>
-        </tuple>
-        <none/>
+        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -28,7 +25,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>parseSearchString</string> </value>
+            <value> <string>Base_parseSearchString</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

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

@@ -100,7 +100,7 @@ if not search_string:\n
   # (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

bt5/erp5_dms/bt/revision

-752
\ No newline at end of file
+754
\ No newline at end of file