X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FExpression.java;h=f636f68a7a172abce519b4dccd26bc33fa731922;hb=f532c1d517d573a64accde31220e2ffbbb00354f;hp=3c377e28855ea0c155bb01c2a685e8735fd72361;hpb=31a027596723261b413d69c74428b176def3627f;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Expression.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Expression.java
index 3c377e2..f636f68 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Expression.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Expression.java
@@ -1,12 +1,9 @@
 package com.indexdata.mkjsf.pazpar2.commands;
 
 import java.io.Serializable;
-import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
 
-import com.indexdata.mkjsf.pazpar2.commands.Expression;
-
 public class Expression implements Serializable {
   
   private static final long serialVersionUID = -751704027842027769L;
@@ -24,10 +21,10 @@ public class Expression implements Serializable {
   }
   
   public Expression (String expressionString) {
-    StringTokenizer tokenizer = new StringTokenizer(expressionString,"=");
-    this.leftEntity = tokenizer.nextToken();
-    this.operator = "=";
-    this.rightEntity = tokenizer.nextToken();
+    String[] parts = expressionString.split("[=~]");
+    this.leftEntity = parts[0];
+    this.operator = expressionString.contains("=") ? "=" : "~";
+    this.rightEntity = parts[1];
     this.label=rightEntity;
   }