Changeset 2751

Timestamp:

08/14/09 15:32:28 (12 months ago)

Author:

csims

Message:

More parsing updates

Files:

• branches/dev-dd/org.javarosa.graphing/src/org/javarosa/graphing/parser/StatisticsXMLParser.java (modified) (8 diffs)

branches/dev-dd/org.javarosa.graphing/src/org/javarosa/graphing/parser/StatisticsXMLParser.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Hashtable;
 
+import org.javarosa.core.util.OrderedHashtable;
 import org.javarosa.graphing.model.StatisticsModel;
 import org.javarosa.graphing.model.StatisticsReport;
 import org.kxml2.io.KXmlParser;
-import org.kxml2.io.KXmlSerializer;
 import org.kxml2.kdom.Document;
 import org.kxml2.kdom.Element;
@@ -23 +22 @@
  */
 public class StatisticsXMLParser {
-        Hashtable handlers = new Hashtable();
-        
-        private interface ElementHandler {
-                public void handle(Element e, StatisticsModel m) throws StatisticsXmlParseException;
-        }
         
         public StatisticsXMLParser() {
@@ -101 +95 @@
                 
                 String name = e.getAttributeValue(null,"name");
-                String index = e.getAttributeValue(null,"index");
+                String index = e.getAttributeValue(null,"indices");
                 if(name != null) {
                         modelName = name;
@@ -108 +102 @@
                 }
                 
-                Hashtable fullData = new Hashtable();
+                OrderedHashtable fullData = new OrderedHashtable();
+                
+                try {
+                        e = e.getElement("","valuesets");
+                } catch(Exception ex) {
+                        ex.printStackTrace();
+                        throw new StatisticsXmlParseException("No Value Sets in Dataset");
+                }
                 
                 int childElements = e.getChildCount();
@@ -117 +118 @@
                         Element child = e.getElement(i);
                         if(child.getName().equals("values")) {
-                                String entryType = child.getAttributeValue(null, "value");
+                                String entryType = child.getAttributeValue(null, "name");
                                 if(primaryEntry == null) {
                                         primaryEntry = entryType;
                                 }
                                 entityTitle = index; 
-                                Hashtable entries = parseEntries(child);
+                                OrderedHashtable entries = parseEntries(child);
                                 fullData.put(entryType, entries);
                         } else {
@@ -134 +135 @@
         }
         
-        private Hashtable parseEntries(Element entities) throws StatisticsXmlParseException {
-                Hashtable entries = new Hashtable();
+        private OrderedHashtable parseEntries(Element entities) throws StatisticsXmlParseException {
+                OrderedHashtable entries = new OrderedHashtable();
                 int childElements = entities.getChildCount();
                 for(int i = 0; i < childElements; ++i) {
@@ -142 +143 @@
                         } else {
                         Element child = entities.getElement(i);
-                        if(child.getName().equals("entry")) {
+                        if(child.getName().equals("value")) {
                                 try{
                                         String key = (String)child.getAttributeValue("","index");
@@ -152 +153 @@
                                 }
                         } else {
-                                throw new StatisticsXmlParseException("All entry children must be elements");
+                                System.out.println("Non value element of valueset: " + child.getName());
                         }
                         }