Skip to content

erp5
erp5
Commit 819b46f6 authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Delegate getting searchable text to new script .Base_getSearchText.. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36723 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1ffea859
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 28 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getSearchText.xml 0 → 100644
View file @ 819b46f6
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Get search text from REQUEST or selection.\n
"""\n
# get search words from listbox selection\n
argument_names = (\'advanced_search_text\', \n
\'your_search_text\',\n
\'title\',\n
\'reference\',\n
\'searchabletext\', \n
\'searchabletext_any\',\n
\'searchabletext_all\', \n
\'searchabletext_phrase\',)\n
\n
if selection is None:\n
selection_name = context.REQUEST.get("selection_name", None)\n
if selection_name is not None:\n
selection = context.portal_selections.getSelectionFor(selection_name)\n
\n
if selection is not None:\n
params = selection.getParams()\n
else:\n
params = context.portal_selections.getSelectionParamsFor(\'search_result_selection\')\n
\n
params = [params.get(name, \'\') for name in argument_names]\n
# flatten value if it is list\n
params = [(hasattr(param, \'sort\') and \' \'.join(param) or param) for param in params]\n
search_string = \' \'.join(params).strip()\n
\n
return search_string\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>selection</string>
<string>argument_names</string>
<string>None</string>
<string>_getattr_</string>
<string>context</string>
<string>selection_name</string>
<string>params</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>name</string>
<string>param</string>
<string>hasattr</string>
<string>search_string</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSearchText</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml
View file @ 819b46f6
...@@ -80,31 +80,13 @@ def getRandomDocumentTextExcerpt(document_text):\n ...@@ -80,31 +80,13 @@ def getRandomDocumentTextExcerpt(document_text):\n
else:\n else:\n
return \'\'\n return \'\'\n
\n \n
# get search words from listbox selection\n
argument_names = (\'advanced_search_text\', \n
\'your_search_text\',\n
\'title\',\n
\'reference\',\n
\'searchabletext\', \n
\'searchabletext_any\',\n
\'searchabletext_all\', \n
\'searchabletext_phrase\',)\n
\n
if document_text is None:\n if document_text is None:\n
try:\n try:\n
document_text = context.getSearchableText()\n document_text = context.getSearchableText()\n
except NotConvertedError:\n except NotConvertedError:\n
return context.Base_translateString("This document is not converted yet.")\n return context.Base_translateString("This document is not converted yet.")\n
\n \n
if selection is not None:\n search_string = context.Base_getSearchText(selection)\n
params = selection.getParams()\n
else:\n
params = context.portal_selections.getSelectionParamsFor(\'search_result_selection\')\n
\n
params = [params.get(name, \'\') for name in argument_names]\n
# flatten value if it is list\n
params = [(hasattr(param, \'sort\') and \' \'.join(param) or param) for param in params]\n
search_string = \' \'.join(params).strip()\n
\n \n
if search_string != \'\':\n if search_string != \'\':\n
search_argument_list = context.Base_parseSearchString(search_string)\n search_argument_list = context.Base_parseSearchString(search_string)\n
...@@ -178,15 +160,7 @@ else:\n ...@@ -178,15 +160,7 @@ else:\n
<string>context</string> <string>context</string>
<string>is_gadget_mode</string> <string>is_gadget_mode</string>
<string>getRandomDocumentTextExcerpt</string> <string>getRandomDocumentTextExcerpt</string>
<string>argument_names</string>
<string>None</string> <string>None</string>
<string>params</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>name</string>
<string>param</string>
<string>hasattr</string>
<string>search_string</string> <string>search_string</string>
<string>search_argument_list</string> <string>search_argument_list</string>
<string>found_text_fragments</string> <string>found_text_fragments</string>
......
product/ERP5/bootstrap/erp5_core/bt/revision
View file @ 819b46f6
1622 1623
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7