Changeset 7950

Timestamp:

2004-08-16T15:53:43+12:00 (20 years ago)

Author:

davidb

Message:

Exit status resulting from a 'die' statement changed to print and exit 0
combination so when run with -xml flag printing out details it isn't seen
stopping with an error.

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (4 diffs)
• import.pl (modified) (1 diff)

trunk/gsdl/bin/script/buildcol.pl

@@ -206 +206 @@
     if ($xml) {
         &PrintUsage::print_xml_usage($options);
-    die "\n";
+    print "\n";
+    return;
     }
 
@@ -324 +325 @@
 
     #set the text index
-    if ($buildtype eq "mgpp") {
+    if (($buildtype eq "mgpp") || ($buildtype eq "lucene")) {
     if ($textindex eq "") {
         $textindex = "text";
@@ -381 +382 @@
     } else {
     $builderdir = "$ENV{'GSDLHOME'}/perllib";
-    if ($buildtype eq "mgpp") {
+    if ($buildtype eq "lucene") {
+        $buildertype = "lucenebuilder";
+    }
+    elsif ($buildtype eq "mgpp") {
         $buildertype = "mgppbuilder";
     }
@@ -399 +403 @@
     $builder->init();
 
-    if ($buildertype eq "mgppbuilder" && $no_strip_html) {
+    if (($buildertype eq "mgppbuilder") && $no_strip_html) {
     $builder->set_strip_html(0);
     }
+
     if ($mode =~ /^all$/i) {
     $builder->compress_text($textindex);

trunk/gsdl/bin/script/import.pl

@@ -228 +228 @@
     if ($xml) {
         &PrintUsage::print_xml_usage($options);
-    die "\n";
+    print "\n";
+    return;
     }