Changeset 7915 for TI01-discovery-API/trunk

Timestamp:

24/05/11 10:38:14 (9 years ago)

Author:

mnagni

Message:

fixed the \' (apostrophe) parsing bug

Location:

TI01-discovery-API/trunk/MEDINDiscoveryService

Files:

• pom.xml (modified) (1 diff)
• src/main/java/ndg/common/TermParser.java (modified) (1 diff)
• src/test/java/ndg/common/SearchAgentTest.java (modified) (1 diff)

TI01-discovery-API/trunk/MEDINDiscoveryService/pom.xml

@@ -4 +4 @@
         <groupId>ndg.services.discovery</groupId>
         <artifactId>MedinDiscoveryService</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <packaging>aar</packaging>
 

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/common/TermParser.java

@@ -140 +140 @@
 
                 term = nsb.toString();
+                term = term.replaceAll("\\'", "\\\\'"); 
                 return term.replaceAll(":", "\\\\\\\\:");
         }

TI01-discovery-API/trunk/MEDINDiscoveryService/src/test/java/ndg/common/SearchAgentTest.java

@@ -79 +79 @@
                 test = "one & - \"\"two ring\"\"";
                 try {
-                        assertTrue(tp.parseTerm(test).trim().equals("one & ! ''two ring''"));
+                        assertTrue(tp.parseTerm(test).trim().equals("one & ! \\\'\\\'two ring\\\'\\\'"));
+                } catch (AssembleQueryException e) {
+                        fail(new MessageFormatter().getFormattedText(e.getBundlMessage()));
+                }
+                
+                test = "1970's";
+                try {
+                        assertTrue(tp.parseTerm(test).trim().equals("1970\\\'s"));
                 } catch (AssembleQueryException e) {
                         fail(new MessageFormatter().getFormattedText(e.getBundlMessage()));