Changeset 23946 for main/trunk/greenstone2/perllib/inexport.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/inexport.pm (modified) (3 diffs)

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