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

Timestamp:

2010-02-16T19:57:37+13:00 (14 years ago)

Author:

ak19

Message:

For Fedora: the Greenstone server's prefix URL is obtained from gsdlsite.cfg for GS2 and from greenstone3.xml in packages/tomcat for GS3 and this is used by FedoraMETSPlugout so it can refer to the relative paths for associated files like images.

File:

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

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

@@ -68 +68 @@
     
     my $self = new METSPlugout($plugoutlist,$inputargs,$hashArgOptLists);
-    
+
     return bless $self, $class;
 }
@@ -544 +544 @@
     $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
     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
+    
+    my $greenstone_url_prefix = &util::get_greenstone_url_prefix();
+    # prepend url_prefix (which will contain the forward slash upfront)
+    if($ENV{'GSDL3SRCHOME'} && -e $localfedora) {               # Fedora uses Greenstone's tomcat.
+        $gsdl_href = "$greenstone_url_prefix/sites/localsite/$gsdl_href";     # Default: /greenstone3/sites/localsite/$gsdl_href
     } else {
-        $gsdl_href = "/gsdl/$gsdl_href";
+        $gsdl_href = "$greenstone_url_prefix/$gsdl_href";       # By default: "/greenstone/$gsdl_href";
     }
 
@@ -680 +683 @@
            $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
            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
+
+           my $greenstone_url_prefix = &util::get_greenstone_url_prefix();
+           # prepend url_prefix (which will contain the forward slash upfront)
+           if($ENV{'GSDL3SRCHOME'} && -e $localfedora) {                 # Fedora uses Greenstone's tomcat. 
+           $gsdl_href = "$greenstone_url_prefix/sites/localsite/$gsdl_href";    # Default: /greenstone3/sites/localsite/$gsdl_href
            } else {
-           $gsdl_href = "/gsdl/$gsdl_href";
+           $gsdl_href = "$greenstone_url_prefix/$gsdl_href";         # By default: "/greenstone/$gsdl_href";
            }