Commit 8eff622e authored by Ivan Tyagov's avatar Ivan Tyagov

Do care for syntax not to start with logical operator which should be used...

Do care for syntax not to start with logical operator which should be used only for concatenating two sub search strings.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38413 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7e102a69
......@@ -108,7 +108,11 @@ if portal_type_list:\n
if \' \' in portal_type:\n
portal_type = \'"%s"\' %portal_type\n
portal_type_string_list.append(\'portal_type:%s\' %portal_type)\n
search_string += \' %s (%s)\' %(logical_operator, \' OR \'.join(portal_type_string_list))\n
portal_type_string = \'(%s)\' %\' OR \'.join(portal_type_string_list)\n
if search_string not in MARKER:\n
search_string += \' %s %s\' %(logical_operator, portal_type_string)\n
else:\n
search_string += portal_type_string\n
\n
# search by reference\n
reference = kw.get(\'reference\', request.get(\'reference\', None))\n
......@@ -214,6 +218,7 @@ return search_string\n
<string>str</string>
<string>portal_type_string_list</string>
<string>portal_type</string>
<string>portal_type_string</string>
<string>reference</string>
<string>version</string>
<string>language</string>
......
1175
\ No newline at end of file
1178
\ 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