Changeset 10457

Timestamp:

2005-08-10T13:32:41+12:00 (19 years ago)

Author:

kjdon

Message:

changed
if (-e $configfilename) {
...
} else {

die;

}
to
if (!-e $configfilename) {
die;
}
and so retabbed the code from the old if bit

File:

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

trunk/gsdl/bin/script/buildcol.pl

@@ -197 +197 @@
     $debug, $mode, $indexname, $removeold, $keepold, $remove_empty_classifications,
     $create_images, $collectdir, $build, $type, $textindex,
-    $no_strip_html, $no_text, $faillog, $gli, $index, $language);
+    $no_strip_html, $no_text, $faillog, $gli, $index, $language,
+    $sections_index_document_metadata);
 
     my $xml = 0;
@@ -271 +272 @@
     my ($collectcfg, $buildtype); 
 
-    if (-e $configfilename) {
-    $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-
-    if ($verbosity !~ /\d+/) {
-        if (defined $collectcfg->{'verbosity'} && $collectcfg->{'verbosity'} =~ /\d+/) {
-        $verbosity = $collectcfg->{'verbosity'};
-        } else {
-        $verbosity = 2; # the default
-        }
-    }
-    # we use searchtype for determining buildtype, but for old versions, use buildtype
-    if (defined $collectcfg->{'buildtype'}) {
-        $buildtype = $collectcfg->{'buildtype'};
-    } elsif (defined $collectcfg->{'searchtypes'} || defined $collectcfg->{'searchtype'}) {
-        $buildtype = "mgpp";
+    if (!-e $configfilename) {
+    &gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die;
+    }
+    
+    $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+    
+    if ($verbosity !~ /\d+/) {
+    if (defined $collectcfg->{'verbosity'} && $collectcfg->{'verbosity'} =~ /\d+/) {
+        $verbosity = $collectcfg->{'verbosity'};
     } else {
-        $buildtype = "mg"; #mg is the default
-    }
-    if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
-        $archivedir = $collectcfg->{'archivedir'};
-    }
-    if (defined $collectcfg->{'cachedir'} && $cachedir eq "") {
-        $cachedir = $collectcfg->{'cachedir'};
-    }
-    if (defined $collectcfg->{'builddir'} && $builddir eq "") {
-        $builddir = $collectcfg->{'builddir'};
-    }
-    if ($maxdocs !~ /\-?\d+/) {
-        if (defined $collectcfg->{'maxdocs'} && $collectcfg->{'maxdocs'} =~ /\-?\d+/) {
-        $maxdocs = $collectcfg->{'maxdocs'};
-        } else {
-        $maxdocs = -1; # the default
-        }
-    }
-    if (defined $collectcfg->{'debug'} && $collectcfg->{'debug'} =~ /^true$/i) {
-        $debug = 1;
-    }
-    if ($mode !~ /^(all|compress_text|build_index|infodb)$/) {
-        if (defined $collectcfg->{'mode'} && $collectcfg->{'mode'} =~ /^(all|compress_text|build_index|infodb)$/) {
-        $mode = $collectcfg->{'mode'};
-        } else {
-        $mode = "all"; # the default
-        }
-    }
-    if (defined $collectcfg->{'index'} && $indexname eq "") {
-        $indexname = $collectcfg->{'index'};
-    }
-    if (defined $collectcfg->{'no_text'} && $no_text == 0) {
-        if ($collectcfg->{'no_text'} =~ /^true$/i) {
-        $no_text = 1;
-        }
-    }
-    if (defined $collectcfg->{'no_strip_html'} && $no_strip_html == 0) {
-        if ($collectcfg->{'no_strip_html'} =~ /^true$/i) {
-        $no_strip_html = 1;
-        }
-    }
-    if (defined $collectcfg->{'remove_empty_classifications'} && $remove_empty_classifications == 0) {
-        if ($collectcfg->{'remove_empty_classifications'} =~ /^true$/i) {
-        $remove_empty_classifications = 1;
-        }
-    }
-
-    if (defined $collectcfg->{'create_images'} && $collectcfg->{'create_images'} =~ /^true$/i) {
-        $create_images = 1;
-    }
-    if ($buildtype eq "mgpp" && defined $collectcfg->{'textcompress'}) {
-        $textindex = $collectcfg->{'textcompress'};
-    }
-    if (defined $collectcfg->{'gli'} && $collectcfg->{'gli'} =~ /^true$/i) {
-        $gli = 1;
-    }
-    
+        $verbosity = 2; # the default
+    }
+    }
+    # we use searchtype for determining buildtype, but for old versions, use buildtype
+    if (defined $collectcfg->{'buildtype'}) {
+    $buildtype = $collectcfg->{'buildtype'};
+    } elsif (defined $collectcfg->{'searchtypes'} || defined $collectcfg->{'searchtype'}) {
+    $buildtype = "mgpp";
     } else {
-    &gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die;
-    }
-
+    $buildtype = "mg"; #mg is the default
+    }
+    if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
+    $archivedir = $collectcfg->{'archivedir'};
+    }
+    if (defined $collectcfg->{'cachedir'} && $cachedir eq "") {
+    $cachedir = $collectcfg->{'cachedir'};
+    }
+    if (defined $collectcfg->{'builddir'} && $builddir eq "") {
+    $builddir = $collectcfg->{'builddir'};
+    }
+    if ($maxdocs !~ /\-?\d+/) {
+    if (defined $collectcfg->{'maxdocs'} && $collectcfg->{'maxdocs'} =~ /\-?\d+/) {
+        $maxdocs = $collectcfg->{'maxdocs'};
+    } else {
+        $maxdocs = -1; # the default
+    }
+    }
+    if (defined $collectcfg->{'debug'} && $collectcfg->{'debug'} =~ /^true$/i) {
+    $debug = 1;
+    }
+    if ($mode !~ /^(all|compress_text|build_index|infodb)$/) {
+    if (defined $collectcfg->{'mode'} && $collectcfg->{'mode'} =~ /^(all|compress_text|build_index|infodb)$/) {
+        $mode = $collectcfg->{'mode'};
+    } else {
+        $mode = "all"; # the default
+    }
+    }
+    if (defined $collectcfg->{'index'} && $indexname eq "") {
+    $indexname = $collectcfg->{'index'};
+    }
+    if (defined $collectcfg->{'no_text'} && $no_text == 0) {
+    if ($collectcfg->{'no_text'} =~ /^true$/i) {
+        $no_text = 1;
+    }
+    }
+    if (defined $collectcfg->{'no_strip_html'} && $no_strip_html == 0) {
+    if ($collectcfg->{'no_strip_html'} =~ /^true$/i) {
+        $no_strip_html = 1;
+    }
+    }
+    if (defined $collectcfg->{'remove_empty_classifications'} && $remove_empty_classifications == 0) {
+    if ($collectcfg->{'remove_empty_classifications'} =~ /^true$/i) {
+        $remove_empty_classifications = 1;
+    }
+    }
+    
+    if (defined $collectcfg->{'create_images'} && $collectcfg->{'create_images'} =~ /^true$/i) {
+    $create_images = 1;
+    }
+    if ($buildtype eq "mgpp" && defined $collectcfg->{'textcompress'}) {
+    $textindex = $collectcfg->{'textcompress'};
+    }
+    if (defined $collectcfg->{'gli'} && $collectcfg->{'gli'} =~ /^true$/i) {
+    $gli = 1;
+    }
+    
     ($removeold, $keepold) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, "building", $collectcfg);