Changeset 21566 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2010-01-21T16:20:42+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed all places explicitly using "archiveinf-doc.gdb" or "archiveinf-src.gdb" to use the dbutil::get_infodb_file_path() function... you know, the one that should have been used originally? In preparation for making it possible to use something other than GDBM, and part of making the code less GDBM-specific.

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -515 +515 @@
     $metapos = 0 if (!defined $metapos);
 
-    my $doc_db = "archiveinf-doc.gdb";
-    my $arcinfo_doc_filename = &util::filename_cat ($archive_dir, $doc_db);
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archive_dir);
 
     my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $docid);
@@ -693 +692 @@
 
     if (defined $docid) {
-
-    my $doc_db = "archiveinf-doc.gdb";
-    my $arcinfo_doc_filename = &util::filename_cat ($archive_dir, $doc_db);
-
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archive_dir);
     my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $docid);
     my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);