You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2012/04/19 23:16:11 UTC
svn commit: r1328119 - in
/chemistry/opencmis/trunk/chemistry-opencmis-server:
chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/
chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmi...
Author: jens
Date: Thu Apr 19 21:16:10 2012
New Revision: 1328119
URL: http://svn.apache.org/viewvc?rev=1328119&view=rev
Log:
undo parser changes, remove misleading comment in query walker
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmis/server/support/query/CmisQueryWalker.g
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java?rev=1328119&r1=1328118&r2=1328119&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java Thu Apr 19 21:16:10 2012
@@ -55,7 +55,6 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.types.PropertyUtil;
import org.apache.chemistry.opencmis.server.support.TypeManager;
import org.apache.chemistry.opencmis.server.support.query.AbstractPredicateWalker;
-import org.apache.chemistry.opencmis.server.support.query.CalendarHelper;
import org.apache.chemistry.opencmis.server.support.query.CmisQueryWalker;
import org.apache.chemistry.opencmis.server.support.query.CmisSelector;
import org.apache.chemistry.opencmis.server.support.query.ColumnReference;
@@ -660,20 +659,12 @@ public class InMemoryQueryProcessor {
break;
}
case DATETIME:
- // parse date from string
- GregorianCalendar dt;
-
- if (rVal instanceof String)
- dt = CalendarHelper.fromString((String) rVal); // will throw exception if not parsable
- else if (rVal instanceof GregorianCalendar)
- dt = (GregorianCalendar) rVal;
- else
- throw new IllegalArgumentException("Unsupported date type " + rVal);
- // LOG.debug("left:" +
- // CalendarHelper.toString((GregorianCalendar)lValue) +
- // " right: " +
- // CalendarHelper.toString((GregorianCalendar)rVal));
- return ((GregorianCalendar) lValue).compareTo(dt);
+ if (rVal instanceof GregorianCalendar) {
+ return ((GregorianCalendar) lValue).compareTo((GregorianCalendar) rVal);
+ } else {
+ throwIncompatibleTypesException(lValue, rVal);
+ }
+ break;
case DECIMAL: {
Double lDoubleValue = ((BigDecimal) lValue).doubleValue();
if (rVal instanceof Double) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmis/server/support/query/CmisQueryWalker.g
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmis/server/support/query/CmisQueryWalker.g?rev=1328119&r1=1328118&r2=1328119&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmis/server/support/query/CmisQueryWalker.g (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/antlr3/org/apache/chemistry/opencmis/server/support/query/CmisQueryWalker.g Thu Apr 19 21:16:10 2012
@@ -350,11 +350,6 @@ literal returns [Object value]:
{
String s = $TIME_LIT.text;
s = s!= null ? s.substring(s.indexOf('\'') + 1, s.length() - 1) : null;
- try {
- // $value = CalendarHelper.fromString(s);
- } catch (IllegalArgumentException e) {
- throw new UnwantedTokenException(Token.INVALID_TOKEN_TYPE, input);
- }
}
| BOOL_LIT
{