Changeset 21567

Show
Ignore:
Timestamp:
21.01.2010 16:25:53 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/build

    r19485 r21567  
    337337    `echo $importdir ; ls $importdir `; 
    338338 
    339     if (-e &util::filename_cat ($archivedir, "archiveinf-doc.gdb")) { 
     339    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir); 
     340    if (-e $archiveinf_doc_file_path) { 
    340341    if (&has_content ($importdir)) { 
    341342        if ($buildtype eq "build") { 
     
    360361        } 
    361362        &gsdl_import(); 
    362         if (&has_content ($archivedir, "^archiveinf-doc.gdb\$")) { 
     363        if (&has_content ($archivedir, "^archiveinf-doc\..*\$")) { 
    363364        &gsdl_build(); 
    364365        } else { 
     
    462463    &append_file ($out, "$outfile.import"); 
    463464 
    464     if (-e &util::filename_cat ($archivedir, "archiveinf-doc.gdb")) { 
     465    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir); 
     466    if (-e $archiveinf_doc_file_path) { 
    465467    print $out "$collection collection imported successfully\n\n"; 
    466468    if ($remove_import) {