Changeset 33171 for main/trunk

Timestamp:

2019-06-20T22:39:48+12:00 (5 years ago)

Author:

wy59

Message:

First part of commit: following Dr Bainbridge's suggestion for how best to determine what phase of building we're in from within doc.pm. Needs a package level variable, used existing coding pattern in the file that used the our keyword.

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (2 diffs)
• bin/script/export.pl (modified) (2 diffs)
• bin/script/import.pl (modified) (2 diffs)
• perllib/doc.pm (modified) (5 diffs)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -91 +91 @@
 use FileUtils;
 use util;
+use doc; # for the variable our $cmd_line_mode ($doc::cmd_line_mode)
 
 # Globals
@@ -304 +305 @@
 sub main
 {
+    $doc::cmd_line_mode = "buildcol";
+
   # Dynamically include arguments from any subclasses of buildcolutils we find
   # in the extensions directory

main/trunk/greenstone2/bin/script/export.pl

@@ -69 +69 @@
 #no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 use inexport;
+use doc; # for the variable our $cmd_line_mode ($doc::cmd_line_mode)
 
 
@@ -147 +148 @@
 sub main 
 {
+    $doc::cmd_line_mode = "export";
+
     my $inexport = new inexport("export",\@ARGV,$options,$listall_options);
     

main/trunk/greenstone2/bin/script/import.pl

@@ -80 +80 @@
 use util;
 use gsprintf 'gsprintf';
+use doc; # for the variable our $cmd_line_mode ($doc::cmd_line_mode)
 
 
@@ -170 +171 @@
 sub main
 {
+    $doc::cmd_line_mode = "import";
+
   # Dynamically include arguments from any subclasses of inexport we find
   # in the extensions directory

main/trunk/greenstone2/perllib/doc.pm

@@ -52 +52 @@
 
 our $OIDcount = 0;
+
+
+# Declare the Package (level) Variable that will tell us whether we're in the import or buildcol phase.
+# This var will be set by import.pl, buildcol.pl and export.pl to the then appropriate value.
+# https://perlmaven.com/package-variables-and-lexical-variables-in-perl
+# But: https://stackoverflow.com/questions/7542120/perl-how-to-make-variables-from-requiring-script-available-in-required-script
+# https://stackoverflow.com/questions/33230015/how-do-i-use-a-variable-in-another-perl-script
+#$doc::cmd_line_mode = undef;
+# Decided to follow the usage of $OIDcount above to declare the necessary package-level variables 'globally' accessible
+# actually accessible only for those packages that import this one (with 'use doc')
+our $cmd_line_mode = undef;
 
 # rename_method can be 'url', 'none', 'base64'
@@ -1067 +1078 @@
     my ($section, $field, $value) = @_;
     
-    #    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
+    #    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
     #    my ($lcfilename) = ($cfilename =~ m/([^\\\/]*)$/);
     #    print STDERR "** Calling method: $lcfilename:$cline $cpackage->$csubr\n";
@@ -1158 +1169 @@
         # and therefore skip converting the GPS.mapOverlay meta into Coordinate meta! What to dooooo?
         # So the return statement immediately below is a temporary solution, until we find a better one that will always work.
-      my $metaMap = $self->get_metadata_hashmap($section);
-      if(!$metaMap->{'Coordinate'}) {
-            
+      if($cmd_line_mode eq "buildcol") {
+       #my $metaMap = $self->get_metadata_hashmap($section); ## TODO: Check if necessary to avoid duplication of <Coordinate> meta in index\text\<coll>.jdb
+      
+       #if(!$metaMap->{'Coordinate'}) {
+        #print STDERR "@@@@@@@@@@@@@@ cmd line mode (build phase) is now: $doc::cmd_line_mode\n";
+    
+        
         print STDERR "GPS.mapOverlay before val: " . $value . "\n";
         
@@ -1247 +1262 @@
             elsif ($type eq "rectangle") {
         
-                my $bounds = $shape->{"bounds"};                
-            
+                my $bounds = $shape->{"bounds"};
                 $self->processCoordinate($section, $bounds->{"north"}, $bounds->{"east"});
                 $self->processCoordinate($section, $bounds->{"south"}, $bounds->{"east"});
@@ -1256 +1270 @@
         
         } # end for on each shape in GPS.mapOverlay
+       #}
       }
     } # end GPS.mapOverlay meta