Changeset 6802 for SRUAggregator

Timestamp:

11/13/15 10:04:55 (9 years ago)

Author:

Leif-Jöran

Message:

Adding more silent corrections of non-quoted query strings. Adding positive and negative unit tests.

Location:

SRUAggregator/trunk/src

Files:

• main/java/eu/clarin/sru/fcs/aggregator/search/Search.java (modified) (3 diffs)
• test/java/eu/clarin/sru/fcs/aggregator/search (added)
• test/java/eu/clarin/sru/fcs/aggregator/search/QueryStringQuotableTest.java (added)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/search/Search.java

@@ -44 +44 @@
         private final List<Result> results = Collections.synchronizedList(new ArrayList<Result>());
         private final Statistics statistics;
-        private final Pattern wsPattern = Pattern.compile("\\s");
+        private static final Pattern quotePattern = Pattern.compile("[\\s<>=/\\(\\)]");
 
         public Search(ThrottledClient searchClient,
@@ -54 +54 @@
                 this.version = version;
                 this.id = counter.getAndIncrement();
-                this.query = quoteIfMultiWordExpression(searchString);
+                this.query = quoteIfQuotableExpression(searchString);
                 this.searchLanguage = searchLanguage;
                 this.statistics = statistics;
@@ -177 +177 @@
         }
 
-        private String quoteIfMultiWordExpression(String queryString) {
-            Matcher matcher = wsPattern.matcher(queryString.trim());
-            boolean wsFound = matcher.find();
-            if (wsFound && !"\"".equals(queryString.charAt(0))) {
+        protected static String quoteIfQuotableExpression(final String queryString) {
+            Matcher matcher = quotePattern.matcher(queryString.trim());
+            boolean quotableFound = matcher.find();
+            if (quotableFound && !"\"".equals(queryString.charAt(0))) {
                 return "\"" + queryString + "\"";
             }