Changeset 22656

Timestamp:

02/09/10 16:51:57 (17 months ago)

Author:

rns

Message:

MultiValue? constraints that aren't srings now create valid queries.

File:

• branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/query/MainHelper.java (modified) (1 diff)

branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/query/MainHelper.java

@@ -400 +400 @@
                                     ((PathConstraintIds) constraint).getIds()));
                     } else if (constraint instanceof PathConstraintMultiValue) {
-                        codeToConstraint.put(code, new BagConstraint((QueryField) field,
+                        Class<?> fieldType = path.getEndType();
+                        if (String.class.equals(fieldType)) {
+                            codeToConstraint.put(code, new BagConstraint((QueryField) field,
                                     constraint.getOp(), ((PathConstraintMultiValue) constraint)
                                     .getValues()));
+                        } else {
+                            Collection<Object> objects = new ArrayList<Object>();
+                            for (String s : ((PathConstraintMultiValue) constraint).getValues()) {
+                                objects.add(TypeUtil.stringToObject(fieldType, s));
+                            }
+                            codeToConstraint.put(code, new BagConstraint((QueryField) field,
+                                    constraint.getOp(), objects));
+                        }
                     } else if (constraint instanceof PathConstraintLookup) {
                         QueryClass qc = (QueryClass) field;