Use EntitiesInstanceAdapter to implement pulldata

getodk · Oct 10, 2024 · bed7c86 · bed7c86
1 parent b463ad7
commit bed7c86
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/...src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt b/...src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt
@@ -8,6 +8,7 @@ import org.odk.collect.android.dynamicpreload.ExternalDataManagerImpl
 import org.odk.collect.android.dynamicpreload.handler.ExternalDataHandlerPull
 import org.odk.collect.android.tasks.FormLoaderTask.FormEntryControllerFactory
 import org.odk.collect.entities.javarosa.filter.LocalEntitiesFilterStrategy
+import org.odk.collect.entities.javarosa.filter.PullDataFunctionHandler
 import org.odk.collect.entities.javarosa.finalization.EntityFormFinalizationProcessor
 import org.odk.collect.entities.storage.EntitiesRepository
 import org.odk.collect.settings.keys.ProjectKeys
@@ -25,7 +26,8 @@ class CollectFormEntryControllerFactory(
         }
 
         return FormEntryController(FormEntryModel(formDef)).also {
-            it.addFunctionHandler(ExternalDataHandlerPull(externalDataManager))
+            val externalDataHandlerPull = ExternalDataHandlerPull(externalDataManager)
+            it.addFunctionHandler(PullDataFunctionHandler(entitiesRepository, externalDataHandlerPull))
             it.addPostProcessor(EntityFormFinalizationProcessor())
 
             if (settings.getBoolean(ProjectKeys.KEY_LOCAL_ENTITIES)) {

diff --git a/entities/src/main/java/org/odk/collect/entities/javarosa/filter/PullDataFunctionHandler.kt b/entities/src/main/java/org/odk/collect/entities/javarosa/filter/PullDataFunctionHandler.kt
@@ -0,0 +1,48 @@
+package org.odk.collect.entities.javarosa.filter
+
+import org.javarosa.core.model.condition.EvaluationContext
+import org.javarosa.core.model.condition.IFunctionHandler
+import org.javarosa.xpath.expr.XPathFuncExpr
+import org.odk.collect.entities.javarosa.intance.LocalEntitiesInstanceAdapter
+import org.odk.collect.entities.storage.EntitiesRepository
+
+class PullDataFunctionHandler(
+    entitiesRepository: EntitiesRepository,
+    private val fallback: IFunctionHandler
+) : IFunctionHandler {
+
+    private val entitiesDataAdapter = LocalEntitiesInstanceAdapter(entitiesRepository)
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    override fun getPrototypes(): List<Array<Class<Any>>> {
+        return emptyList()
+    }
+
+    override fun rawArgs(): Boolean {
+        return true
+    }
+
+    override fun realTime(): Boolean {
+        return false
+    }
+
+    override fun eval(args: Array<Any>, ec: EvaluationContext): Any {
+        val instanceId = XPathFuncExpr.toString(args[0])
+        val child = XPathFuncExpr.toString(args[1])
+        val filterChild = XPathFuncExpr.toString(args[2])
+        val filterValue = XPathFuncExpr.toString(args[3])
+
+        return if (entitiesDataAdapter.supportsInstance(instanceId)) {
+            entitiesDataAdapter.queryEq(instanceId, filterChild, filterValue)!!.firstOrNull()?.getFirstChild(child)?.value?.value ?: ""
+        } else {
+            fallback.eval(args, ec)
+        }
+    }
+
+    companion object {
+        private const val NAME = "pulldata"
+    }
+}