Changeset 14925 for gsdl/trunk/bin/script/export.pl

Timestamp:

2007-12-19T15:03:24+13:00 (16 years ago)

Author:

dmn

Message:

davidbs changes to update for gs3 building

File:

• gsdl/trunk/bin/script/export.pl (modified) (4 diffs)

gsdl/trunk/bin/script/export.pl

@@ -117 +117 @@
     'reqd' => "no",
         'hiddengli' => "yes" },
+      { 'name' => "site",
+    'desc' => "{import.site}",
+    'type' => "string",
+    'deft' => "",
+    'reqd' => "no",
+        'hiddengli' => "yes" },
       { 'name' => "collectdir",
     'desc' => "{export.collectdir}",
     'type' => "string",
-    'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
-    'reqd' => "no",
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+        'reqd' => "no",
         'hiddengli' => "yes" },
       { 'name' => "listall",
@@ -247 +254 @@
 sub main {
     # params
-    my ($language, $verbosity, $importdir, $exportdir, $keepold, $listall,
+    my ($language, $verbosity, $importdir, $exportdir, $site, $keepold, $listall,
     $removeold, $saveas, $saveas_version, $debug, $OIDtype, $OIDmetadata,
-    $maxdocs, $statsfile, $xsltfile, $mapping_file, $out, $faillog, 
+    $maxdocs, $statsfile, $xsltfile, $mapping_file, $out, $faillog, $gs_mode, $collectcfg,
     $collectdir, $gli,$xslt_mets,$xslt_txt,$group_marc);
     my $xml = 0;
@@ -334 +341 @@
     eval {
         # get and check the collection name
-        if (($collection = &util::use_collection($collect_name, $collectdir)) eq "") {
+        print STDERR "**** site = $site\n";
+        if (($collection = &colcfg::use_collection($site, $collect_name, $collectdir)) eq "") {
         &PrintUsage::print_txt_usage($options, "{export.params}");
         die "\n";
@@ -365 +373 @@
         my @global_opts = ();
         
-        $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
-        if (!-e $configfilename) {
-        (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
-        }
-        
-        my $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+        # Read in the collection configuration file.
+        ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+        
+        if ($gs_mode eq "gs2") {
+        $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+        } elsif ($gs_mode eq "gs3") {
+        $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
+        }
+
         if (defined $collectcfg->{'plugin'}) {
         $plugins = $collectcfg->{'plugin'};