Changeset 31396

Timestamp:

2017-02-09T18:32:27+13:00 (7 years ago)

Author:

ak19

Message:

2 general bugfixes. Bugs found when preparing to test implementation of OAI deletion policy. 1. buildcol.pl needs to accept but toss OIDtype flag and value, so that we can run full-rebuild.pl and incremental-rebuild.pl with this flag (which will then pass the flag to the appropriate import script, which needs it, and the appropriate buildcol script which used to reject it with an error message). 2. OIDtype and OIDmetadata can end up all lowercase in the collect.cfg file when created by GLI. However, this is not recognised in the perl code, which expects OIDtype and OIDmetadata and sets up keys into hashes with this. Fixed the code to deal with changes to these two alone (not making it case insensitive in general).

Location:

main/trunk/greenstone2

Files:

• bin/script/full-rebuild.pl (modified) (1 diff)
• perllib/cfgread.pm (modified) (1 diff)
• perllib/colcfg.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/full-rebuild.pl

@@ -127 +127 @@
         push(@activate_argv,$activate_arg,$activate_val);
     }
+    elsif ($arg =~ "-OIDtype") {
+        shift @argv; # skip OIDtype (don't pass OIDtype to buildcol.pl. It's not currently accepted.)
+            # this allows us to run full-rebuild.pl -OIDtype filename for instance
+    }
     else {
         push(@import_argv,$arg);

main/trunk/greenstone2/perllib/cfgread.pm

@@ -159 +159 @@
 
         my $key = shift (@$line);
+        
+        # OIDtype and OIDmetadata may be present in collect.cfg as "oidtype" and "oidmetadata"
+        # but rest of perl code expects it to be OIDtype/OIDmetadata and uses these as indexes into hashes
+        # so convert any lowercase version to uppercase here
+        if($key =~ m/^oid(type|metadata)/) {            
+            $key =~ s/^oid/OID/;
+        }
         if (defined $stringexp && $key =~ /$stringexp/) {
             $data->{$key} = shift (@$line);

main/trunk/greenstone2/perllib/colcfg.pm

@@ -177 +177 @@
                     q/archivedir|exportdir|cachedir|builddir|removeold|/ .
                     q/textcompress|buildtype|othogonalbuildtypes|no_text|keepold|gzip|/ .
-                    q/verbosity|remove_empty_classifications|OIDtype|OIDmetadata|/ .
+                    q/verbosity|remove_empty_classifications|OIDtype|OIDmetadata|oidtype|oidmetadata|/ .
                     q/groupsize|maxdocs|debug|mode|saveas|saveas_options|/ .
                     q/sortmeta|removesuffix|removeprefix|create_images|/ .