Changeset 16414 for gsdl/trunk/perllib/plugouts

Timestamp:

2008-07-15T16:01:46+12:00 (16 years ago)

Author:

ak19

Message:

Slightly better way of dealing with GSDL3HOME not being set in the remote case, yet where it can still be declared as being in a separate location as GSDL3SRCHOME in the local GS3 case.

File:

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

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -524 +524 @@
     {
     my $collectparent;
-    if (defined $ENV{'GSDL3SRCHOME'}) {
-        $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
+    if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server
+        if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place
+        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+        } 
+        else { # try the default location for the web directory
+        $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
+        }
     }
     else {
@@ -647 +652 @@
        {
            my $collectparent;
-           if (defined $ENV{'GSDL3SRCHOME'}) {
-           $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
-           }
+           if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server
+           if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place
+               $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+           } 
+           else { # try the default location for the web directory
+               $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
+           }
+           }          
            else {
            # greenstone 2