Changeset 22655

Timestamp:

02/09/10 15:53:15 (17 months ago)

Author:

rns

Message:

Don't count subclass constraints when checking to see if constraint logic should be displayed.

Location:

branches/mnw21/pathquery_refactor/intermine

Files:

• pathquery/main/src/org/intermine/pathquery/PathQuery.java (modified) (2 diffs)
• pathquery/test/src/org/intermine/pathquery/PathQueryUnitTest.java (modified) (1 diff)
• webapp/main/resources/webapp/queryBuilderConstraintLogic.jsp (modified) (1 diff)

branches/mnw21/pathquery_refactor/intermine/pathquery/main/src/org/intermine/pathquery/PathQuery.java

@@ -717 +717 @@
      */
     public synchronized Map<PathConstraint, String> getConstraints() {
-        return Collections.unmodifiableMap(new LinkedHashMap<PathConstraint, String>(constraints));
+        Map<PathConstraint, String> retval = new LinkedHashMap<PathConstraint, String>(constraints);
+        return retval;
     }
 
@@ -752 +753 @@
         }
         return Collections.unmodifiableList(retval);
+    }
+
+    /**
+     * Return the constraint codes used in the query, some constraint types (subclasses) don't
+     * get assigned a code, these are not included.  This method returns all of the codes that
+     * should be involved in the logic expression of the query.
+     * @return the constraint codes used in this query
+     */
+    public synchronized Set<String> getConstraintCodes() {
+        Set<String> codes = new HashSet<String>();
+        for (String code : constraints.values()) {
+            if (code != null) {
+                codes.add(code);
+            }
+        }
+        return codes;
     }
 

branches/mnw21/pathquery_refactor/intermine/pathquery/test/src/org/intermine/pathquery/PathQueryUnitTest.java

@@ -873 +873 @@
     }
     
+    public void testGetConstraintCodes() {
+        Model model = Model.getInstanceByName("testmodel");
+        PathQuery q = new PathQuery(model);
+        q.addViews("Department.name");
+        q.addConstraint(new PathConstraintSubclass("Department.employees", "Manager"));
+
+        Set<String> expected = new HashSet<String>();
+        assertEquals(expected, q.getConstraintCodes());
+
+        q.addConstraint(new PathConstraintAttribute("Department.employees.age", ConstraintOp.EQUALS, "12"));
+        expected.add("A");
+        assertEquals(expected, q.getConstraintCodes());
+
+        q.addConstraint(new PathConstraintAttribute("Department.name", ConstraintOp.EQUALS, "DepartmentA"));
+        expected.add("B");
+        assertEquals(expected, q.getConstraintCodes());
+    }
+    
     public void testRemoveSubclass() throws Exception {
         Model model = Model.getInstanceByName("testmodel");

branches/mnw21/pathquery_refactor/intermine/webapp/main/resources/webapp/queryBuilderConstraintLogic.jsp

@@ -29 +29 @@
 <strong><fmt:message key="query.constraintLogic"/>:</strong>
   <c:choose>
-    <c:when test="${fn:length(QUERY.constraints) == 1}">
+    <c:when test="${fn:length(QUERY.constraintCodes) == 1}">
       <div class="smallnote altmessage"><fmt:message key="query.oneConstraint"/></div>
     </c:when>
-    <c:when test="${fn:length(QUERY.constraints) == 0}">
+    <c:when test="${fn:length(QUERY.constraintCodes) == 0}">
       <div class="smallnote altmessage"><fmt:message key="query.noConstraints"/></div>
     </c:when>
     <c:otherwise>
-        <span id="constraintLogic" title="Click to Edit" alt="Click to Edit">${constraintLogicExpr}</span>
-        <span id="editConstraintLogic" style="display: none">
-            <%--<html:link action="/query?editExpression" style="font-size: 11px">
-              <fmt:message key="query.logicEdit"/>
-            </html:link>--%>
-            <input type="test" name="expr" id="expr" size="20" value="${constraintLogicExpr}"/>
-            <button id="editconstraintlogic" type="button" style="font-size: 11px"><fmt:message key="query.logicUpdate"/></button>
-        </span>
+      <span id="constraintLogic" title="Click to Edit" alt="Click to Edit">${constraintLogicExpr}</span>
+      <span id="editConstraintLogic" style="display: none">
+        <input type="test" name="expr" id="expr" size="20" value="${constraintLogicExpr}"/>
+          <button id="editconstraintlogic" type="button" style="font-size: 11px"><fmt:message key="query.logicUpdate"/></button>
+      </span>
     </c:otherwise>
   </c:choose>