Changeset 26567 for main/trunk/greenstone2/bin/script

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/bin/script

Files:

• activate.pl (modified) (1 diff)
• buildcol.pl (modified) (1 diff)
• explode_metadata_database.pl (modified) (1 diff)
• incremental-buildcol.pl (modified) (1 diff)

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);