Revert "Fix issue #16: Incorrect quoting of phrases"

kemitche · kemitche · commit d9a40b55612f · 2012-08-15T15:38:41.000-07:00
This reverts commit 76eff93. The "fix" creates two meanings for double-quotes: * encapsulating a query against a field, e.g.: foo:"bar baz" * grouping exact phrases, e.g.: "jon smith" The two must be disambiguated to avoid confusion or loss of features
diff --git a/l2cs.py b/l2cs.py
@@ -16,7 +16,7 @@
 import whoosh.query
 
 
-__version__ = "1.0.7"
+__version__ = "1.0.8"
 
 
 HANDLERS = {}
@@ -38,10 +38,6 @@ def build_null(clause):
     yield ""
 
 
-def _fix_quotes(phrase):
-    return phrase.replace(r"'", r"\'").replace(r'"', r'\"')
-
-
 @handler(whoosh.query.Term, whoosh.query.Phrase, whoosh.query.Prefix)
 def build_field(clause):
     integer_field = getattr(clause, "integer_field", False)
@@ -50,17 +46,15 @@ def build_field(clause):
         yield clause.fieldname
         yield " '"
         if isinstance(clause, whoosh.query.Term):
-            yield _fix_quotes(clause.text)
+            yield clause.text.replace(r"'", r"\'")
         elif isinstance(clause, whoosh.query.Prefix):
-            yield _fix_quotes(clause.text)
+            yield clause.text.replace(r"'", r"\'")
             yield '*'
         elif isinstance(clause, whoosh.query.Phrase):
-            yield '"'
             for word in clause.words[:-1]:
-                yield _fix_quotes(word)
+                yield word.replace(r"'", r"\'")
                 yield " "
             yield clause.words[-1]
-            yield '"'
         yield "')"
     else:
         yield clause.fieldname
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     use_setuptools()
     from setuptools import setup
 
-version = "1.0.7"
+version = "1.0.8"
 
 setup(
     name='l2cs',
diff --git a/test_l2cs.py b/test_l2cs.py
@@ -34,7 +34,7 @@ def test_fields2(self):
     
     # phrases
     def test_phrases1(self):
-        self._run_test('"foo bar baz"', "(field text '\"foo bar baz\"')")
+        self._run_test('"foo bar baz"', "(field text 'foo bar baz')")
     
     # AND clauses
     def test_and1(self):
@@ -75,12 +75,9 @@ def test_not9(self):
     
     # quotes
     def test_quote1(self):
-        self._run_test("hello:\"goodbye you're sir\"", "(field hello '\"goodbye you\\'re sir\"')")
+        self._run_test("hello:\"goodbye you're sir\"", "(field hello 'goodbye you\\'re sir')")
     def test_quote2(self):
-        self._run_test("hello:\"goodbye you''re sir\"", "(field hello '\"goodbye you\\'\\'re sir\"')")
-    def test_quote3(self):
-        '''Stray double-quotes get escaped'''
-        self._run_test('"foo bar" baz"', '(and (field text \'"foo bar"\') (field text \'baz\\"\'))')
+        self._run_test("hello:\"goodbye you''re sir\"", "(field hello 'goodbye you\\'\\'re sir')")
     
     # int fields
     def test_int1(self):
