Changeset 21581 for main/trunk/greenstone2/bin/script

Timestamp:

2010-01-22T15:57:09+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed import.pl and export.pl so instead of explicitly using "archiveinf-doc.gdb" or "archiveinf-src.gdb" they 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/bin/script

Files:

• export.pl (modified) (1 diff)
• import.pl (modified) (1 diff)

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

@@ -525 +525 @@
     # the plugouts should be doing this!!
 ##  $expinfo_doc_filename = &util::filename_cat ($exportdir, "export.inf");
-    $expinfo_doc_filename = &util::filename_cat ($exportdir,"archiveinf-doc" );
-    &util::rename_gdbm_file($expinfo_doc_filename); # ensures gdb in case we have an existing legacy ldb one - can this happen?
-    $expinfo_doc_filename .= ".gdb";
-    
-    $expinfo_src_filename = &util::filename_cat ($exportdir,"archiveinf-src" );
-    &util::rename_gdbm_file($expinfo_src_filename); # ensures gdb in case we have an existing legacy ldb one - can this happen?
-    $expinfo_src_filename .= ".gdb";
-
+
+    # 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"));
+
+    $expinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $exportdir);
+    $expinfo_src_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-src", $exportdir);
         
     $export_info = new arcinfo($collectcfg->{'infodbtype'});

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

@@ -527 +527 @@
     # read the archive information file
 ##  $arcinfo_doc_filename = &util::filename_cat ($archivedir, "archives.inf");
-    
-    $arcinfo_doc_filename = &util::filename_cat ($archivedir, "archiveinf-doc");
-    &util::rename_gdbm_file($arcinfo_doc_filename); # ensures gdb
-    $arcinfo_doc_filename .= ".gdb";
-    
-    $arcinfo_src_filename = &util::filename_cat ($archivedir, "archiveinf-src");   
-    &util::rename_gdbm_file($arcinfo_src_filename); # ensures gdb
-    $arcinfo_src_filename .= ".gdb";
-
+
+    # 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"));
+
+    $arcinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $archivedir);
+    $arcinfo_src_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-src", $archivedir);
                             
     $archive_info = new arcinfo ($collectcfg->{'infodbtype'});