Changeset 12399

Timestamp:

2006-08-04T10:47:22+12:00 (18 years ago)

Author:

kjdon

Message:

I rearranged some stuff so that all the essential checks are done first. Also added in a check for missing import directory

File:

• trunk/gsdl/bin/script/import.pl (modified) (8 diffs)

trunk/gsdl/bin/script/import.pl

@@ -294 +294 @@
     die "\n";
     }
+
     # add collection's perllib dir  into include path in 
     # case we have collection specific modules
     unshift (@INC, "$ENV{'GSDLCOLLECTDIR'}/perllib");
 
+    # check that we can open the faillog
     if ($faillog eq "") {
     $faillog = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "etc", "fail.log");
@@ -308 +310 @@
     $faillog = 'import::FAILLOG';
     $faillog->autoflush(1);
-
-    # check sortmeta
-    $sortmeta = undef unless defined $sortmeta && $sortmeta =~ /\S/;
-    if (defined $sortmeta && $groupsize > 1) {
-    &gsprintf($out, "{import.cannot_sort}\n\n");
-    $sortmeta = undef;
-    }
-
-    # get the list of plugins for this collection and set any options that
-    # were specified in the collect.cfg (all import.pl options except
-    # -collectdir, -out and -faillog may be specified in the collect.cfg (these
-    # options must be known before we read the collect.cfg))
-    my $plugins = [];
-    my @global_opts = ();
-    
+    
+    # check that there is a collect.cfg file
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     if (!-e $configfilename) {
     (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
     }
-    
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+
+    
+    if (defined $collectcfg->{'importdir'} && $importdir eq "") {
+    $importdir = $collectcfg->{'importdir'};
+    }
+    if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
+    $archivedir = $collectcfg->{'archivedir'};
+    }
+    # fill in the default import and archives directories if none
+    # were supplied, turn all \ into / and remove trailing /
+    $importdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
+    $importdir =~ s/[\\\/]+/\//g;
+    $importdir =~ s/\/$//;
+    if (!-e $importdir) {
+    &gsprintf($out, "{import.no_import_dir}\n\n", $importdir);
+    die "\n";
+    }
+
+    $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") if $archivedir eq "";
+    $archivedir =~ s/[\\\/]+/\//g;
+    $archivedir =~ s/\/$//;
+
+    my $plugins = [];
     if (defined $collectcfg->{'plugin'}) {
     $plugins = $collectcfg->{'plugin'};
     }
+    #some global options for the plugins
+    my @global_opts = ();
 
     if ($verbosity !~ /\d+/) {
@@ -340 +353 @@
     }
     }
-    if (defined $collectcfg->{'importdir'} && $importdir eq "") {
-    $importdir = $collectcfg->{'importdir'};
-    }
-    if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
-    $archivedir = $collectcfg->{'archivedir'};
-    }
     if (defined $collectcfg->{'manifest'} && $manifest eq "") {
     $manifest = $collectcfg->{'manifest'};
@@ -355 +362 @@
     }
     }
+
     if ($maxdocs !~ /\-?\d+/) {
     if (defined $collectcfg->{'maxdocs'} && $collectcfg->{'maxdocs'} =~ /\-?\d+/) {
@@ -387 +395 @@
     $sortmeta = $collectcfg->{'sortmeta'};
     }
-    
+    # sortmeta cannot be used with group size
+    $sortmeta = undef unless defined $sortmeta && $sortmeta =~ /\S/;
+    if (defined $sortmeta && $groupsize > 1) {
+    &gsprintf($out, "{import.cannot_sort}\n\n");
+    $sortmeta = undef;
+    }
+
     if (defined $collectcfg->{'removeprefix'} && $removeprefix eq "") {
     $removeprefix = $collectcfg->{'removeprefix'};
@@ -415 +429 @@
     print STDERR "<Import>\n" if $gli;
     
-    # fill in the default import and archives directories if none
-    # were supplied, turn all \ into / and remove trailing /
-    $importdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
-    $importdir =~ s/[\\\/]+/\//g;
-    $importdir =~ s/\/$//;
-    $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") if $archivedir eq "";
-    $archivedir =~ s/[\\\/]+/\//g;
-    $archivedir =~ s/\/$//;
-
     my $manifest_lookup = new manifest();
     if ($manifest ne "") {  
@@ -470 +475 @@
 
 
-         ####Use Plugout####
-         my ($plugout_name); 
+    ####Use Plugout####
+    my ($plugout_name); 
         if ($saveas !~ /^(GA|METS)Plugout$/  ){      
         $plugout_name = $saveas."Plugout";
@@ -477 +482 @@
         else{
             $plugout_name = $saveas;
-          } 
-
-         my $opts=[];
-
+    } 
+    
+    my $opts=[];
+    
     push @$opts,("-output_info",$archive_info) if (defined $archive_info);