DRYD-114: Fixed issue with timestamp conversion's regex that was assuming url encoded...

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
index e573f9f638e4b10768119c3e60a44834c89a1098..14459dfdf026068df6380ee29dc9fb3281b10c8c 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
@@ -155,12 +155,12 @@ public class CoreSessionWrapper implements CoreSessionInterface {
                
                if (query.contains("TIMESTAMP")) {
                        StringBuffer stringBuffer = new StringBuffer();
-                       Pattern pattern = Pattern.compile("\\+TIMESTAMP\\+%22(.+?)%22");
+                       Pattern pattern = Pattern.compile("\\sTIMESTAMP\\s\"(.+?)\"");
                        Matcher matcher = pattern.matcher(query);
                        while (matcher.find()) {
                                String time = matcher.group(1);
-                               String localizedTime = toLocalTimestamp(time, true);
-                               matcher.appendReplacement(stringBuffer, String.format("+TIMESTAMP+%%22%s%%22", localizedTime));
+                               String localizedTime = toLocalTimestamp(time, false);
+                               matcher.appendReplacement(stringBuffer, String.format(" TIMESTAMP \"%s\"", localizedTime));
                        }
                        matcher.appendTail(stringBuffer);
                        result = stringBuffer.toString();