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

Timestamp:

2010-01-27T20:54:06+13:00 (14 years ago)

Author:

ak19

Message:

1. Minor changes for when when fedora uses Greenstone 3's tomcat: Only for GS3 in this case, don't need the file gsdl.xml since the file greenstone3.xml in GS3's tomcat already contains the necessary information. 2. In g2futil.pm: When writing out the file gsdl.xml, tries for 1 x 20 seconds to see whether the fedora server has started up again.

Location:

main/trunk/greenstone2/bin/script

Files:

• g2f-buildcol.pl (modified) (1 diff)
• g2f-import.pl (modified) (1 diff)

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

@@ -170 +170 @@
 
     if (!$collectdir) {
-    ##    my $collect_dir = util::filename_cat($ENV{'GREENSTONE3_HOME'},
-    ##                   "web","sites","localsite","collect");
-
-
-    $collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect");
+    if($ENV{'GSDL3HOME'}) {
+        $collectdir = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite","collect");
+    } else {
+        $collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect");
+    }
     }
 

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

@@ -179 +179 @@
 
     if (!$collectdir) {
-    # Explicitly set one
-
-    ##  $collectdir = util::filename_cat($ENV{'GREENSTONE3_HOME'},
-    ##           "web","sites","localsite","collect");
-
-    $collectdir = &util::filename_cat($ENV{'GSDLHOME'},"collect");
-
-    }
-
-    # method that will tell Fedora where the ultimate output of g2f-import and g2f-build
-    # will be found: Points Fedora to the collect directory where FedoraMETS will be output.
-    &g2futil::write_gsdl_xml_file($hostname, $collectdir, $options);
+    # Explicitly set one, depending on whether it's GS2 or GS3
+    if($ENV{'GSDL3HOME'}) {
+        $collectdir = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite","collect");
+    } else {
+        $collectdir = &util::filename_cat($ENV{'GSDLHOME'},"collect");
+    }
+    }
+
+    # if GS3, and if Fedora uses Greenstone's tomcat, then we do not need to write out the file gsdl.xml into Fedora's tomcat
+    my $localfedora = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
+    unless($ENV{'GSDL3SRCHOME'} && -e $localfedora) {
+    # method that will tell Fedora where the ultimate output of g2f-import and g2f-build
+    # will be found: Points Fedora to the collect directory where FedoraMETS will be output.
+    &g2futil::write_gsdl_xml_file($hostname, $collectdir, $options);
+    }
 
     my $full_gs_col = &util::filename_cat($collectdir,$gs_col);