greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16396

Show
Ignore:
Timestamp:
2008-07-14 15:24:30 (4 months ago)
Author:
ak19
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

    r16102 r16396  
    525525        my $collectparent; 
    526526        if (defined $ENV{'GSDL3HOME'}) { 
    527             $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite"); 
     527            $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"web","sites","localsite"); 
    528528        } 
    529529        else { 
    …… 
    531531            $collectparent = $ENV{'GSDLHOME'}; 
    532532        } 
    533  
     533         
    534534        my $gsdl_href = "$working_dir/$fname"; 
    535535        $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution 
    …… 
    537537        $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \) 
    538538        $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl 
    539                  
     539 
    540540        my $fserver = $ENV{'FEDORA_HOSTNAME'}; 
    541541        my $fport = $ENV{'FEDORA_SERVER_PORT'}; 
    …… 
    648648               my $collectparent; 
    649649               if (defined $ENV{'GSDL3HOME'}) { 
    650                    $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite"); 
     650                   $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"web","sites","localsite"); 
    651651               } 
    652652               else { 
    …… 
    660660               $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \) 
    661661               $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl 
    662                                
     662                
    663663               my $fserver = $ENV{'FEDORA_HOSTNAME'}; 
    664664               my $fport = $ENV{'FEDORA_SERVER_PORT'};