Changeset 23946

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.

Location:

main/trunk/greenstone2/perllib

Files:

• basebuilder.pm (modified) (2 diffs)
• inexport.pm (modified) (3 diffs)
• strings.properties (modified) (1 diff)

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);
 

main/trunk/greenstone2/perllib/inexport.pm

@@ -718 +718 @@
     if (!-f $earliestDatestampFile && -d $archivedir) {
     my $current_time_in_seconds = time; # in seconds
-    open(FOUT, ">$earliestDatestampFile") || 
-        (&gsprintf(STDERR, "{common.cannot_open}: $!\n", $earliestDatestampFile) && die);
-    # die "{common.cannot_open} $earliestDatestampFile: $!\n";
-    print FOUT $current_time_in_seconds;
-    close(FOUT);
+
+    if(open(FOUT, ">$earliestDatestampFile")) {
+        # || (&gsprintf(STDERR, "{common.cannot_open}: $!\n", $earliestDatestampFile) && die);
+        print FOUT $current_time_in_seconds;
+        close(FOUT);
+    }
+    else {
+        &gsprintf(STDERR, "{import.cannot_write_earliestdatestamp}\n", $earliestDatestampFile);
+    }
+
     }
 
@@ -886 +891 @@
         $doc::OIDcount = $OIDcount;     
     }
-    else {
-        
-        print STDERR "Warning: unable to read document OID count from $oid_count_filename\n";
-        print STDERR "Setting value to 0\n";
+    else {      
+        &gsprintf(STDERR, "{import.cannot_read_OIDcount}\n", $oid_count_filename);
     }
     }
@@ -910 +913 @@
     }
     else {
-    print STDERR "Warning: unable to store document OID count\n";
+    &gsprintf(STDERR, "{import.cannot_write_OIDcount}\n", $oid_count_filename);
     }
 }

main/trunk/greenstone2/perllib/strings.properties

@@ -236 +236 @@
 import.cannot_open_fail_log:ERROR: Couldn't open fail log %s
 
+import.cannot_read_OIDcount:Warning: unable to read document OID count from %s.\nSetting value to 0.
+
+#import.cannot_read_earliestdatestamp:Warning: unable to read collection's earliestDatestampcount from %s.\nSetting value to 0.
+
 import.cannot_sort:WARNING: import.pl cannot sort documents when groupsize > 1. sortmeta option will be ignored.
+
+import.cannot_write_earliestdatestamp:Warning: unable to store collection's earliestDatestamp in %s.
+
+import.cannot_write_OIDcount:Warning: unable to store document OID count in %s.
 
 import.collectdir:The path of the "collect" directory.