Changeset 21664 for main/trunk/greenstone2/bin

Timestamp:

2010-01-27T14:25:39+13:00 (14 years ago)

Author:

mdewsnip

Message:

Renamed util::rename_gdbm_file() to util::rename_ldb_or_bdb_file().

Location:

main/trunk/greenstone2/bin/script

Files:

• export.pl (modified) (1 diff)
• exportcol.pl (modified) (1 diff)
• import.pl (modified) (1 diff)
• incremental-import.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/export.pl

@@ -534 +534 @@
 
     # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes)
-    &util::rename_gdbm_file(&util::filename_cat($exportdir, "archiveinf-doc"));
-    &util::rename_gdbm_file(&util::filename_cat($exportdir, "archiveinf-src"));
+    &util::rename_ldb_or_bdb_file(&util::filename_cat($exportdir, "archiveinf-doc"));
+    &util::rename_ldb_or_bdb_file(&util::filename_cat($exportdir, "archiveinf-src"));
 
     $expinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $exportdir);

main/trunk/greenstone2/bin/script/exportcol.pl

@@ -319 +319 @@
     &util::mk_all_dir ($newcoldir);
     &util::cp_r ($colindexdir, $newcoldir);
-    &util::rename_gdbm_file(&util::filename_cat ($newcoldir, "index", "text", $c));
+    &util::rename_ldb_or_bdb_file(&util::filename_cat ($newcoldir, "index", "text", $c));
     &util::cp_r ($coletcdir, $newcoldir);
     &util::cp_r ($colmacrosdir, $newcoldir) if (-e $colmacrosdir);

main/trunk/greenstone2/bin/script/import.pl

@@ -536 +536 @@
 
     # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes)
-    &util::rename_gdbm_file(&util::filename_cat($archivedir, "archiveinf-doc"));
-    &util::rename_gdbm_file(&util::filename_cat($archivedir, "archiveinf-src"));
+    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-doc"));
+    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-src"));
 
     $arcinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $archivedir);

main/trunk/greenstone2/bin/script/incremental-import.pl

@@ -41 +41 @@
 use strict;
 
+use dbutil;
 use util;
 
@@ -99 +100 @@
     $archive_dir = &util::filename_cat($this_collect_dir,"archives");
     }
+
+    # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes)
+    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-doc"));
     
-    my $archiveinf_doc = &util::filename_cat($archive_dir,"archiveinf-doc");
-    &util::rename_gdbm_file($archiveinf_doc); # ensure gdb
-    $archiveinf_doc .= ".gdb";
+    my $archiveinf_doc = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+
     my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);