X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FSearchCommand.java;fp=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FSearchCommand.java;h=f9f76a22e70375558765f5d03fe5a60fef1586ec;hb=aa58bd0cb2ea65a2cf5cc826012ce169d94312d1;hp=dcbb3232c13bb919c011bd48e90f222de712dab6;hpb=429817e42147508ec910ec7f21d720959c50aecb;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
index dcbb323..f9f76a2 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
@@ -1,9 +1,7 @@
 package com.indexdata.mkjsf.pazpar2.commands;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
@@ -74,7 +72,8 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand
    */  
   public void setFilter(String compoundExpression) {
     if (compoundExpression != null && compoundExpression.length()>0) {
-      String[] subExpressions = compoundExpression.split(",");
+      // Split expression by commas that are not escaped (with backslash)
+      String[] subExpressions = compoundExpression.split("(?<!\\\\),");
       for (int i=0; i<subExpressions.length; i++) {
         if (subExpressions[i].split("[=~]").length==1) {
           removeFilters(subExpressions[i].split("[=~]")[0]);
@@ -229,7 +228,8 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand
    */  
   public void setLimit (String compoundExpression) {   
     if (compoundExpression != null && compoundExpression.length()>0) {
-      String[] subExpressions = compoundExpression.split(",");
+      // Split expression by commas that are not escaped (with backslash)
+      String[] subExpressions = compoundExpression.split("(?<!\\\\),");
       for (int i=0; i<subExpressions.length; i++) {
         if (subExpressions[i].split("[=~]").length==1) {
           removeLimits(subExpressions[i].split("[=~]")[0]);