Changeset 21664

Show
Ignore:
Timestamp:
27.01.2010 14:25:39 (9 years ago)
Author:
mdewsnip
Message:

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

Location:
main/trunk/greenstone2
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/export.pl

    r21633 r21664  
    534534 
    535535    # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes) 
    536     &util::rename_gdbm_file(&util::filename_cat($exportdir, "archiveinf-doc")); 
    537     &util::rename_gdbm_file(&util::filename_cat($exportdir, "archiveinf-src")); 
     536    &util::rename_ldb_or_bdb_file(&util::filename_cat($exportdir, "archiveinf-doc")); 
     537    &util::rename_ldb_or_bdb_file(&util::filename_cat($exportdir, "archiveinf-src")); 
    538538 
    539539    $expinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $exportdir); 
  • main/trunk/greenstone2/bin/script/exportcol.pl

    r19791 r21664  
    319319    &util::mk_all_dir ($newcoldir); 
    320320    &util::cp_r ($colindexdir, $newcoldir); 
    321     &util::rename_gdbm_file(&util::filename_cat ($newcoldir, "index", "text", $c)); 
     321    &util::rename_ldb_or_bdb_file(&util::filename_cat ($newcoldir, "index", "text", $c)); 
    322322    &util::cp_r ($coletcdir, $newcoldir); 
    323323    &util::cp_r ($colmacrosdir, $newcoldir) if (-e $colmacrosdir); 
  • main/trunk/greenstone2/bin/script/import.pl

    r21633 r21664  
    536536 
    537537    # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes) 
    538     &util::rename_gdbm_file(&util::filename_cat($archivedir, "archiveinf-doc")); 
    539     &util::rename_gdbm_file(&util::filename_cat($archivedir, "archiveinf-src")); 
     538    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-doc")); 
     539    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-src")); 
    540540 
    541541    $arcinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $archivedir); 
  • main/trunk/greenstone2/bin/script/incremental-import.pl

    r20925 r21664  
    4141use strict; 
    4242 
     43use dbutil; 
    4344use util; 
    4445 
     
    99100    $archive_dir = &util::filename_cat($this_collect_dir,"archives"); 
    100101    } 
     102 
     103    # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes) 
     104    &util::rename_ldb_or_bdb_file(&util::filename_cat($archivedir, "archiveinf-doc")); 
    101105     
    102     my $archiveinf_doc = &util::filename_cat($archive_dir,"archiveinf-doc"); 
    103     &util::rename_gdbm_file($archiveinf_doc); # ensure gdb 
    104     $archiveinf_doc .= ".gdb"; 
     106    my $archiveinf_doc = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir); 
     107 
    105108    my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv); 
    106109     
  • main/trunk/greenstone2/perllib/util.pm

    r21616 r21664  
    11171117 
    11181118# BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files 
    1119 sub rename_gdbm_file { 
     1119sub rename_ldb_or_bdb_file { 
    11201120    my ($filename_no_ext) = @_; 
    11211121