Changeset 23946 for main/trunk/greenstone2/perllib/basebuilder.pm

Timestamp:

2011-04-21T21:06:54+12:00 (13 years ago)

Author:

ak19

Message:

Xiaofeng found that the OAI-related changes to do with earliestDatestamp were causing problems for him when a die statement got executed. It just prints a warning now.

File:

• main/trunk/greenstone2/perllib/basebuilder.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -565 +565 @@
     if(!-d $archivedir) {
     $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "export");
-    }    
-    if(-d $archivedir) {
-    my $earliestDatestampFile = &util::filename_cat ($archivedir, "earliestDatestamp");
-    open(FIN,"<$earliestDatestampFile") || die "{common.cannot_open} $earliestDatestampFile: $!\n";
-    my $earliestDatestamp;
+    }
+    my $earliestDatestampFile = &util::filename_cat ($archivedir, "earliestDatestamp");
+    my $earliestDatestamp = 0;
+    if (open(FIN,"<$earliestDatestampFile")) {
     {
         # slurp in file as a single line
@@ -576 +575 @@
         #&unicode::ensure_utf8(\$earliestDatestamp); # turn any high bytes that aren't valid utf-8 into utf-8.
     }
-    close(FIN); 
-    $build_cfg->{'earliestDatestamp'} = $earliestDatestamp;
-    }
-
+    close(FIN);
+    }
+    else {
+    print $outhandle "Warning: unable to read collection's earliestDatestamp from $earliestDatestampFile.\n";
+    print $outhandle "Setting value to 0.\n";
+    }
+    $build_cfg->{'earliestDatestamp'} = $earliestDatestamp;
+    
     $self->build_cfg_extra($build_cfg);