Changeset 2381

Timestamp:

2001-05-08T10:28:03+12:00 (23 years ago)

Author:

sjboddie

Message:

build script now fails with an error message if the import stage doesn't
import any documents (e.g. if all the documents in the import directory
are in a format that no plugin can process).

File:

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

trunk/gsdl/bin/script/build

@@ -308 +308 @@
         }
         &gsdl_import();
-        &gsdl_build();
+        if (&has_content ($archivedir, "^archives.inf\$")) {
+        &gsdl_build();
+        } else {
+        my $msg = "build: ERROR: The collection could not be built as no\n";
+        $msg .=   "       valid data was imported. Are at least some of\n";
+        $msg .=   "       the files you imported in a format that can be\n";
+        $msg .=   "       processed by the specified Greenstone plugins?\n";
+        print $out $msg;
+        &log_event ($msg);
+        &final_out (6) if $use_out;
+        die "\n";
+        }
     } else {
         # no import or archives
-        my $msg = "build: ERROR: The $collection collection has no import or archives data.\n";
+        my $msg = "build: ERROR: The collection could not be built as it contains no data.\n";
         print $out $msg;
         &log_event ($msg);
@@ -420 +431 @@
 }
 
+# return 1 if $dir directory contains any files or sub-directories (other
+# than those specified in the $ignore regular expression)
 sub has_content {
-    my ($dir) = @_;
+    my ($dir, $ignore) = @_;
 
     if (!-d $dir) {return 0;}
-
+    
     opendir (DIR, $dir) || return 0;
     my @files = readdir DIR;
@@ -431 +444 @@
     foreach my $file (@files) {
     if ($file !~ /^\.{1,2}$/) {
-        return 1;
+        return 1 unless (defined $ignore && $file =~ /$ignore/);
     }
     }