Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
erp5_rtl_support
Commits
af7d3e4a
Commit
af7d3e4a
authored
Oct 31, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
full text: revert non-required change in FullTextKey.
parent
4fb13671
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
product/ZSQLCatalog/SearchKey/FullTextKey.py
product/ZSQLCatalog/SearchKey/FullTextKey.py
+2
-2
No files found.
product/ZSQLCatalog/SearchKey/FullTextKey.py
View file @
af7d3e4a
...
@@ -35,6 +35,7 @@ from Products.ZSQLCatalog.SearchText import dequote
...
@@ -35,6 +35,7 @@ from Products.ZSQLCatalog.SearchText import dequote
from
zope.interface.verify
import
verifyClass
from
zope.interface.verify
import
verifyClass
import
re
import
re
FULLTEXT_BOOLEAN_DETECTOR
=
re
.
compile
(
r'.*((^|\
s)[
\+\
-<>
\(\
~]|[
\*\
)](
\s|$))'
)
class
FullTextKey
(
DefaultKey
):
class
FullTextKey
(
DefaultKey
):
"""
"""
...
@@ -42,7 +43,6 @@ class FullTextKey(DefaultKey):
...
@@ -42,7 +43,6 @@ class FullTextKey(DefaultKey):
"""
"""
default_comparison_operator
=
'match'
default_comparison_operator
=
'match'
get_operator_from_value
=
False
get_operator_from_value
=
False
fulltext_boolean_detector
=
re
.
compile
(
r'.*((^|\
s)[
\+\
-<>
\(\
~]|[
\*\
)](
\s|$))'
)
def
dequoteParsedText
(
self
):
def
dequoteParsedText
(
self
):
return
False
return
False
...
@@ -64,7 +64,7 @@ class FullTextKey(DefaultKey):
...
@@ -64,7 +64,7 @@ class FullTextKey(DefaultKey):
append
=
new_value_list
.
append
append
=
new_value_list
.
append
for
value
in
operator_value_dict
.
pop
(
'match'
,
[]):
for
value
in
operator_value_dict
.
pop
(
'match'
,
[]):
if
isinstance
(
value
,
basestring
)
and
\
if
isinstance
(
value
,
basestring
)
and
\
self
.
fulltext_boolean_detector
.
match
(
value
)
is
not
None
:
FULLTEXT_BOOLEAN_DETECTOR
.
match
(
value
)
is
not
None
:
operator_value_dict
.
setdefault
(
'match_boolean'
,
[]).
append
(
value
)
operator_value_dict
.
setdefault
(
'match_boolean'
,
[]).
append
(
value
)
else
:
else
:
append
(
value
)
append
(
value
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment