Changeset 26466 for main

Timestamp:

2012-11-15T14:02:26+13:00 (11 years ago)

Author:

ak19

Message:

Need to handle on/off flags which take optional values. If these flags are present, their 'value' defaults to true

File:

• main/trunk/greenstone2/perllib/collConfigxml.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -316 +316 @@
     # these get stored in-memory at the top level as (n, v) pairs, just as in GS2
     elsif ($currentLevel =~ /$generalOptions/ and $element eq "option") {
-    if (defined $name and $name =~ /\w/ and defined $value and $value =~ /\w/) {
-        #$data->{$currentLevel}->{$name} = $value;
-        $data->{$name} = $value;
+    if (defined $name and $name =~ /\w/) {
+
+        # if a flag's value is on or 1, set it to true. If the value is off or 0, set it to false. (GS2 expects true/false)
+        # But such on/off flags (like -gli) need not be given a value, in which case the value defaults to 'true' again.
+
+        if(defined $value and $value =~ /\w/) {     
+
+        if ($value =~ m/^(on|1)$/) {
+            $value = "true";
+        } elsif ($value =~ m/^(off|0)$/) {
+            $value = "false";
+        } # else, use whatever value is provided
+
+        } 
+        else {
+        $value = "true";
+        }
+        $data->{$name} = $value; #$data->{$currentLevel}->{$name} = $value;
         #print "@@@@ Added $currentLevel option: $name=$value\n";
     }