Changeset 1517

Timestamp:

12/03/08 10:20:53 (5 weeks ago)

Author:

droos

Message:

catch another invalid path format ( /.. ); (the path is technically valid, but outside our supported subset)

Location:

branches/dev-repeat

Files:

• j2merosa/org.javarosa.communication.sms.trigger/.project (added)
• j2merosa/org.javarosa.profile/.project (added)
• javarosa/org.javarosa.core.model/src/org/javarosa/core/model/instance/TreeReference.java (modified) (2 diffs)
• javarosa/org.javarosa.xform/src/org/javarosa/model/xform/XPathReference.java (modified) (1 diff)
• javarosa/org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java (modified) (2 diffs)

branches/dev-repeat/javarosa/org.javarosa.core.model/src/org/javarosa/core/model/instance/TreeReference.java

@@ -53 +53 @@
         //return a new reference that is this reference anchored to a passed-in parent reference
         //if this reference is absolute, return self
-        //if this ref as 'parent' steps (..), it can only be anchored if the parent ref is a relative ref consisting only of 'parent' steps
+        //if this ref has 'parent' steps (..), it can only be anchored if the parent ref is a relative ref consisting only of other 'parent' steps
         //return null in these invalid situations
         public TreeReference parent (TreeReference parentRef) {
@@ -77 +77 @@
                 }
         }
-        
-        public TreeReference append (TreeReference childRef) {
-                return childRef.prepend(this);
-        }
-        
+                
         //assumes contextRef refers to a singular, existing node in the model
         public TreeReference anchor (TreeReference contextRef) {

branches/dev-repeat/javarosa/org.javarosa.xform/src/org/javarosa/model/xform/XPathReference.java

@@ -66 +66 @@
         public static TreeReference getRefFromPathExpr (XPathPathExpr path) throws XPathUnsupportedException {
                 TreeReference ref = new TreeReference();
+                boolean parentsAllowed;
                 
                 switch (path.init_context) {
-                case XPathPathExpr.INIT_CONTEXT_ROOT: ref.refLevel = TreeReference.REF_ABSOLUTE;
-                case XPathPathExpr.INIT_CONTEXT_RELATIVE: ref.refLevel = 0;
-                case XPathPathExpr.INIT_CONTEXT_EXPR: throw new XPathUnsupportedException();
+                case XPathPathExpr.INIT_CONTEXT_ROOT:
+                        ref.refLevel = TreeReference.REF_ABSOLUTE;
+                        parentsAllowed = false;
+                        break;
+                case XPathPathExpr.INIT_CONTEXT_RELATIVE:
+                        ref.refLevel = 0;
+                        parentsAllowed = true;
+                        break;
+                default: throw new XPathUnsupportedException();
                 }
                 
-                boolean parentsAllowed = true;
                 for (int i = 0; i < path.steps.length; i++) {
                         XPathStep step = path.steps[i];

branches/dev-repeat/javarosa/org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java

@@ -209 +209 @@
 
                 parseElement(formDef, doc.getRootElement(), formDef, topLevelHandlers);
+                collapseRepeatGroups(formDef);
                 if(instanceNode != null) {
                         parseInstance(formDef, instanceNode);
                 }
-                collapseRepeatGroups(formDef);
 
                 initStateVars();
@@ -269 +269 @@
                                 //binds and data types and such
                                 saveInstanceNode(child);
-                        } else if ("bind".equals(childName)) {
+                        } else if ("bind".equals(childName)) { //<instance> must come before <bind>s
                                 parseBind(f, child);
                         } else {