Changeset 1853

Timestamp:

2001-01-22T15:37:46+13:00 (23 years ago)

Author:

kjm18

Message:

adapted to work with both mg and mgpp building. THe default is to use mg.
You can select mgpp in the collect.cfg ("buildtype mgpp") or pass it as
an option ("-buildtype mgpp").

File:

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

trunk/gsdl/bin/script/buildcol.pl

@@ -64 +64 @@
     &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
     print STDERR "   -out                  Filename or handle to print output status to.\n";
-    print STDERR "                         The default is STDERR\n\n";
+    print STDERR "                         The default is STDERR\n";
+    print STDERR "   -buildtype mg|mgpp    THis will override the config file setting. (default is mg)\n";
+    print STDERR "   -no_strip_html        Do not strip the html tags from the indexed text (only used for mgpp collections).\n\n";
 }
 
@@ -72 +74 @@
     my ($verbosity, $archivedir, $cachedir, $builddir, $maxdocs, 
     $debug, $mode, $indexname, $keepold, $allclassifications,
-    $create_images, $collectdir, $out);
+    $create_images, $collectdir, $out, $buildtype, $textindex,
+    $no_strip_html);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -86 +89 @@
              'create_images', \$create_images,
              'collectdir/.*/', \$collectdir,
-             'out/.*/STDERR', \$out)) {
+             'out/.*/STDERR', \$out,
+             'no_strip_html', \$no_strip_html,
+             'buildtype/^(mg|mgpp)$/', \$buildtype)) {
     &print_usage();
     die "\n";
     }
 
+    $textindex = "";
     my $close_out = 0;
     if ($out !~ /^(STDERR|STDOUT)$/i) {
@@ -106 +112 @@
 
     # read the configuration file
-    $textindex = "section:text";
+
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     if (-e $configfilename) {
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+
+    if (defined $collectcfg->{'buildtype'} && $buildtype eq "") {
+        $buildtype = $collectcfg->{'buildtype'};
+    }
+    if ($buildtype eq "") {
+        $buildtype = "mg"; # mg is the default
+    }
     if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
         $archivedir = $collectcfg->{'archivedir'};
@@ -119 +132 @@
         $builddir = $collectcfg->{'builddir'};
     }
+    if ($buildtype eq "mgpp" && defined $collectcfg->{'textcompress'}) {
+        $textindex = $collectcfg->{'textcompress'};
+    }
+    
     } else {
     die "Couldn't find the configuration file $configfilename\n";
     }
     
+    #mgpp doesn't work yet on windows
+    if ($buildtype eq "mgpp" && $ENV{'GSDLOS'} =~ /^windows$/) {
+    die "mgpp doesn't work on windows\n";
+    }
+    
+    #set the text index
+    if ($buildtype eq "mgpp") {
+    if ($textindex eq "") {
+        $textindex = "text";
+    }
+    }
+    else {
+    $textindex = "section:text";
+    }
+
     # create default images if required
     if ($create_images) {
@@ -165 +197 @@
 
     # if a builder class has been created for this collection, use it
-    # otherwise, use the mg builder
+    # otherwise, use the mg or mgpp builder
     if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}builder.pm") {
     $builderdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
@@ -171 +203 @@
     } else {
     $builderdir = "$ENV{'GSDLHOME'}/perllib";
-    $buildertype = "mgbuilder";
+    if ($buildtype eq "mgpp") {
+        $buildertype = "mgppbuilder";
+    }
+    else {
+        $buildertype = "mgbuilder";
+    }
     }
     
@@ -183 +220 @@
     $builder->init();
 
+    if ($buildertype eq "mgppbuilder" && $no_strip_html) {
+    $builder->set_strip_html(0);
+    }
     if ($mode =~ /^all$/i) {
     $builder->compress_text($textindex);
@@ -261 +301 @@
     close CFGFILE;
 }
+