Changeset 25675

Timestamp:

2012-05-25T15:29:30+12:00 (12 years ago)

Author:

ak19

Message:

1. Can run the ant target to get the library_URL for GS3 from anywhere, thanks to Sam's suggestion of the -buildfile parameter to ant, 2. gs_mode is set to gs2 when a collect.cfg exists even when there's a collectionConfig.xml. Now the presence of a site parameter to the activate.pl script is used to finally decide the version of the Greenstone.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (4 diffs)

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

@@ -316 +316 @@
             # see http://stackoverflow.com/questions/799968/whats-the-difference-between-perls-backticks-system-and-exec
         
-        my $perl_command = "ant get-default-servlet-url"; # assumes activate.pl is run from within the GS3 installation
+            # The get-default-servlet-url ant target can be run from anywhere by specifying the
+            # location of GS3's ant build.xml buildfile. Activate.pl can be run from anywhere for GS3
+            # GSDL3SRCHOME will be set for GS3 by gs3-setup.sh, a step that would have been necessary
+            # to run the activate.pl script in the first place
+        my $perl_command = "ant -buildfile \"$ENV{'GSDL3SRCHOME'}/build.xml\" get-default-servlet-url";
         
         if (open(PIN, "$perl_command |")) {
@@ -481 +485 @@
     # 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 $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
 
@@ -513 +516 @@
     }
     
-    
+    # gs_mode is set to gs2 if there's a collect.cfg and regardless of whether there's a collectionConfig.xml
+    # (this happens especially when a GS2 collection is being converted to GS3).
+    # override this behaviour here, by looking for whether a site variable was passed in
+    if(defined $site && $gs_mode eq "gs2") {
+    $gs_mode="gs3";
+    }   
+
     # Now the logic in GLI's CollectionManager.java (processComplete() 
     # and installCollection()) and Gatherer.configGS3Server().
@@ -532 +541 @@
     my $is_persistent_server = undef;
     if($library_url) { # undef if no valid server URL
-    
+   
         &print_msg("Pinging $library_url\n");       
         if(&ping_library($library_url, $gs_mode, $site)) { # server running