Changeset 22076 for main/trunk

Timestamp:

2010-05-12T10:29:16+12:00 (14 years ago)

Author:

sjm84

Message:

Added error messages to these files that are printed when a write handle cannot be opened

Location:

main/trunk/greenstone2/perllib/dbutil

Files:

• gdbm.pm (modified) (1 diff)
• gdbmtxtgz.pm (modified) (1 diff)
• jdbm.pm (modified) (1 diff)
• sqlite.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/dbutil/gdbm.pm

@@ -48 +48 @@
   $cmd .= " \"$infodb_file_path\"";
 
-  if (!-e "$txt2db_exe" || !open($infodb_file_handle, "| $cmd"))
+  if (!-e "$txt2db_exe")
   {
-    return undef;
+      print STDERR "Error: Unable to find $txt2db_exe\n";
+      return undef;
+  }
+
+  if(!open($infodb_file_handle, "| $cmd"))
+  {
+      print STDERR "Error: Failed to open pipe to $cmd\n";
+      print STDERR "       $!\n";
+      return undef;
   }
 

main/trunk/greenstone2/perllib/dbutil/gdbmtxtgz.pm

@@ -53 +53 @@
   if (!open($infodb_file_handle, "| gzip - > \"$infodb_file_path\""))
   {
-    return undef;
+      print STDERR "Error: Failed to open pipe to gzip - > \"$infodb_file_path\"\n";
+      print STDERR "       $!\n";
+      return undef;
   }
 

main/trunk/greenstone2/perllib/dbutil/jdbm.pm

@@ -64 +64 @@
   if (!open($infodb_file_handle, "| $txt2jdb_cmd"))
   {
-    return undef;
+      print STDERR "Error: Failed to open pipe to $txt2jdb_cmd";
+      print STDERR "       $!\n";
+      return undef;
   }
 

main/trunk/greenstone2/perllib/dbutil/sqlite.pm

@@ -40 +40 @@
   my $sqlite3_exe = &util::filename_cat($ENV{'GSDLHOME'},"bin",$ENV{'GSDLOS'}, "sqlite3" . &util::get_os_exe());
   my $infodb_handle = undef;
-  if (!-e "$sqlite3_exe" || !open($infodb_handle, "| \"$sqlite3_exe\" \"$infodb_file_path\""))
-  {
-    return undef;
+
+  if (!-e "$sqlite3_exe")
+  {
+      print STDERR "Error: Unable to find $sqlite3_exe\n";
+      return undef;
+  } 
+
+  if(!open($infodb_handle, "| \"$sqlite3_exe\" \"$infodb_file_path\""))
+  {
+      print STDERR "Error: Failed to open pipe to \"$sqlite3_exe\" \"$infodb_file_path\"\n";
+      print STDERR "       $!\n";
+      return undef;
   }