Rename

Author: adamdickmeiss

src/main/java/org/z3950/zing/cql/CQLTermNode.java

@@ -78,8 +78,8 @@ void toXCQLInternal(XCQLBuilder b, int level, List<CQLPrefix> prefixes,
 
     @Override
     public String toCQL() {
-        String quotedIndex = maybeQuote(index);
-        String quotedTerm = maybeQuote(term);
+        String quotedIndex = toCQLTerm(index);
+        String quotedTerm = toCQLTerm(term);
         String res = quotedTerm;
 
         if (index != null &&
@@ -192,7 +192,7 @@ public String toPQF(Properties config) throws PQFTranslationException {
         if (isResultSetIndex(index)) {
             // Special case: ignore relation, modifiers, wildcards, etc.
             // There's parallel code in toType1BER()
-            return "@set " + maybeQuote(term);
+            return "@set " + toCQLTerm(term);
         }
 
         List<String> attrs = getAttrs(config);
@@ -219,10 +219,13 @@ public String toPQF(Properties config) throws PQFTranslationException {
             text = text.substring(0, len - 1);
         }
 
-        return s + maybeQuote(text);
+        return s + toCQLTerm(text);
     }
 
-    static String maybeQuote(String str) {
+    // ensure that a term is properly quoted for CQL output if necessary.
+    // If the term has a bare double-quote (") it will be
+    // escaped with a backslash.
+    static String toCQLTerm(String str) {
         if (str == null) {
             return null;
         }

src/test/java/org/z3950/zing/cql/CQLTermNodeTest.java

@@ -5,48 +5,53 @@
 
 public class CQLTermNodeTest {
     @Test
-    public void TestMaybeQuoteNull() {
-        assertNull(CQLTermNode.maybeQuote(null));
+    public void TestTCQLTermQuoteNull() {
+        assertNull(CQLTermNode.toCQLTerm(null));
     }
 
     @Test
-    public void TestMaybeQuoteEmpty() {
-        assertEquals("\"\"", CQLTermNode.maybeQuote(""));
+    public void TestTCQLTermQuoteEmpty() {
+        assertEquals("\"\"", CQLTermNode.toCQLTerm(""));
     }
 
     @Test
-    public void TestMaybeQuoteRelation() {
-        assertEquals("\"<\"", CQLTermNode.maybeQuote("<"));
+    public void TestTCQLTermQuoteRelation() {
+        assertEquals("\"<\"", CQLTermNode.toCQLTerm("<"));
     }
 
     @Test
-    public void TestMaybeQuoteSimple() {
-        assertEquals("simple", CQLTermNode.maybeQuote("simple"));
+    public void TestTCQLTermQuoteSimple() {
+        assertEquals("simple", CQLTermNode.toCQLTerm("simple"));
     }
 
     @Test
-    public void TestMaybeQuoteBlank() {
-        assertEquals("\"a b\"", CQLTermNode.maybeQuote("a b"));
+    public void TestTCQLTermQuoteBlank() {
+        assertEquals("\"a b\"", CQLTermNode.toCQLTerm("a b"));
     }
 
     @Test
-    public void TestMaybeQuoteQuote1() {
-        assertEquals("a\\\"", CQLTermNode.maybeQuote("a\""));
+    public void TestTCQLTermQuoteQuote1() {
+        assertEquals("a\\\"", CQLTermNode.toCQLTerm("a\""));
     }
 
     @Test
-    public void TestMaybeQuoteQuote2() {
-        assertEquals("a\\\"", CQLTermNode.maybeQuote("a\\\""));
+    public void TestTCQLTermQuoteQuote2() {
+        assertEquals("a\\\"", CQLTermNode.toCQLTerm("a\\\""));
     }
 
     @Test
-    public void TestMaybeQuoteQuote3() {
-        assertEquals("a" + "\\\\" + "\\\"", CQLTermNode.maybeQuote("a" + "\\\\" + "\""));
+    public void TestTCQLTermQuoteQuote3() {
+        assertEquals("a" + "\\\\" + "\\\"", CQLTermNode.toCQLTerm("a" + "\\\\" + "\""));
     }
 
     @Test
-    public void TestMaybeQuoteQuote4() {
-        assertEquals("a" + "\\\\" + "\\\"", CQLTermNode.maybeQuote("a" + "\\\\" + "\\\""));
+    public void TestTCQLTermQuoteQuote4() {
+        assertEquals("a" + "\\\\" + "\\\"", CQLTermNode.toCQLTerm("a" + "\\\\" + "\\\""));
+    }
+
+    @Test
+    public void TestTCQLTermQuoteBackSlashTrail() {
+        assertEquals("a\\", CQLTermNode.toCQLTerm("a\\"));
     }
 
 }