Changeset 1516

Timestamp:

12/02/08 18:20:46 (5 weeks ago)

Author:

droos

Message:

adding in first wave of repeat dev (does not build)

Location:

branches/dev-repeat/javarosa

Files:

• org.javarosa.core.model/src/org/javarosa/core/model/DataBinding.java (modified) (3 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/FormDef.java (modified) (6 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/GroupDef.java (modified) (3 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/QuestionDef.java (modified) (1 diff)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/DataModelTree.java (modified) (6 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/QuestionDataElement.java (modified) (7 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/QuestionDataGroup.java (modified) (3 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/TreeElement.java (modified) (2 diffs)
• org.javarosa.core.model/src/org/javarosa/core/model/instance/TreeReference.java (added)
• org.javarosa.xform/src/org/javarosa/model/xform/XPathReference.java (modified) (6 diffs)
• org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java (modified) (19 diffs)

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

@@ -5 +5 @@
 import java.io.IOException;
 
-import org.javarosa.core.JavaRosaServiceProvider;
 import org.javarosa.core.model.condition.Condition;
-import org.javarosa.core.model.storage.FormDefRMSUtility;
+import org.javarosa.core.model.condition.IConditionExpr;
 import org.javarosa.core.util.externalizable.DeserializationException;
 import org.javarosa.core.util.externalizable.ExtUtil;
@@ -13 +12 @@
 import org.javarosa.core.util.externalizable.ExtWrapTagged;
 import org.javarosa.core.util.externalizable.Externalizable;
-import org.javarosa.core.util.externalizable.ExternalizableHelperDeprecated;
 import org.javarosa.core.util.externalizable.PrototypeFactory;
-import org.javarosa.core.util.externalizable.PrototypeFactoryDeprecated;
 
 /**
@@ -36 +33 @@
         private IDataReference ref;
         private int dataType;
-        //private ... constraints;
-
-        //do getters/setters later
+        
         public Condition relevancyCondition;
+        public boolean relevantAbsolute;
         public Condition requiredCondition;
         public boolean requiredAbsolute;
         public Condition readonlyCondition;
         public boolean readonlyAbsolute;
+        public IConditionExpr constraint;
         
         private String preload;
         private String preloadParams;
+        public String constraintMessage;
         
         public DataBinding () {
+                relevantAbsolute = true;
                 requiredAbsolute = false;
                 readonlyAbsolute = false;

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

@@ -35 +35 @@
 public class FormDef implements IFormElement, Localizable, IDRecordable, Externalizable{
         private Vector children;        /** A collection of group definitions. */
-        private Vector dataBindings = new Vector();
         private int id;         /** The numeric unique identifier of the form definition. */    
         private String name;    /** The display name of the form. */
@@ -238 +237 @@
                 return null;
         }
-        
-        public Vector getBindings () {
-                return dataBindings;
-        }
-        
-        public void setBindings (Vector v) {
-                this.dataBindings = v;
-        }
-        
+                        
         /**
          * @return the preloads
@@ -259 +250 @@
         public void setPreloader(QuestionPreloader preloads) {
                 this.preloader = preloads;
-        }
-
-        /**
-         * @param db A new DataBinding to be added to the form's list.
-         */
-        public void addBinding (DataBinding db) {
-                if (dataBindings == null)
-                        dataBindings = new Vector();
-                dataBindings.addElement(db);
         }
 
@@ -290 +272 @@
         public void preloadModel() {
                 IAnswerData preload = null;
-                
-                // 25/08/2008 BWD 
-                // Fixed bug where it expected bindings.  Not all forms have bindings!
-                if(getBindings() == null)
-                        return;
-                
+                                
                 Enumeration en = getBindings().elements();
                 while(en.hasMoreElements()) {
@@ -352 +329 @@
                 setName((String)ExtUtil.read(dis, new ExtWrapNullable(String.class), pf));
                 setChildren((Vector)ExtUtil.read(dis, new ExtWrapListPoly(), pf));
-                setBindings((Vector)ExtUtil.read(dis, new ExtWrapList(DataBinding.class), pf));
                 
                 model = (IFormDataModel)ExtUtil.read(dis, new ExtWrapTagged(), pf);
@@ -392 +368 @@
                 ExtUtil.write(dos, new ExtWrapNullable(getName()));
                 ExtUtil.write(dos, new ExtWrapListPoly(getChildren()));
-                ExtUtil.write(dos, new ExtWrapList(ExtUtil.emptyIfNull(getBindings())));
                 ExtUtil.write(dos, new ExtWrapTagged(model));
                 ExtUtil.write(dos, new ExtWrapNullable(localizer));

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

@@ -32 +32 @@
         private int id; /** The group number. */
         private String name;    /** The name of the group. */
+        private IDataReference binding; /** reference to a location in the model to store data in */
         
         private String longText;
@@ -37 +38 @@
         private String shortText;
         private String shortTextID;
+        
+        public boolean noAddRemove = false;
+        //public boolean startEmpty = false;
+        public IDataReference count = null;
         
         public GroupDef () {
@@ -65 +70 @@
         }
 
+        public IDataReference getBind() {
+                return binding;
+        }
+        
+        public void setBind(IDataReference binding) {
+                this.binding = binding;
+        }
+        
         public Vector getChildren() {
                 return children;

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

@@ -55 +55 @@
         private Vector selectItemsLocalizable;
         
-        private boolean required;       /** A flag to tell whether the question is to be answered or is optional. */
-        //constraints?
-        
-        private boolean visible;        /** A flag to tell whether the question should be shown or not. */
-        private boolean enabled;        /** A flag to tell whether the question should be enabled or disabled. */
-        private boolean locked;         /** A flag to tell whether a question is to be locked or not. A locked question is one which is visible, enabled, but cannot be edited. */
-
-        private IAnswerData defaultValue;       /** this shouldn't be used for default values that are already pre-loaded in the instance */
+        //private boolean required;     /** A flag to tell whether the question is to be answered or is optional. */
+        //private boolean visible;      /** A flag to tell whether the question should be shown or not. */
+        //private boolean enabled;      /** A flag to tell whether the question should be enabled or disabled. */
+        //private boolean locked;       /** A flag to tell whether a question is to be locked or not. A locked question is one which is visible, enabled, but cannot be edited. */
+
+        //this may be used in the future, but it is not the default value you're probably thinking about
+        //"these are not the default values you are looking for..."
+        //"not your mothers's default value anymore!"
+        //private IAnswerData defaultValue;
                 
         Vector observers;

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

@@ -6 +6 @@
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import org.javarosa.core.model.IDataReference;
@@ -19 +20 @@
 import org.javarosa.core.util.externalizable.ExtWrapTagged;
 import org.javarosa.core.util.externalizable.PrototypeFactory;
+import org.javarosa.model.xform.XPathReference;
 
 /**
@@ -78 +80 @@
         }
 
+        //throws classcastexception if not using XPathReference
+        public static TreeReference unpackReference (IDataReference ref) {
+                return (TreeReference)ref.getReference();
+        }
+        
+        //create the specified node in the tree, creating all intermediary nodes
+        //terminal = true: create element, false: create group (albeit empty)
+        //at each step, if multiplicity =
+        //  ALL or count: always create a new node at the step
+        //  [0,count): use that specific node
+        //return a reference that unambiguously refers to the newly created node
+        public TreeReference createNode (IDataReference ref, boolean terminal) {
+                QuestionDataGroup node = (QuestionDataGroup)root;
+                TreeReference tref = unpackReference(ref);
+                
+                for (int k = 0; k < tref.size(); k++) {
+                        String name = (String)tref.names.elementAt(k);
+                        int count = node.getMultiplicity(name);
+                        int mult = ((Integer)tref.multiplicity.elementAt(k)).intValue();
+                        
+                        TreeElement child;
+                        if (mult < count) {
+                                //fetch existing
+                                child = node.getChild(name, mult);
+                                if (child == null)
+                                        return null; //something wrong
+                        } else if (mult == TreeReference.INDEX_UNBOUND || mult == count) {
+                                //create new
+                                if (k == tref.size() - 1 && terminal) {
+                                        child = new QuestionDataElement(name, count, null);
+                                } else {
+                                        child = new QuestionDataGroup(name, count);
+                                }
+                                node.addChild(child);
+                                tref.multiplicity.setElementAt(new Integer(count), k);
+                        } else {
+                                return null;
+                        }
+                        
+                        if (k < tref.size() - 1) {
+                                if (child instanceof QuestionDataElement) {
+                                        throw new IllegalArgumentException();
+                                }       
+
+                                node = (QuestionDataGroup)child;
+                        }
+                }
+        }
+        //think this works
+        
+        public boolean deleteNode (IDataReference ref) {
+                return false;
+        }
+        
+        //for making new repeat instances; worry about later
+        public boolean copyNode (IDataReference from, IDataReference to) {
+                return false;
+        }
+        
         /*
          * (non-Javadoc)
@@ -84 +145 @@
          * Object)
          */
-        public boolean updateDataValue(IDataReference questionBinding,
-                        IAnswerData value) {
+        public boolean updateDataValue(IDataReference questionBinding, IAnswerData value) {
                 TreeElement treeElement = resolveReference(questionBinding);
                 if (treeElement != null) {
@@ -108 +168 @@
                 }
         }
-
+        
+        //return a vector of TreeReferences that refer to all nodes in the instance (one ref per node) that match
+        //the passed-in TreeReference, accounting for all repeats.
+        //the returned refs will each unambiguously refer to a single node (i.e., no multiplicities will be 'ALL')
+        public Vector expandReference (TreeReference ref) {
+                if (!ref.absolute)
+                        return null;
+                
+                Vector v = new Vector();
+                expandReference(ref, TreeReference.rootRef(), root, v);
+                return v;
+        }
+        
+        //helper function for expandReference(ref)
+        //sourceRef: original path we're matching against
+        //node: current node that has matched the sourceRef thus far
+        //templateRef: explicit path that refers to the current node
+        //refs: Vector to collect matching paths; if 'node' is a target node that matches sourceRef, templateRef is added to refs
+        private void expandReference (TreeReference sourceRef, TreeReference templateRef, TreeElement node, Vector refs) {
+                int depth = templateRef.size();
+                
+                if (depth == sourceRef.size()) {
+                        refs.addElement(templateRef);                   
+                } else if (node instanceof QuestionDataGroup) {
+                        QuestionDataGroup group = (QuestionDataGroup)node;
+                        String name = (String)sourceRef.names.elementAt(depth);
+                        int mult = ((Integer)sourceRef.multiplicity.elementAt(depth)).intValue();
+
+                        Vector children = new Vector();
+                        if (mult == TreeReference.INDEX_ALL) {
+                                int count = group.getMultiplicity(name);
+                                for (int i = 0; i < count; i++) {
+                                        TreeElement child = group.getChild(name, i);
+                                        if (child != null) {
+                                                children.addElement(child);
+                                        } else {
+                                                throw new IllegalStateException(); //missing/non-sequential nodes
+                                        }
+                                }
+                        } else {
+                                TreeElement child = group.getChild(name, mult);
+                                if (child != null)
+                                        children.addElement(child);
+                        }
+                        
+                        for (Enumeration e = children.elements(); e.hasMoreElements(); ) {
+                                TreeElement child = (TreeElement)e.nextElement();
+                                TreeReference newTemplateRef = (children.size() == 1 ? templateRef : templateRef.clone()); //don't clone templateRef unnecessarily
+                                newTemplateRef.names.addElement(name);
+                                newTemplateRef.multiplicity.addElement(new Integer(child.getMult()));
+                                
+                                expandReference(sourceRef, newTemplateRef, child, refs);
+                        }
+                }
+        }
+        
+        public TreeElement resolveReference (TreeReference ref) {
+                if (!ref.absolute)
+                        return null;
+                
+                TreeElement node = root;
+                for (int i = 0; i < ref.size(); i++) {
+                        if (!(node instanceof QuestionDataGroup)) {
+                                node = null;
+                                break;
+                        }
+                        QuestionDataGroup group = (QuestionDataGroup)node;
+                        
+                        String name = (String)ref.names.elementAt(i);
+                        int mult = ((Integer)ref.multiplicity.elementAt(i)).intValue();
+                        if (mult == TreeReference.INDEX_ALL) {
+                                if (group.children.size() == 1) {
+                                        mult = 0;
+                                } else {
+                                        //reference is not unambiguous
+                                        node = null;
+                                        break;
+                                }
+                        }
+                        
+                        node = group.getChild(name, mult);
+                        if (node == null)
+                                break;
+                }
+                return node;
+        }
         
         /**
@@ -118 +263 @@
          */
         public TreeElement resolveReference(IDataReference binding) {
-                if (root.isLeaf()) {
-                        if (root.matchesReference(binding)) {
-                                return root;
-                        } else {
-                                return null;
-                        }
-                } else {
-                        return resolveReference(binding,(QuestionDataGroup)root);
-                }
-        }
-        
-        /**
-         * Resolves a binding to a particular question data element
-         * @param binding The binding representing a particular question
-         * @param group 
-         * @return A QuestionDataElement corresponding to the binding
-         * provided. Null if none exists in this tree.
-         */
-        private TreeElement resolveReference(IDataReference binding, QuestionDataGroup group) {
-                //TODO: We can do this much more intelligently given that we know the format of the bindings
-                TreeElement target = null;
-                
-                Enumeration en = group.getChildren().elements();                
-                while(target == null && en.hasMoreElements()) {
-                        TreeElement dme = (TreeElement)en.nextElement();                        
-                        if (dme.matchesReference(binding)) {
-                                return dme;
-                        }
-                        else if(!dme.isLeaf()) {
-                                target = resolveReference(binding, (QuestionDataGroup)dme);
-                        }
-                }
-
-                return target;
+                return resolveReference(unpackReference(binding));
         }
         

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

@@ -34 +34 @@
         private IAnswerData value;
 
-        /** A Binding for the Question Definition */
-        private IDataReference reference;
-
         /**
          * Creates a new, blank, QuestionDataElement;
@@ -50 +47 @@
          * @param name
          *            The name of this TreeElement
-         * @param reference
-         *            The reference for Question Definitions
          */
-        public QuestionDataElement(String name, IDataReference reference) {
-                this();
-                this.name = name;
-                this.reference = reference;
+        public QuestionDataElement(String name) {
+                this(name, 1);
         }
 
+        public QuestionDataElement (String name, int multiplicity) {
+                this.name = name;
+                this.multiplicity = multiplicity;
+        }
+        
         /**
          * Creates a new QuestionDataElement for the question defined by the name
@@ -65 +63 @@
          * @param name
          *            The name of this TreeElement
-         * @param reference
-         *            The reference for Question Definitions
          * @param value
          *            The value for this Question Definition
          */
-        public QuestionDataElement(String name, IDataReference reference,
-                        IAnswerData value) {
-                this(name, reference);
+        public QuestionDataElement(String name, IAnswerData value) {
+                this(name);
                 this.value = value;
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see org.javarosa.core.model.TreeElement#getName()
-         */
-        public String getName() {
-                return name;
+        public QuestionDataElement(String name, int multiplicity, IAnswerData value) {
+                this(name, multiplicity);
+                this.value = value;
         }
-
+                
         /**
          * @return The value for the question defined by IBinding
@@ -106 +97 @@
         }
 
+        public void setMult (int multiplicity) {
+                this.multiplicity = multiplicity;
+        }
+        
         /*
          * (non-Javadoc)
@@ -137 +132 @@
         }
 
-        public void setReference(IDataReference reference) {
-                this.reference = reference;
-        }
-
-        public boolean matchesReference(IDataReference reference) {
-                if (this.reference == null) {
-                        return false;
-                } else {
-                        return this.reference.referenceMatches(reference);
-                }
-        }
-
         /**
          * @return a string representing the value of this question's answer
@@ -173 +156 @@
         public void readExternal(DataInputStream in, PrototypeFactory pf) throws IOException, DeserializationException {
                 name = ExtUtil.readString(in);
-                reference = (IDataReference)ExtUtil.read(in, new ExtWrapTagged(), pf);
+                //FIXME: reference = (IDataReference)ExtUtil.read(in, new ExtWrapTagged(), pf);
                 
                 // read attributes
@@ -189 +172 @@
         public void writeExternal(DataOutputStream out) throws IOException {
                 ExtUtil.writeString(out, name);
-                ExtUtil.write(out, new ExtWrapTagged(reference));
+                //FIXME: ExtUtil.write(out, new ExtWrapTagged(reference));
 
                 // write attributes.

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

@@ -52 +52 @@
          */
         public QuestionDataGroup(String name) {
-                this();
+                this(name, 1);
+        }
+        
+        public QuestionDataGroup(String name, int multiplicity) {
                 this.name = name;
+                this.multiplicity = multiplicity;
         }
         
@@ -64 +68 @@
         }
         
-        /*
-         * (non-Javadoc)
-         * @see org.javarosa.core.model.TreeElement#getName()
-         */
-        public String getName() {
-                return name;
-        }
-        
         /**
          * @return A list of TreeElement that are this Element's children
@@ -77 +73 @@
         public Vector getChildren() {
                 return children;
+        }
+        
+        public int getMultiplicity (String name) {
+                int count = 0;
+                for (int i = 0; i < children.size(); i++) {
+                        TreeElement child = (TreeElement)children.elementAt(i);
+                        if (child.getName().equals(name))
+                              &n