\r
import java.io.Serializable;\r
\r
-import com.indexdata.mkjsf.pazpar2.commands.Expression;\r
+import org.apache.log4j.Logger;\r
\r
public class Expression implements Serializable {\r
\r
private static final long serialVersionUID = -751704027842027769L;\r
+ private static Logger logger = Logger.getLogger(Expression.class);\r
String leftEntity;\r
String operator;\r
String rightEntity;\r
- public Expression (String leftEntity, String operator, String rightEntity) {\r
+ String label; \r
+ \r
+ public Expression (String leftEntity, String operator, String rightEntity, String label) {\r
this.leftEntity = leftEntity;\r
this.operator = operator;\r
this.rightEntity = rightEntity; \r
+ this.label = label;\r
+ }\r
+ \r
+ public Expression (String expressionString) {\r
+ String[] parts = expressionString.split("[=~]");\r
+ this.leftEntity = parts[0];\r
+ this.operator = expressionString.contains("=") ? "=" : "~";\r
+ this.rightEntity = parts[1];\r
+ this.label=rightEntity;\r
}\r
\r
public Expression copy() {\r
- return new Expression(leftEntity,operator,rightEntity);\r
+ logger.trace("Copying " + this.toString());\r
+ return new Expression(leftEntity, operator, rightEntity, label);\r
}\r
\r
public String toString() {\r
return leftEntity + operator + rightEntity;\r
}\r
\r
-\r
+ public String getLabel() {\r
+ return label;\r
+ }\r
+ \r
+ public String getField () {\r
+ return leftEntity;\r
+ }\r
+ \r
+ public String getOperator() {\r
+ return operator;\r
+ }\r
+ \r
+ public String getValue() {\r
+ return rightEntity;\r
+ }\r
+ \r
}\r