Changeset 22681

Timestamp:

03/09/10 11:37:26 (17 months ago)

Author:

rns

Message:

Fix exception with null extra values in LOOKUP constraints.

Location:

branches/mnw21/pathquery_refactor/intermine

Files:

• web/main/src/org/intermine/web/struts/TemplateAction.java (modified) (2 diffs)
• webapp/main/resources/webapp/template.jsp (modified) (2 diffs)

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

@@ -262 +262 @@
                                         (String) tf.getAttributeValues(key),
                                         TemplateValue.ValueType.SIMPLE_VALUE,
-                                        tf.getExtraValues(key).toString());
+                                        extraValueToString(tf.getExtraValues(key)));
                             } else if (tf.getNullConstraint(key) != null) {
                                 if (ConstraintOp.IS_NULL.toString()
@@ -329 +329 @@
         return null;
     }
+    
+    private String extraValueToString(Object extraValue) {
+        if (extraValue == null) {
+            return null;
+        }
+        return extraValue.toString();
+    }
 }

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

@@ -130 +130 @@
               <%-- if null or not null value --%>
               <c:when test="${dec.nullSelected}">
-                <html:radio property="nullConstraint(${index})" value="IS NULL"/><fmt:message key="query.constraint.null"/>
-                <html:radio property="nullConstraint(${index})" value="IS NOT NULL"/><fmt:message key="query.constraint.notnull"/>
+                <html:radio property="nullConstraint(${index})" value="IS NULL"/><fmt:message key="query.constraint.null"/>
+                <html:radio property="nullConstraint(${index})" value="IS NOT NULL"/><fmt:message key="query.constraint.notnull"/>
               </c:when>
               <c:otherwise>
@@ -254 +254 @@
         </td>
         <td>
-        <c:if test="${!empty dec.bags && !dec.nullSelected}">
-                <html:checkbox property="useBagConstraint(${index})" onclick="clickUseBag(${index})" disabled="${empty dec.bags?'true':'false'}" />
-                <fmt:message key="template.constraintobe"/>
-                <%--Contained in bag:--%>
-                <html:select property="bagOp(${index})" disabled="true">
-                  <c:forEach items="${dec.bagOps}" var="bagOp">
-                    <option value="${bagOp.property}" <c:if test="${!empty dec.bagSelected && dec.selectedOp.property == bagOp.property}">selected</c:if>>
-                      <c:out value="${bagOp.label}" />
-                    </option>
-                  </c:forEach>
-                </html:select> 
-                <fmt:message key="template.constraintobelist"><fmt:param value="${dec.bagType}"/></fmt:message>
-                <html:select property="bag(${index})" disabled="true">
-                  <c:forEach items="${dec.bags}" var="bag">
-                    <option value="${bag}" <c:if test="${!empty dec.bagSelected && dec.selectedValue == bag}">selected</c:if>>
-                      <c:out value="${bag}" />
-                    </option>
-                  </c:forEach>
-                </html:select> 
-            </c:if> 
-            </td>
-            <%-- AND and OR button --%>
-            <%--  
-            <td valign="middle">
-                <a id="orButton(${index})" style="text-decoration:none;" href="javascript:addOR(${index})" title="Add OR constraint">
-                    <span style="font-size: 12px;color: #477b46;font-weight: bold;margin-left: 15px;margin-right: 5px">OR+</span>
-                </a> 
-             
-                <a id="andButton(${index})" style="text-decoration:none;" href="javascript:addAND(${index})" title="Add AND constraint">
-                    <span style="font-size: 12px;color: #477b46;font-weight: bold;margin-right: 5px">AND+</span>
-                </a>
-            </td>
-            --%>
-            </tr>
-            </table>
-            <c:if test="${!empty builder && builder=='yes'}">
-                </div>
-            </c:if>
-        </li>
+          <c:if test="${!empty dec.bags && !dec.nullSelected}">
+            <html:checkbox property="useBagConstraint(${index})" onclick="clickUseBag(${index})" disabled="${empty dec.bags?'true':'false'}" />
+            <fmt:message key="template.constraintobe"/>
+            <%--Contained in bag:--%>
+            <html:select property="bagOp(${index})" disabled="true">
+              <c:forEach items="${dec.bagOps}" var="bagOp">
+                <option value="${bagOp.property}" <c:if test="${!empty dec.bagSelected && dec.selectedOp.property == bagOp.property}">selected</c:if>>
+                  <c:out value="${bagOp.label}" />
+                </option>
+              </c:forEach>
+            </html:select> 
+            <fmt:message key="template.constraintobelist"><fmt:param value="${dec.bagType}"/></fmt:message>
+            <html:select property="bag(${index})" disabled="true">
+              <c:forEach items="${dec.bags}" var="bag">
+                <option value="${bag}" <c:if test="${!empty dec.bagSelected && dec.selectedValue == bag}">selected</c:if>>
+                  <c:out value="${bag}" />
+                </option>
+              </c:forEach>
+            </html:select> 
+          </c:if> 
+        </td>
+
+        <%-- AND and OR button --%>
+       <%--  
+         <td valign="middle">
+           <a id="orButton(${index})" style="text-decoration:none;" href="javascript:addOR(${index})" title="Add OR constraint">
+             <span style="font-size: 12px;color: #477b46;font-weight: bold;margin-left: 15px;margin-right: 5px">OR+</span>
+           </a> 
+           <a id="andButton(${index})" style="text-decoration:none;" href="javascript:addAND(${index})" title="Add AND constraint">
+             <span style="font-size: 12px;color: #477b46;font-weight: bold;margin-right: 5px">AND+</span>
+           </a>
+         </td>
+       --%>
+      </tr>
+    </table>
+    <c:if test="${!empty builder && builder=='yes'}">
+      </div>
+    </c:if>
+  </li>
         
        <script type="text/javascript">
-            initConstraints(${index});
-        </script>
+         initConstraints(${index});
+       </script>
         </c:forEach>
-        </ol>
-      </div>
+</ol>
+</div>
 <%-- edit/submit buttons --%>
 <c:if test="${empty builder}">