projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Returns "" rather than "null" on missing value
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
mkjsf
/
pazpar2
/
commands
/
FilterParameter.java
diff --git
a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/FilterParameter.java
b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/FilterParameter.java
index
0d540a2
..
e10edb6
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/commands/FilterParameter.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/commands/FilterParameter.java
@@
-2,6
+2,14
@@
package com.indexdata.mkjsf.pazpar2.commands;
\r
import org.apache.log4j.Logger;
\r
\r
\r
import org.apache.log4j.Logger;
\r
\r
+/**
\r
+ * Represents a filter parameter as it applies to the Pazpar2 search command
\r
+ *
\r
+ * <p>A filter parameter consists of one or more expressions separated by commas.</p>
\r
+ *
\r
+ * @author Niels Erik
\r
+ *
\r
+ */
\r
public class FilterParameter extends CommandParameter {
\r
\r
private static final long serialVersionUID = -3697328835895528654L;
\r
public class FilterParameter extends CommandParameter {
\r
\r
private static final long serialVersionUID = -3697328835895528654L;
\r
@@
-23,15
+31,20
@@
public class FilterParameter extends CommandParameter {
completeValue.append(",");
\r
else
\r
first=false;
\r
completeValue.append(",");
\r
else
\r
first=false;
\r
- completeValue.append(pz2escape(expr.toString()));
\r
+ completeValue.append(expr.toString());
\r
}
\r
return completeValue.toString();
\r
}
\r
\r
}
\r
return completeValue.toString();
\r
}
\r
\r
- public String pz2escape (String expressionString) {
\r
+ /**
\r
+ * Escapes backslash (\), comma (,) and pipe (|) from an expression string.
\r
+ *
\r
+ * @param expressionString
\r
+ * @return escaped expressionString
\r
+ */
\r
+ private String pz2escape (String expressionString) {
\r
String escaped = expressionString.replaceAll("\\\\","\\\\\\\\");
\r
escaped = escaped.replaceAll(",","\\\\,");
\r
String escaped = expressionString.replaceAll("\\\\","\\\\\\\\");
\r
escaped = escaped.replaceAll(",","\\\\,");
\r
- escaped = escaped.replaceAll("\\|", "\\\\|");
\r
return escaped;
\r
}
\r
\r
return escaped;
\r
}
\r
\r