Changeset 15360 for gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

Timestamp:

2008-05-07T17:43:32+12:00 (16 years ago)

Author:

ak19

Message:

Extra test for Greenstone3 added so plugout works for both versions of Greenstone

File:

• gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -513 +513 @@
     else
     {
-    my $gsdlhome = $ENV{'GSDLHOME'};
+    my $collectparent;
+    if (defined $ENV{'GSDL3HOME'}) {
+        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+    }
+    else {
+        # greenstone 2
+        $collectparent = $ENV{'GSDLHOME'};
+    }
+
     my $gsdl_href = "$working_dir/$fname";
     
-    $gsdl_href =~ s/^$gsdlhome(\/)?//;
+    $gsdl_href =~ s/^$collectparent(\/)?//;
     $gsdl_href = "/gsdl/$gsdl_href";
     
@@ -627 +635 @@
        else
        {
-           my $gsdlhome = $ENV{'GSDLHOME'};
+           my $collectparent;
+           if (defined $ENV{'GSDL3HOME'}) {
+           $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+           }
+           else {
+           # greenstone 2
+           $collectparent = $ENV{'GSDLHOME'};
+           }
+
            my $gsdl_href = "$working_dir/$assfilePath";
            
-           $gsdl_href =~ s/^$gsdlhome(\/)?//;
+           $gsdl_href =~ s/^$collectparent(\/)?//;
            $gsdl_href = "/gsdl/$gsdl_href";