Changeset 14926

Timestamp:

2007-12-20T16:16:12+13:00 (16 years ago)

Author:

dmn

Message:

essagedavidb gs3 building updates

Location:

gsdl/trunk/perllib

Files:

• colcfg.pm (modified) (1 diff)
• downloaders/OAIDownload.pm (modified) (1 diff)
• util.pm (modified) (2 diffs)

gsdl/trunk/perllib/colcfg.pm

@@ -190 +190 @@
 }
 
+
+sub use_collection {
+   my ($site, $collection, $collectdir) = @_;
+
+   if ((defined $site) && ($site ne ""))
+   {
+       return &util::use_site_collection($site, $collection, $collectdir);
+   }
+   else
+   {
+       return &util::use_collection($collection, $collectdir);
+   }
+}
+
+
 1;
 
+

gsdl/trunk/perllib/downloaders/OAIDownload.pm

@@ -328 +328 @@
 
     ($intDocCounter >= $intMaxRecords) ? 
-    print  STDERR "Reach maximum download records, use -max_records to set the maximum.\n": 
+    print  STDERR "Reached maximum download records, use -max_records to set the maximum.\n": 
     print  STDERR "Complete download meta record from $strBasURL\n";
 

gsdl/trunk/perllib/util.pm

@@ -29 +29 @@
 use File::Basename;
 
+use strict;
+
 
 # removes files (but not directories)
@@ -758 +760 @@
 }
 
+
+
+
+# will return the collection name if successful, "" otherwise.  
+# Like use_collection (above) but for greenstone 3 (taking account of site level)
+
+sub use_site_collection {
+    my ($site, $collection, $collectdir) = @_;
+
+    if (!defined $collectdir || $collectdir eq "") {
+    die "GSDL3HOME not set.\n" unless defined $ENV{'GSDL3HOME'};
+    $collectdir = &filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect");
+    }
+
+    # collectdir explicitly set by this point (using $site variable if required).
+    # Can call "old" gsdl2 use_collection now.
+
+    return use_collection($collection,$collectdir);
+}
+
+
+
 sub hyperlink_text
 {