From b434b61a202d49a9ce0e9c55deb23cc4f7b6d456 Mon Sep 17 00:00:00 2001
From: Jake Smith <jws52@cam.ac.uk>
Date: Mon, 4 Jan 2021 15:28:00 +0000
Subject: [PATCH] Update ODK Briefcase. Note there are impacts on format of
exported csv file.
---
SurveyDataProcessor.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SurveyDataProcessor.pl b/SurveyDataProcessor.pl
index 212df33..3fc36f3 100755
--- a/SurveyDataProcessor.pl
+++ b/SurveyDataProcessor.pl
@@ -357,7 +357,7 @@ if ($SurveysFromServer) {
my $serverCredentialsString = read_file($serverCredentialsFileName) or handleError("ERROR: Unable to read server credentials from credentials file: ".$serverCredentialsFileName);
my $serverCredentials = decode_json($serverCredentialsString) or handleError("ERROR: Unable to parse credentials from JSON in credentials file: ".$serverCredentialsFileName);#Obviously don't ever print the _contents_ of the credentials file to the screen...
- my $serverJar = $coordinatorPath."/ODK-Briefcase-v1.11.2.jar";
+ my $serverJar = $coordinatorPath."/ODK-Briefcase-v1.18.0.jar";
my $serverName = $serverCredentials->{"server"};
my $serverFormID = $serverCredentials->{"form_id"};
$ODK_FormName = $serverCredentials->{"form_name"};
@@ -372,7 +372,7 @@ if ($SurveysFromServer) {
#It appears that outages are normally extended, so in this case we will just have to take the most recent successful output
#as it is unlikely to resolve itself in time for the forecast runs to start
- my $getDataCmd = "java -jar ".$serverJar." --pull_aggregate --form_id ".$serverFormID." --storage_directory ".$serverOutputDir." --aggregate_url ".$serverName." --odk_username ".$serverCredentials->{"user"}." --odk_password ".$serverCredentials->{"pass"};
+ my $getDataCmd = "java -jar ".$serverJar." --pull_aggregate --form_id ".$serverFormID." --storage_directory ".$serverOutputDir." --odk_url ".$serverName." --odk_username ".$serverCredentials->{"user"}." --odk_password ".$serverCredentials->{"pass"};
system($getDataCmd.$redirectString);
#Check it came down cleanly ($serverOutputDir is created whether cleanly or not, so test more explicitly):
--
GitLab