Changeset 25677 for main

Timestamp:

2012-05-25T17:35:53+12:00 (12 years ago)

Author:

ak19

Message:

colcfg.pm tests for collectionConfig before testing for collect.cfg to work out the Greenstone version being used (GS2 or GS3). This change was necessary when activating collections that have been converted from GS2 to GS3.

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (modified) (1 diff)
• perllib/colcfg.pm (modified) (1 diff)

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

@@ -516 +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().

main/trunk/greenstone2/perllib/colcfg.pm

@@ -273 +273 @@
     }
 
-    # Now check if there is a collect.cfg file in the usual place, i.e. it is gs2.
+    # Check if there is a collectionConfig.xml file. If there is one, it's gs3
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");    
+    if (-e $configfilename) {
+        return ($configfilename, "gs3");
+    }
+
+    # If we get to here we check if there is a collect.cfg file in the usual place, i.e. it is gs2.
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     if (-e $configfilename) {
         return ($configfilename, "gs2");
-    }
-
-    # If we get to here we check if there is a collectionConfig.xml file,
-    # i.e. it is gs3.
-    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");    
-    if (-e $configfilename) {
-        return ($configfilename, "gs3");
     }