Changeset 21687 for main

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

Files:

• bin/script/g2f-buildcol.pl (modified) (1 diff)
• bin/script/g2f-import.pl (modified) (1 diff)
• perllib/g2futil.pm (modified) (4 diffs)
• perllib/plugouts/FedoraMETSPlugout.pm (modified) (4 diffs)

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

main/trunk/greenstone2/perllib/g2futil.pm

@@ -291 +291 @@
     # The top of this file has already made sure that FEDORA_HOME is set, but for GS3
     # CATALINA_HOME is set to GS' own tomcat. Since we'll be working with fedora, we need
-    # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2).
+    # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2.)
     my $gs_catalina_home = $ENV{'CATALINA_HOME'} if defined $ENV{'CATALINA_HOME'};
     $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
@@ -396 +396 @@
     print STDERR "Fedora server restarted. Waiting for it to become ready...\n";
     #print STDERR "****$protocol://$hostname:$port/fedora/search\n";
-    
     $! = 0;
-
     #my $fedoraServerReady = system("wget -q --spider --waitretry=10 --tries=20 $protocol://$hostname:$port/fedora/search");
+
     # The retries above won't work if the server isn't running: 
     # http://www.gnu.org/software/wget/manual/wget.html
@@ -406 +405 @@
     # with the exception of fatal errors like "connection refused" or "not found" (404), which ARE NOT RETRIED.
 
-    # retry fedora server every second for a total of 15 times until the server is ready
+    # retry fedora server every second for a total of 20 times until the server is ready
     my $fedoraServerReady = 0;
     my $count = 0;
@@ -416 +415 @@
         #print STDERR "$count second(s)\n";
     }
-    } while($fedoraServerReady != 0 && $count < 15);
+    } while($fedoraServerReady != 0 && $count < 20);
 
     if($fedoraServerReady != 0) {

main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm

@@ -543 +543 @@
     $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
     $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
-    $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
+    my $localfedora = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
+    if($ENV{'GSDL3SRCHOME'} && -e $localfedora) {                   # prepend gsdl
+        $gsdl_href = "/greenstone3/sites/localsite/$gsdl_href";     # Fedora uses Greenstone's tomcat
+    } else {
+        $gsdl_href = "/gsdl/$gsdl_href";
+    }
 
     my $fserver = $ENV{'FEDORA_HOSTNAME'};
@@ -550 +555 @@
     my $fdomain = "http://$fserver:$fport";
     $xlink_href  = "$fdomain$gsdl_href";
-    }
-    
+#ERROR: $xlink_href  = "$fname";
+    }
 
     return $xlink_href;
@@ -674 +679 @@
            $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
            $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
-           $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
+           my $localfedora = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
+           if($ENV{'GSDL3SRCHOME'} && -e $localfedora) {                   # prepend gsdl
+           $gsdl_href = "/greenstone3/sites/localsite/$gsdl_href";     # Fedora uses Greenstone's tomcat
+           } else {
+           $gsdl_href = "/gsdl/$gsdl_href";
+           }
 
            my $fserver = $ENV{'FEDORA_HOSTNAME'};
@@ -681 +691 @@
            my $fdomain = "http://$fserver:$fport";
            $xlink_href = "xlink:href=\"$fdomain$gsdl_href\"";
+#ERROR: $xlink_href = "xlink:href=\"$assfilePath\"";
        }