Changeset 15711

Timestamp:

2008-05-27T12:17:05+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Creating a new "open_infodb_write_handle()" function in dbutil.pm to remove the last bit of GDBM-specific code from basebuilder.pm.

Location:

gsdl/trunk/perllib

Files:

• basebuilder.pm (modified) (1 diff)
• dbutil.pm (modified) (2 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -342 +342 @@
     }
     else {
-    my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
-    my $exe = &util::get_os_exe ();
-    my $txt2db_exe = &util::filename_cat($exedir, "txt2db$exe");
-
-    if (!-e "$txt2db_exe" || !open (PIPEOUT, "| txt2db$exe \"$infodb_file_path\"")) {
+    $infodb_handle = &dbutil::open_infodb_write_handle($infodb_file_path);
+    if (!defined($infodb_handle))
+    {
         print STDERR "<FatalError name='NoRunText2DB'/>\n</Stage>\n" if $self->{'gli'};
-        die "builder::make_infodatabase - couldn't run $txt2db_exe\n";
-    }
-    $infodb_handle = *PIPEOUT;
+        die "builder::make_infodatabase - couldn't open infodb write handle\n";
+    }
     }
     

gsdl/trunk/perllib/dbutil.pm

@@ -38 +38 @@
 
 
+sub open_infodb_write_handle
+{
+    my $infodb_file_path = shift(@_);
+
+    return &open_infodb_write_handle_gdbm($infodb_file_path);
+}
+
+
 sub read_infodb_file
 {
@@ -70 +78 @@
     my $infodb_file_name = &util::get_dirsep_tail($collection_name) . $infodb_file_extension;
     return &util::filename_cat($infodb_directory_path, $infodb_file_name);
+}
+
+
+sub open_infodb_write_handle_gdbm
+{
+    my $infodb_file_path = shift(@_);
+
+    my $txt2db_exe = &util::filename_cat("$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}", "txt2db" . &util::get_os_exe());
+    if (!-e "$txt2db_exe" || !open(PIPEOUT, "| $txt2db_exe \"$infodb_file_path\""))
+    {
+    return undef;
+    }
+
+    return *PIPEOUT;
 }