Changeset 21687 for main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm

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.

File:

• main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm (modified) (4 diffs)

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\"";
        }