Changeset 14031

Timestamp:

2007-04-30T16:40:58+12:00 (17 years ago)

Author:

xiao

Message:

Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg.

File:

• trunk/gsdl/bin/script/import.pl (modified) (1 diff)

trunk/gsdl/bin/script/import.pl

@@ -323 +323 @@
     $faillog->autoflush(1);
     
-    # check that there is a collect.cfg file
+    # check that there is a collect.cfg file, i.e. it is gs2.
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
-    if (!-e $configfilename) {
+    if (-e $configfilename) {
+      $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+
+    } else {
+      # check that there is a collectionConfig.xml file, i.e. it is gs3.
+      $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");
+      if (!-e $configfilename) {
     (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
-    }
-    $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-
-    
+      } else {
+    $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
+      }
+    }
+
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {
     $importdir = $collectcfg->{'importdir'};