Changeset 22642

Timestamp:

02/09/10 09:56:28 (17 months ago)

Author:

dbutano

Message:

If the operator is null, the contraint could be a lookup constraint

File:

• branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/struts/TemplateAction.java (modified) (3 diffs)

branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/struts/TemplateAction.java

@@ -258 +258 @@
                         String op = (String) tf.getAttributeOps(key);
                         if (op == null) {
-                            if (tf.getNullConstraint(key) != null) {
+                            if (c instanceof PathConstraintLookup) {
+                                value = new TemplateValue(c, ConstraintOp.LOOKUP,
+                                        (String) tf.getAttributeValues(key),
+                                        TemplateValue.ValueType.SIMPLE_VALUE);
+                            } else if (tf.getNullConstraint(key) != null) {
                                 if (ConstraintOp.IS_NULL.toString()
                                     .equals(tf.getNullConstraint(key))) {
@@ -277 +281 @@
                             String constraintValue = "";
                             String multiValueAttribute = tf.getMultiValueAttribute(key);
-                            if(multiValueAttribute != null && !("".equals(multiValueAttribute))) {
+                            if (multiValueAttribute != null && !("".equals(multiValueAttribute))) {
                                 constraintValue = tf.getMultiValueAttribute(key);
                             } else {
@@ -319 +323 @@
         } else if (con instanceof PathConstraintNull) {
             return ((PathConstraintNull) con).getOp().toString();
-        } else if (con instanceof PathConstraintMultiValue)
-            return ((PathConstraintMultiValue) con).getOp().toString();
+        } else if (con instanceof PathConstraintMultiValue) {
+            return ((PathConstraintMultiValue) con).getOp().toString();
+        }
         return null;
     }