Changeset 15710

Timestamp:

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

Author:

mdewsnip

Message:

(Adding new DB support) Adding new get_infodb_file_path() function to dbutil to abstract away the GDBM endian stuff, and changed basebuilder::make_infodatabase() to use it.

Location:

gsdl/trunk/perllib

Files:

• basebuilder.pm (modified) (3 diffs)
• dbutil.pm (modified) (2 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -320 +320 @@
     &util::mk_all_dir ($assocdir);
 
-    # get db name
-    my $dbext = ".bdb";
-    $dbext = ".ldb" if &util::is_little_endian();
-    my $dbname = &util::get_dirsep_tail($self->{'collection'}).$dbext;
-    my $fulldbname = &util::filename_cat ($textdir, $dbname);
-    $fulldbname =~ s/\//\\/g if ($ENV{'GSDLOS'} =~ /^windows$/i);
-
-    my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
-    my $exe = &util::get_os_exe ();
-    my $txt2db_exe = &util::filename_cat($exedir, "txt2db$exe");
+    # Get info database file path
+    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'collection'}, $textdir);
 
     print $outhandle "\n*** creating the info database and processing associated files\n" 
@@ -338 +330 @@
     &classify::init_classifiers ($self->{'classifiers'});
 
-
     my $reconstructed_docs = undef;
     if ($self->{'keepold'}) {
     # reconstruct doc_obj metadata from database for all docs
-    $reconstructed_docs = &classify::reconstruct_doc_objs_metadata($fulldbname);
+    $reconstructed_docs = &classify::reconstruct_doc_objs_metadata($infodb_file_path);
     }
     
@@ -349 +340 @@
     if ($self->{'debug'}) {
     $infodb_handle = *STDOUT;
-    } else {
-    if (!-e "$txt2db_exe" || !open (PIPEOUT, "| txt2db$exe \"$fulldbname\"")) {
+    }
+    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\"")) {
         print STDERR "<FatalError name='NoRunText2DB'/>\n</Stage>\n" if $self->{'gli'};
         die "builder::make_infodatabase - couldn't run $txt2db_exe\n";

gsdl/trunk/perllib/dbutil.pm

@@ -29 +29 @@
 
 
+sub get_infodb_file_path
+{
+    my $collection_name = shift(@_);
+    my $infodb_directory_path = shift(@_);
+
+    return &get_infodb_file_path_gdbm($collection_name, $infodb_directory_path);
+}
+
+
 sub read_infodb_file
 {
@@ -52 +61 @@
 #   GDBM FUNCTIONS
 # ----------------------------------------------------------------------------------------
+
+sub get_infodb_file_path_gdbm
+{
+    my $collection_name = shift(@_);
+    my $infodb_directory_path = shift(@_);
+
+    my $infodb_file_extension = (&util::is_little_endian() ? ".ldb" : ".bdb");
+    my $infodb_file_name = &util::get_dirsep_tail($collection_name) . $infodb_file_extension;
+    return &util::filename_cat($infodb_directory_path, $infodb_file_name);
+}
+
 
 sub read_infodb_file_gdbm