Changeset 14926

Show
Ignore:
Timestamp:
20.12.2007 16:16:12 (12 years ago)
Author:
dmn
Message:

essagedavidb gs3 building updates

Location:
gsdl/trunk/perllib
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/colcfg.pm

    r14657 r14926  
    190190} 
    191191 
     192 
     193sub use_collection { 
     194   my ($site, $collection, $collectdir) = @_; 
     195 
     196   if ((defined $site) && ($site ne "")) 
     197   { 
     198       return &util::use_site_collection($site, $collection, $collectdir); 
     199   } 
     200   else 
     201   { 
     202       return &util::use_collection($collection, $collectdir); 
     203   } 
     204} 
     205 
     206 
    1922071; 
    193208 
     209 
  • gsdl/trunk/perllib/downloaders/OAIDownload.pm

    r14179 r14926  
    328328 
    329329    ($intDocCounter >= $intMaxRecords) ?  
    330     print  STDERR "Reach maximum download records, use -max_records to set the maximum.\n":  
     330    print  STDERR "Reached maximum download records, use -max_records to set the maximum.\n":  
    331331    print  STDERR "Complete download meta record from $strBasURL\n"; 
    332332 
  • gsdl/trunk/perllib/util.pm

    r14365 r14926  
    2929use File::Basename; 
    3030 
     31use strict; 
     32 
    3133 
    3234# removes files (but not directories) 
     
    758760} 
    759761 
     762 
     763 
     764 
     765# will return the collection name if successful, "" otherwise.   
     766# Like use_collection (above) but for greenstone 3 (taking account of site level) 
     767 
     768sub use_site_collection { 
     769    my ($site, $collection, $collectdir) = @_; 
     770 
     771    if (!defined $collectdir || $collectdir eq "") { 
     772    die "GSDL3HOME not set.\n" unless defined $ENV{'GSDL3HOME'}; 
     773    $collectdir = &filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect"); 
     774    } 
     775 
     776    # collectdir explicitly set by this point (using $site variable if required). 
     777    # Can call "old" gsdl2 use_collection now. 
     778 
     779    return use_collection($collection,$collectdir); 
     780} 
     781 
     782 
     783 
    760784sub hyperlink_text 
    761785{