Changeset 16396 for gsdl/trunk/perllib/plugouts

Timestamp:

2008-07-14T15:24:30+12:00 (16 years ago)

Author:

ak19

Message:

Bugfix that caused ingest to fail in GS3 remote cases but (for some reason) not GS3 local case

File:

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

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -525 +525 @@
     my $collectparent;
     if (defined $ENV{'GSDL3HOME'}) {
-        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"web","sites","localsite");
     }
     else {
@@ -531 +531 @@
         $collectparent = $ENV{'GSDLHOME'};
     }
-
+    
     my $gsdl_href = "$working_dir/$fname";
     $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
@@ -537 +537 @@
     $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
     $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
-        
+
     my $fserver = $ENV{'FEDORA_HOSTNAME'};
     my $fport = $ENV{'FEDORA_SERVER_PORT'};
@@ -648 +648 @@
            my $collectparent;
            if (defined $ENV{'GSDL3HOME'}) {
-           $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+           $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"web","sites","localsite");
            }
            else {
@@ -660 +660 @@
            $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
            $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
-                   
+           
            my $fserver = $ENV{'FEDORA_HOSTNAME'};
            my $fport = $ENV{'FEDORA_SERVER_PORT'};