Changeset 1518

Timestamp:

12/03/08 16:46:45 (5 weeks ago)

Author:

droos

Message:

adding changes-in-progress for construction of repeat-aware data model instance

Location:

branches/dev-repeat/javarosa

Files:

• org.javarosa.core.model/src/org/javarosa/core/model/instance/QuestionDataElement.java (modified) (1 diff)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/QuestionDataGroup.java (modified) (1 diff)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/TreeReference.java (modified) (1 diff)
• org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java (modified) (6 diffs)

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

@@ -49 +49 @@
          */
         public QuestionDataElement(String name) {
-                this(name, 1);
+                this(name, 0);
         }
 

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

@@ -52 +52 @@
          */
         public QuestionDataGroup(String name) {
-                this(name, 1);
+                this(name, 0);
         }
         

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

@@ -38 +38 @@
         public int size () {
                 return names.size();
+        }
+        
+        public void add (String name, int index) {
+                names.addElement(name);
+                multiplicity.addElement(new Integer(index));
         }
         

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

@@ -61 +61 @@
         private static Vector bindings;
         private static Vector repeats;
+        private static Vector selectOnes;
+        private static Vector selectMultis;
         private static Element instanceNode; //top-level data node of the instance; saved off so it can be processed after the <bind>s
 
@@ -164 +166 @@
                 bindings = new Vector();
                 repeats = new Vector();
+                selectOnes = new Vector();
+                selectMultis = new Vector();
                 instanceNode = null;
         }
@@ -335 +339 @@
                         }
                         question.setBind(dataRef);
+                        
+                        if (controlType == Constants.CONTROL_SELECT_ONE) {
+                                selectOnes.addElement(dataRef);
+                        } else if (controlType == Constants.CONTROL_SELECT_MULTI) {
+                                selectMultis.addElement(dataRef);
+                        }
                 }               
 
@@ -806 +816 @@
         }
 
+        //e is the top-level _data_ node of the instance (immediate (and only) child of <instance>)
         private static void parseInstance (FormDef f, Element e) {
-                TreeElement root = parseInstanceNodes(e, TreeReference.rootRef()).getRoot();
+                TreeElement root = buildInstanceStructure(e, null, TreeReference.rootRef());
+                applyInstanceProperties(root);
+                loadInstanceData(e, root);
+                
+                //TreeElement root = parseInstanceNodes(e, TreeReference.rootRef()).getRoot();
                 DataModelTree instanceModel = new DataModelTree(root);
                 instanceModel.setName(f.getName());
@@ -813 +828 @@
         }
 
+        //create node structure
+        //evaluate binds and apply properties
+        //load data based on data type
+
+        private static TreeElement buildInstanceStructure (Element node, QuestionDataGroup parent, TreeReference ref) {
+                TreeElement element = null;
+                boolean isGroup;
+
+                boolean hasText = false;
+                boolean hasElements = false;
+                
+                int numChildren = node.getChildCount();         
+                for (int i = 0; i < numChildren; i++) {
+                        switch (node.getType(i)) {
+                        case Node.ELEMENT: hasElements = true; break;
+                        case Node.TEXT: hasText = true; break;
+                        }
+                }
+                
+                if (hasElements) {
+                        isGroup = true;
+                        if (hasText) {
+                                System.out.println("Warning: instance node contains both elements and text as children; text ignored");
+                        }
+                } else {
+                        isGroup = false;
+                }
+
+                String name = node.getName();
+                int multiplicity = (parent == null ? 0 : parent.getMultiplicity(name));
+                
+                if (isGroup) {
+                        element = new QuestionDataGroup(name, multiplicity);
+
+                        for (int i = 0; i < numChildren; i++) {
+                                if (node.getType(i) == Node.ELEMENT) {
+                                        ((QuestionDataGroup)element).addChild(buildInstanceStructure(node.getElement(i), (QuestionDataGroup)element));
+                                }
+                        }
+                } else {
+                        element = new QuestionDataElement(name, multiplicity);
+                }
+
+                //handle attributes
+                if (node.getAttributeCount() > 0) {
+                        for (int i = 0; i < node.getAttributeCount(); i++) {
+                                element.setAttribute(node.getAttributeNamespace(i), node.getAttributeName(i), node.getAttributeValue(i));
+                                //#if debug.output==verbose
+                                System.out.println(element.getName()+ " has added attr: "+element.getAttributeName(i)+"="+element.getAttributeValue(i));
+                                //#endif
+                        }
+                }
+                
+                return element;
+        }
+        
         private static TreeElement parseInstanceNodes (Element node, TreeReference cur) {
                 int childNum = node.getChildCount();
@@ -820 +891 @@
                 XPathReference reference = new XPathReference(refStr);
 
+                //dgr: this is now obsolete: new process-- create nodes, iterate over binds, evaluate, and apply properties
                 if (bindingsByRef.containsKey(refStr)) {
                         DataBinding binding = (DataBinding) bindingsByRef.get(refStr);