Changeset 19485 for gsdl

Timestamp:

2009-05-16T15:21:27+12:00 (15 years ago)

Author:

davidb

Message:

Couple of minor fixes/improvements

File:

• gsdl/trunk/bin/script/build (modified) (3 diffs)

gsdl/trunk/bin/script/build

@@ -360 +360 @@
         }
         &gsdl_import();
-        if (&has_content ($archivedir, "^(archiveinf-(doc|src).gdb|OIDcount)\$")) {
+        if (&has_content ($archivedir, "^archiveinf-doc.gdb\$")) {
         &gsdl_build();
         } else {
@@ -469 +469 @@
     }
     } else {
+    print $out `ls $archivedir`;
+
     my $msg = "build: ERROR: import.pl failed\n";
     print $out "\n$msg";
@@ -505 +507 @@
     &append_file ($out, "$outfile.build");
 
-    if (($removeold && -e &util::filename_cat ($buildingdir, "text", "$collection.gdb" )) ||
-    ($removeold == 0 && -e &util::filename_cat ($indexdir, "text", "$collection.gdb"))) {
+    my @db_exts = ( ".ldb", ".bdb", ".gdb", ".db" );
+    my $build_ok = 0;
+    foreach my $db_ext (@db_exts) {
+    if ($removeold && (-e &util::filename_cat ($buildingdir, "text", "$collection$db_ext"))) {
+        $build_ok = 1;
+        last;
+    }
+    if (($removeold==0) && (-e &util::filename_cat ($indexdir, "text", "$collection$db_ext"))) {
+        $build_ok = 1;
+        last;
+    }
+    }
+
+    if ($build_ok) {
     print $out "$collection collection built successfully\n\n";
     if ($remove_archives) {