Merge pull request #164 from chamil321/test-fail

Fix wantCode user input
ECLK · Jul 29, 2020 · 6b53487 · 6b53487
2 parents 497bcc8 + e9acfbd
commit 6b53487
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/subscriber/src/subscriber/save.bal b/subscriber/src/subscriber/save.bal
@@ -102,7 +102,7 @@ function saveImagePdf(map<json> imageJson) {
 # + return - returns the base name for the file 
 function getPresidentialFileNameBase(string electionCode, map<json> result) returns string {
     // start with sequence # and type code
-    string name = (wantCode ? electionCode + "-" : "") + result.sequence_number.toString() + "-" +
+    string name = (addCode ? electionCode + "-" : "") + result.sequence_number.toString() + "-" +
             (result.'type.toString() == PRESIDENTIAL_RESULT ? "PE1" : "PE2") + "-";
 
     string resultLevel = result.level.toString();
@@ -140,7 +140,7 @@ function getPresidentialFileNameBase(string electionCode, map<json> result) retu
 # + return - returns the base name for the file
 function getParliamentaryFileNameBase(string electionCode, map<json> result) returns string {
     // start with sequence # and type code
-    string name = (wantCode ? electionCode + "-" : "") + result.sequence_number.toString() + "-" +
+    string name = (addCode ? electionCode + "-" : "") + result.sequence_number.toString() + "-" +
                         result.'type.toString() + "-";
 
     string resultLevel = result.level.toString();

diff --git a/subscriber/src/subscriber/subscriber.bal b/subscriber/src/subscriber/subscriber.bal
@@ -11,7 +11,7 @@ boolean wantXml = false;
 boolean wantHtml = false;
 boolean sortedHtml = false;
 
-boolean wantCode = false;
+boolean addCode = false;
 
 public type ElectionType ELECTION_TYPE_PRESIDENTIAL|ELECTION_TYPE_PARLIAMENTARY;
 
@@ -39,6 +39,9 @@ public function main (string? username = (),        // my username
         generateHtml = generateParliamentaryResultHtml;
     }
 
+    // check whether the user wants electionCode in the filename
+    addCode = <@untainted>wantCode;
+
     // check what format the user wants results in
     wantJson = <@untainted>'json;
     wantXml = <@untainted>'xml;