Changeset 22714

Timestamp:

03/09/10 17:02:37 (17 months ago)

Author:

mnw21

Message:

Changed xml format of multi value constraints

Location:

branches/mnw21/pathquery_refactor/intermine

Files:

• api/main/src/org/intermine/api/xml/SavedQueryHandler.java (modified) (1 diff)
• api/main/src/org/intermine/api/xml/TemplateQueryHandler.java (modified) (4 diffs)
• pathquery/main/src/org/intermine/pathquery/PathQueryBinding.java (modified) (1 diff)
• pathquery/main/src/org/intermine/pathquery/PathQueryHandler.java (modified) (12 diffs)

branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/xml/SavedQueryHandler.java

@@ -62 +62 @@
      */
     @Override
-    public void endElement(String uri, String localName, String qName) {
+    public void endElement(String uri, String localName, String qName) throws SAXException {
         super.endElement(uri, localName, qName);
         if ("saved-query".equals(qName)) {

branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/xml/TemplateQueryHandler.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -87 +88 @@
                             + templateName);
                 }
-                PathConstraint constraint = processConstraint(query, path, attrs);
-                if ((code == null) || (constraint instanceof PathConstraintLoop)) {
-                    query.addConstraint(constraint);
-                } else {
-                    query.addConstraint(constraint, code);
+                constraintPath = path;
+                constraintAttributes = new HashMap<String, String>();
+                for (int i = 0; i < attrs.getLength(); i++) {
+                    constraintAttributes.put(attrs.getQName(i), attrs.getValue(i));
                 }
-                String description = attrs.getValue("description");
-                String editable = attrs.getValue("editable");
-                if ("true".equals(editable)) {
-                    editableConstraints.add(constraint);
-                }
-                constraintDescriptions.put(constraint, description);
-                String switchable = attrs.getValue("switchable");
-                if ("on".equals(switchable)) {
-                    constraintSwitchables.put(constraint, SwitchOffAbility.ON);
-                } else if ("off".equals(switchable)) {
-                    constraintSwitchables.put(constraint, SwitchOffAbility.OFF);
-                }
+                constraintValues = new LinkedHashSet<String>();
+                constraintCode = code;
+
             }
         } else {
@@ -115 +106 @@
      */
     @Override
-    public void endElement(String uri, String localName, String qName) {
-        super.endElement(uri, localName, qName);
+    public void endElement(String uri, String localName, String qName) throws SAXException {
         if ("template".equals(qName)) {
             TemplateQuery t = new TemplateQuery(templateName, templateTitle, templateComment,
@@ -130 +120 @@
             templates.put(templateName, t);
             reset();
+        } else if ("constraint".equals(qName)) {
+            PathConstraint constraint = processConstraint(query, constraintPath,
+                    constraintAttributes, constraintValues);
+            if ((constraintCode == null) || (constraint instanceof PathConstraintLoop)) {
+                query.addConstraint(constraint);
+            } else {
+                query.addConstraint(constraint, constraintCode);
+            }
+            String description = constraintAttributes.get("description");
+            String editable = constraintAttributes.get("editable");
+            if ("true".equals(editable)) {
+                editableConstraints.add(constraint);
+            }
+            constraintDescriptions.put(constraint, description);
+            String switchable = constraintAttributes.get("switchable");
+            if ("on".equals(switchable)) {
+                constraintSwitchables.put(constraint, SwitchOffAbility.ON);
+            } else if ("off".equals(switchable)) {
+                constraintSwitchables.put(constraint, SwitchOffAbility.OFF);
+            }
+            constraintPath = null;
+        } else {
+            super.endElement(uri, localName, qName);
         }
     }

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

@@ -181 +181 @@
             } else if (constraint.getKey() instanceof PathConstraintMultiValue) {
                 writer.writeAttribute("op", "" + constraint.getKey().getOp());
-                StringBuilder sb = new StringBuilder();
-                boolean needComma = false;
                 for (String value : ((PathConstraintMultiValue) constraint.getKey()).getValues()) {
-                    if (value.contains(",")) {
-                        throw new XMLStreamException("Value in MultiValue contains a comma - this "
-                                + "query cannot be represented in XML");
-                    }
                     if (!value.equals(value.trim())) {
                         throw new XMLStreamException("Value in MultiValue starts or ends with "
                                 + "whitespace - this query cannot be represented in XML");
                     }
-                    if (needComma) {
-                        sb.append(", ");
-                    }
-                    needComma = true;
-                    sb.append(value);
-                }
-                writer.writeAttribute("values", sb.toString());
+                    writer.writeStartElement("value");
+                    writer.writeCharacters(value);
+                    writer.writeEndElement();
+                }
             } else if (constraint.getKey() instanceof PathConstraintLoop) {
                 writer.writeAttribute("op", "" + constraint.getKey().getOp());

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

@@ -49 +49 @@
                 "float", "double", "short", "int", "long", "Boolean", "Float", "Double", "Short",
                 "Integer", "Long", "BigDecimal", "Date", "String"));
+    private StringBuilder valueBuffer = null;
+    protected String constraintPath = null;
+    protected Map<String, String> constraintAttributes = null;
+    protected Collection<String> constraintValues = null;
+    protected String constraintCode = null;
 
     /**
@@ -66 +71 @@
             @SuppressWarnings("unused") String localName, String qName, Attributes attrs)
         throws SAXException {
+        if (valueBuffer != null) {
+            throw new SAXException("Cannot have any tags inside a value tag");
+        }
+        if ((constraintPath != null) && (!"value".equals(qName))) {
+            throw new SAXException("Cannot have anything other than value tag inside a constraint");
+        }
         if ("query-list".equals(qName)) {
             // Do nothing
@@ -132 +143 @@
             } else {
                 path = path.replace(':', '.');
-                PathConstraint constraint = processConstraint(query, path, attrs);
-                if (code == null) {
-                    query.addConstraint(constraint);
-                } else {
-                    query.addConstraint(constraint, code);
-                }
+                constraintPath = path;
+                constraintAttributes = new HashMap<String, String>();
+                for (int i = 0; i < attrs.getLength(); i++) {
+                    constraintAttributes.put(attrs.getQName(i), attrs.getValue(i));
+                }
+                constraintValues = new LinkedHashSet<String>();
+                constraintCode = code;
             }
         } else if ("pathDescription".equals(qName)) {
@@ -153 +165 @@
                 throw new SAXException("Unknown join style " + type + " for path " + pathString);
             }
+        } else if ("value".equals(qName)) {
+            valueBuffer = new StringBuilder();
         }
     }
@@ -162 +176 @@
      * @param path the path of the constraint to create
      * @param attrs the XML attributes
+     * @param values the enclosed values
      * @return a PathConstraint object
      * @throws SAXException if something is wrong
      */
     public PathConstraint processConstraint(PathQuery query, String path,
-            Attributes attrs) throws SAXException {
-        ConstraintOp constraintOp = ConstraintOp.getConstraintOp(attrs.getValue("op"));
+            Map<String, String> attrs, Collection<String> values) throws SAXException {
+        ConstraintOp constraintOp = ConstraintOp.getConstraintOp(attrs.get("op"));
         if (ConstraintOp.CONTAINS.equals(constraintOp)) {
             constraintOp = ConstraintOp.MATCHES;
@@ -175 +190 @@
             if (PathConstraintLoop.VALID_OPS.contains(constraintOp)) {
                 try {
-                    Path constraintPath = query.makePath(path);
-                    if (!constraintPath.endIsAttribute()) {
+                    Path constraintPath2 = query.makePath(path);
+                    if (!constraintPath2.endIsAttribute()) {
                         isLoop = true;
                     }
@@ -185 +200 @@
             }
             if (isLoop) {
-                String loopPath = attrs.getValue("loopPath");
+                String loopPath = attrs.get("loopPath");
                 if (loopPath == null) {
-                    loopPath = attrs.getValue("value");
+                    loopPath = attrs.get("value");
                 }
                 loopPath = loopPath.replace(':', '.');
                 return new PathConstraintLoop(path, constraintOp, loopPath);
             } else {
-                String constraintValue = attrs.getValue("value");
+                String constraintValue = attrs.get("value");
                 return new PathConstraintAttribute(path, constraintOp, constraintValue);
             }
@@ -198 +213 @@
             return new PathConstraintNull(path, constraintOp);
         } else if (PathConstraintBag.VALID_OPS.contains(constraintOp)) {
-            String bag = attrs.getValue("value");
-            String ids = attrs.getValue("ids");
+            String bag = attrs.get("value");
+            String ids = attrs.get("ids");
             if (bag != null) {
                 return new PathConstraintBag(path, constraintOp, bag);
@@ -214 +229 @@
                 return new PathConstraintIds(path, constraintOp, idsCollection);
             } else {
-                String values = attrs.getValue("values");
-                String[] valueArray = values.split(",");
                 Collection<String> valuesCollection = new LinkedHashSet<String>();
-                for (String value : valueArray) {
+                for (String value : values) {
                     valuesCollection.add(value.trim());
                 }
@@ -223 +236 @@
             }
         } else if (ConstraintOp.LOOKUP.equals(constraintOp)) {
-            String lookup = attrs.getValue("value");
-            String extraValue = attrs.getValue("extraValue");
+            String lookup = attrs.get("value");
+            String extraValue = attrs.get("extraValue");
             return new PathConstraintLookup(path, lookup, extraValue);
         } else {
             throw new SAXException("Invalid operation type: " + constraintOp
-                    + " (from text \"" + attrs.getValue("op") + "\"");
+                    + " (from text \"" + attrs.get("op") + "\", attributes: " + attrs + ")");
         }
     }
@@ -236 +249 @@
      */
     @Override public void endElement(@SuppressWarnings("unused") String uri,
-                           @SuppressWarnings("unused") String localName, String qName) {
+            @SuppressWarnings("unused") String localName, String qName) throws SAXException {
         if ("query".equals(qName)) {
             if (constraintLogic != null) {
@@ -263 +276 @@
         } else if ("node".equals(qName)) {
             currentNodePath = null;
+        } else if ("constraint".equals(qName) && (constraintPath != null)) {
+            PathConstraint constraint = processConstraint(query, constraintPath,
+                    constraintAttributes, constraintValues);
+            if (constraintCode == null) {
+                query.addConstraint(constraint);
+            } else {
+                query.addConstraint(constraint, constraintCode);
+            }
+            constraintPath = null;
+        } else if ("value".equals(qName)) {
+            if (valueBuffer == null) {
+                throw new NullPointerException("valueBuffer is null while closing value tag");
+            }
+            constraintValues.add(valueBuffer.toString());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void characters(char[] ch, int start, int length) {
+        if (valueBuffer != null) {
+            valueBuffer.append(ch, start, length);
         }
     }