Changeset 19485


Ignore:
Timestamp:
05/16/09 15:21:27 (12 years ago)
Author:
davidb
Message:

Couple of minor fixes/improvements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/build

    r19446 r19485  
    360360        }
    361361        &gsdl_import();
    362         if (&has_content ($archivedir, "^(archiveinf-(doc|src).gdb|OIDcount)\$")) {
     362        if (&has_content ($archivedir, "^archiveinf-doc.gdb\$")) {
    363363        &gsdl_build();
    364364        } else {
     
    469469    }
    470470    } else {
     471    print $out `ls $archivedir`;
     472
    471473    my $msg = "build: ERROR: import.pl failed\n";
    472474    print $out "\n$msg";
     
    505507    &append_file ($out, "$outfile.build");
    506508
    507     if (($removeold && -e &util::filename_cat ($buildingdir, "text", "$collection.gdb" )) ||
    508     ($removeold == 0 && -e &util::filename_cat ($indexdir, "text", "$collection.gdb"))) {
     509    my @db_exts = ( ".ldb", ".bdb", ".gdb", ".db" );
     510    my $build_ok = 0;
     511    foreach my $db_ext (@db_exts) {
     512    if ($removeold && (-e &util::filename_cat ($buildingdir, "text", "$collection$db_ext"))) {
     513        $build_ok = 1;
     514        last;
     515    }
     516    if (($removeold==0) && (-e &util::filename_cat ($indexdir, "text", "$collection$db_ext"))) {
     517        $build_ok = 1;
     518        last;
     519    }
     520    }
     521
     522    if ($build_ok) {
    509523    print $out "$collection collection built successfully\n\n";
    510524    if ($remove_archives) {
Note: See TracChangeset for help on using the changeset viewer.