Changeset 21566

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.

Location:

main/trunk/greenstone2/perllib

Files:

• cgiactions/metadataaction.pm (modified) (2 diffs)
• doc.pm (modified) (1 diff)
• inexport.pm (modified) (1 diff)
• plugins/ArchivesInfPlugin.pm (modified) (2 diffs)
• plugins/DirectoryPlugin.pm (modified) (1 diff)
• plugouts/BasePlugout.pm (modified) (1 diff)
• strings.properties (modified) (1 diff)
• strings_fr.properties (modified) (1 diff)
• strings_zh.properties (modified) (1 diff)

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

main/trunk/greenstone2/perllib/doc.pm

@@ -1030 +1030 @@
 }
 
-# used for writing out archiveinf-doc.gdb, to list all the metadata files
+# used for writing out the archiveinf-doc info database, to list all the metadata files
 sub get_meta_files {
     my $self = shift (@_);

main/trunk/greenstone2/perllib/inexport.pm

@@ -36 +36 @@
 sub src_db_file {
     my ($archivedir) = @_;
-    return &util::filename_cat ($archivedir, "archiveinf-src.gdb");
+    return &dbutil::get_infodb_file_path("gdbm", "archiveinf-src", $archivedir);
 }
 
 sub doc_db_file {
     my ($archivedir) = @_;
-    return &util::filename_cat ($archivedir, "archiveinf-doc.gdb");
+    return &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
 }
 

main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm

@@ -24 +24 @@
 ###########################################################################
 
-# plugin which reads through an archives.inf (or info database equivalent,
-# archiveinf-doc.gdb file -- i.e. the file generated in the
-# archives directory when an import is done), processing each file it
-# finds
+# plugin which reads through an archives.inf (or archiveinf-doc info database equivalent)
+# -- i.e. the file generated in the archives directory when an import is done),
+# processing each file it finds
 
 package ArchivesInfPlugin;
@@ -224 +223 @@
 ##    my $archive_info_filename = &util::filename_cat($base_dir,$file,"archives.inf");
 
-    my $doc_db = "archiveinf-doc.gdb";
-    my $archive_info_filename = &util::filename_cat($base_dir,$file,$doc_db);
+    my $archive_info_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", &util::filename_cat($base_dir, $file));
 
     if (-e $archive_info_filename) {

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -132 +132 @@
     my $output_dir = $processor->getoutputdir();
 ##  my $archives_inf = &util::filename_cat($output_dir,"archives.inf");
-    my $doc_db = "archiveinf-doc.gdb";
-        my $archives_inf = &util::filename_cat($output_dir,$doc_db);
+        my $archives_inf = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $output_dir);
 
     if ( -e $archives_inf ) {

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -743 +743 @@
     my $output_dir = $self->{'output_dir'};
 
-    my $doc_db = &util::filename_cat($output_dir,"archiveinf-doc.gdb");
-    my $src_db = &util::filename_cat($output_dir,"archiveinf-src.gdb");
+    my $doc_db = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $output_dir);
+    my $src_db = &dbutil::get_infodb_file_path("gdbm", "archiveinf-src", $output_dir);
 
     ##print STDERR "*** To set in db: \n\t$doc_db\n\t$oid\n\t$doc_db_text\n";

main/trunk/greenstone2/perllib/strings.properties

@@ -705 +705 @@
 AcronymExtractor.markup_acronyms:Add acronym metadata into document text.
 
-ArchivesInfPlugin.desc:Plugin which processes the archive info database (archiveinf-doc.gdb) which is generated by the import process. It passes each archive file listed in the database to the plugin pipeline to be processed by GreenstoneXMLPlugin.
+ArchivesInfPlugin.desc:Plugin which processes the archive info database (archiveinf-doc) which is generated by the import process. It passes each archive file listed in the database to the plugin pipeline to be processed by GreenstoneXMLPlugin.
 ArchivesInfPlugin.reversesort:Sort in reverse order. Useful if the -sortmeta option was used with import.pl.
 

main/trunk/greenstone2/perllib/strings_fr.properties

@@ -692 +692 @@
 AcronymExtractor.markup_acronyms:Ajouter des métadonnées d'acromyme au texte du document  
 
-ArchivesInfPlugin.desc:Plugiciel qui traite la base de données d'informations sur les archives (archiveinf-doc.gdb) qui est générée pendant le processus d'importation. Il transmet chaque fichier d'archive référencé dans la base au pipeline de plugiciels pour être traité par GreenstoneXMLPlugin.  
+ArchivesInfPlugin.desc:Plugiciel qui traite la base de données d'informations sur les archives (archiveinf-doc) qui est générée pendant le processus d'importation. Il transmet chaque fichier d'archive référencé dans la base au pipeline de plugiciels pour être traité par GreenstoneXMLPlugin.  
 
 AutoExtractMetadata.desc:Plugiciel de base qui rassemble toutes les fonctionnalités d'extraction des plugiciels d'extraction.  

main/trunk/greenstone2/perllib/strings_zh.properties

@@ -884 +884 @@
 
 ArchivesInfPlugin.desc:本插件倄理富å
-¥è¿‡çš‹ç”Ÿæˆçš„存档文件数据库archives-doc.gdb。它将该数据库䞭的每䞪存档archive文件通过管道机制递亀给GreenstoneXMLPlugin倄理。  
+¥è¿‡çš‹ç”Ÿæˆçš„存档文件数据库archives-doc。它将该数据库䞭的每䞪存档archive文件通过管道机制递亀给GreenstoneXMLPlugin倄理。  
 
 AutoExtractMetadata.desc:将抜取插件䞭所有抜取功胜聚集到䞀起的基本插件