Changeset 26567

Timestamp:

2012-12-10T16:37:21+13:00 (11 years ago)

Author:

ak19

Message:

When a GS2 collection contains both collect.cfg and collectionConfig.xml (as advanced beatles does) the old code used to end up reading in the GS3 collectionConfig.xml instead of the GS2 collect.cfg and set the GS_mode to GS3. Now colcfg::get_collect_cfg_name takes the gs_mode (instead of determining this and returning it) and works out the collectcfg file name for the gs_mode. That means that the calling functions now need to work out the gs_mode. They do so by setting the gs_mode to gs3 if the site flag is present in the commandline, if not then it defaults to gs2. So from now on, the site flag must be specified for GS3 collections.

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (modified) (1 diff)
• bin/script/buildcol.pl (modified) (1 diff)
• bin/script/explode_metadata_database.pl (modified) (1 diff)
• bin/script/incremental-buildcol.pl (modified) (1 diff)
• perllib/basebuilder.pm (modified) (1 diff)
• perllib/cgiactions/explodeaction.pm (modified) (1 diff)
• perllib/colcfg.pm (modified) (2 diffs)
• perllib/inexport.pm (modified) (2 diffs)

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

@@ -488 +488 @@
     # Beware: Only if $site is specified in the cmdline does collectionConfig.xml get 
     # generated and does $gs_mode=gs3, else collect.cfg gets generated and $gs_mode=gs2
-    my ($collect_cfg_filename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
+    my $gs_mode = "gs2";
+    if ((defined $site) && ($site ne "")) { # GS3
+    $gs_mode = "gs3";
+    }
+    my $collect_cfg_filename = &colcfg::get_collect_cfg_name(STDERR, $gs_mode);
     my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
 

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

@@ -386 +386 @@
     # Read in the collection configuration file.
     my ($collectcfg, $buildtype, $orthogonalbuildtypes); 
-    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+    if ((defined $site) && ($site ne "")) { # GS3
+    $gs_mode = "gs3";
+    }
+    $configfilename = &colcfg::get_collect_cfg_name($out, $gs_mode);
     $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
     

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

@@ -229 +229 @@
     # read in the collect.cfg file
     # Read in the collection configuration file.
-    my ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
+    my $gs_mode = "gs2";
+    if ((defined $site) && ($site ne "")) { # GS3
+        $gs_mode = "gs3";
+    }
+    my $configfilename = &colcfg::get_collect_cfg_name(STDERR, $gs_mode);
     my $collectcfg = &colcfg::read_collect_cfg ($configfilename, $gs_mode);
     $plugin_options_string = &get_plugin_options($collectcfg, $plugin);

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

@@ -104 +104 @@
 
     # Read in the collection configuration file.
-    my ($collect_cfg_filename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
+    my $gs_mode = "gs2";
+    if ((defined $site) && ($site ne "")) { # GS3
+    $gs_mode = "gs3";
+    }
+    my $collect_cfg_filename = &colcfg::get_collect_cfg_name(STDERR, $gs_mode);
     
     my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -86 +86 @@
     
     # Read in the collection configuration file.
-    my ($colcfgname);
-    ($colcfgname, $gs_mode) = &colcfg::get_collect_cfg_name($outhandle);
+    if ((defined $site) && ($site ne "")) { # GS3
+    $gs_mode = "gs3";
+    }
+
+    my $colcfgname = &colcfg::get_collect_cfg_name($outhandle, $gs_mode);
     $self->{'collect_cfg'} = &colcfg::read_collection_cfg ($colcfgname, $gs_mode);
 

main/trunk/greenstone2/perllib/cgiactions/explodeaction.pm

@@ -91 +91 @@
 
     # Read in the collection configuration file.
-    my ($config_filename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+    my $gs_mode = "gs2";
+    if ((defined $site) && ($site ne "")) { # GS3
+    $gs_mode = "gs3";
+    }
+    my $config_filename = &colcfg::get_collect_cfg_name($out, $gs_mode);
     my $collectcfg = &colcfg::read_collection_cfg ($config_filename, $gs_mode);
 

main/trunk/greenstone2/perllib/colcfg.pm

@@ -261 +261 @@
 
 # method to check for filename of collect.cfg, and gs mode.
-sub get_collect_cfg_name {
+sub get_collect_cfg_name_old {
     my ($out) = @_;
 
@@ -288 +288 @@
     (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
 }
+
+# method to check for filename of collect.cfg
+# needs to be given gs_version, since we can have a GS2 collection ported into
+# GS3 which could potentially have collect.cfg AND collectionConfig.xml
+# in which case the older version of this subroutine (get_collect_cfg_name_old)
+# will return the wrong answer for the gs version we're using.
+sub get_collect_cfg_name {
+    my ($out, $gs_version) = @_;
+
+    # First check if there's a
+    # gsdl/collect/COLLECTION/custom/COLLECTION/etc/custom.cfg file. This
+    # customization was added for DLC by Stefan, 30/6/2007.
+    my $configfilename; 
+
+    if($gs_version eq "gs2") {
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "custom.cfg");
+    
+    if (-e $configfilename) {
+        return $configfilename;
+    }
+    }
+
+    # Check if there is a collectionConfig.xml file if it's gs3
+    if($gs_version eq "gs3") {
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");    
+    if (-e $configfilename) {
+        return $configfilename;
+    }
+    }
+
+    # Check if there is a collect.cfg file in the usual place for gs2.
+    if($gs_version eq "gs2") {
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
+    if (-e $configfilename) {
+        return $configfilename;
+    }
+    }
+
+    # Error. No collection configuration file.
+    (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
+}
+
 
 

main/trunk/greenstone2/perllib/inexport.pm

@@ -173 +173 @@
     }
 
-    # set gs_verison 2/3
+    # set gs_version 2/3
     $self->{'gs_version'} = "2";
     if ((defined $site) && ($site ne "")) {
@@ -199 +199 @@
 
     # Read in the collection configuration file.
-    my ($config_filename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+    my $gs_mode = "gs".$self->{'gs_version'}; #gs2 or gs3
+    my $config_filename = &colcfg::get_collect_cfg_name($out, $gs_mode);
     my $collectcfg = &colcfg::read_collection_cfg ($config_filename, $gs_mode);