Changeset 4766

Timestamp:

2003-06-23T14:41:00+12:00 (21 years ago)

Author:

kjdon

Message:

no longer give the buildtype option to teh script - it only makes sense to change this in the collect.cfg - cant use a different buildtype with the other ones index specification. new config files will use searchtype instead - this sets buildtype to mgpp. however, if searchtype is not defined, we look for buildtype, if thats not defined, the coll is assumed to be mg.

File:

• trunk/gsdl/bin/script/buildcol.pl (modified) (3 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -72 +72 @@
     print STDOUT "   -out                  Filename or handle to print output status to.\n";
     print STDOUT "                         The default is STDERR\n";
-    print STDOUT "   -buildtype mg|mgpp    This will override the config file setting.\n";
-    print STDOUT "                         (default is mg)\n";
     print STDOUT "   -no_strip_html        Do not strip the html tags from the indexed text\n";
     print STDOUT "                         (only used for mgpp collections).\n\n";
@@ -110 +108 @@
              'out/.*/STDERR', \$out,
              'no_strip_html', \$no_strip_html,
-             'buildtype/^(mg|mgpp)$/', \$buildtype,
              'faillog/.*/', \$faillog)) {
     &print_usage();
@@ -153 +150 @@
         }
     }
-    if (defined $collectcfg->{'buildtype'} && $buildtype eq "") {
+    # we use searchtype for determining buildtype, but for old versions, use buildtype
+    if (defined $collectcfg->{'searchtype'}) {
+        $buildtype = "mgpp";
+    }
+    elsif (defined $collectcfg->{'buildtype'}) {
         $buildtype = $collectcfg->{'buildtype'};
-    }
-    if ($buildtype eq "") {
-        $buildtype = "mg"; # mg is the default
+    } else {
+        $buildtype = "mg"; #mg is the default
     }
     if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {