Set multiplicity for nodes from CSV dataset

getodk · Jun 28, 2019 · 203241e · 203241e
1 parent 1ddbbd5
commit 203241e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/javarosa/core/model/instance/CsvExternalInstance.java b/src/main/java/org/javarosa/core/model/instance/CsvExternalInstance.java
@@ -15,9 +15,10 @@ public static TreeElement parse(String instanceId, String path) throws IOExcepti
 
         if (csvLine != null) {
             String[] fieldNames = csvLine.split(",");
+            int multiplicity = 0;
 
             while ((csvLine = br.readLine()) != null) {
-                TreeElement item = new TreeElement("item", 0);
+                TreeElement item = new TreeElement("item", multiplicity);
                 String[] data = csvLine.split(",");
                 for (int i = 0; i < fieldNames.length; ++i) {
                     TreeElement field = new TreeElement(fieldNames[i], 0);
@@ -30,6 +31,7 @@ public static TreeElement parse(String instanceId, String path) throws IOExcepti
                 }
 
                 root.addChild(item);
+                multiplicity++;
             }
         }
         return root;

diff --git a/src/test/java/org/javarosa/xform/parse/ExternalSecondaryInstanceParseTest.java b/src/test/java/org/javarosa/xform/parse/ExternalSecondaryInstanceParseTest.java
@@ -85,6 +85,12 @@ public void formWithExternalSecondaryCSVInstance_ShouldParseWithoutError() throw
         mapFileToResourcePath(formName);
         FormDef formDef = parse(formName);
         assertEquals("External Secondary Instance CSV", formDef.getTitle());
+
+        // Confirm that items are actually made available to the XPath parser
+        TreeReference treeReference = ((XPathPathExpr) parseXPath("instance('external-csv')/root/item")).getReference();
+        EvaluationContext evaluationContext = formDef.getEvaluationContext();
+        List<TreeReference> treeReferences = evaluationContext.expandReference(treeReference);
+        assertThat(treeReferences.size(), is(6));
     }
 
     // ODK Collect has CSV-parsing features that bypass XPath and use databases. This test verifies that if a