Commit c3cdcfc0 authored by Ivan Tyagov's avatar Ivan Tyagov

Handle all reference, language, version cases.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33289 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0792e709
...@@ -100,9 +100,10 @@ parsed_searchabletext = parsed_search_string.get(\'searchabletext\', None)\n ...@@ -100,9 +100,10 @@ parsed_searchabletext = parsed_search_string.get(\'searchabletext\', None)\n
if parsed_searchabletext is not None: \n if parsed_searchabletext is not None: \n
query_kw[\'full_text.SearchableText\'] = parsed_searchabletext\n query_kw[\'full_text.SearchableText\'] = parsed_searchabletext\n
\n \n
reference = parsed_search_string.get(\'reference\', None)\n for key in (\'reference\', \'version\', \'language\',):\n
if reference is not None:\n value = parsed_search_string.get(key, None)\n
query_kw[\'reference\'] = reference\n if value is not None:\n
query_kw[key] = value\n
\n \n
where_expression_list = []\n where_expression_list = []\n
creation_from = parsed_search_string.get(\'creation_from\', None)\n creation_from = parsed_search_string.get(\'creation_from\', None)\n
...@@ -139,6 +140,7 @@ if parsed_search_string.get(\'newest\'):\n ...@@ -139,6 +140,7 @@ if parsed_search_string.get(\'newest\'):\n
else:\n else:\n
result = portal.portal_catalog(**query_kw)\n result = portal.portal_catalog(**query_kw)\n
\n \n
context.log(portal.portal_catalog(src__=1, **query_kw))\n
return result\n return result\n
...@@ -194,7 +196,9 @@ return result\n ...@@ -194,7 +196,9 @@ return result\n
<string>len</string> <string>len</string>
<string>_write_</string> <string>_write_</string>
<string>parsed_searchabletext</string> <string>parsed_searchabletext</string>
<string>reference</string> <string>_getiter_</string>
<string>key</string>
<string>value</string>
<string>where_expression_list</string> <string>where_expression_list</string>
<string>creation_from</string> <string>creation_from</string>
<string>creation_to</string> <string>creation_to</string>
...@@ -203,7 +207,6 @@ return result\n ...@@ -203,7 +207,6 @@ return result\n
<string>str</string> <string>str</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>_getiter_</string>
<string>_apply_</string> <string>_apply_</string>
<string>doc</string> <string>doc</string>
<string>result</string> <string>result</string>
......
1083 1084
\ 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