Changeset 1305 for trunk/gsdl/cgi-bin/webpage_mkcol.pl

Timestamp:

2000-07-25T14:19:51+12:00 (24 years ago)

Author:

sjboddie

Message:

some more tidying up of end-user collection building

File:

• trunk/gsdl/cgi-bin/webpage_mkcol.pl (modified) (4 diffs)

trunk/gsdl/cgi-bin/webpage_mkcol.pl

@@ -151 +151 @@
     my $about_desc    = $args->{'bc1aboutdesc'};
     my $src_format    = $args->{'bc1srcformat'};
-    my $file_or_url   = $args->{'bc1fileorurl'};
     my $input_dir     = $args->{'bc1inputdir'};
     my $copy_dir      = $args->{'bc1copydir'};
@@ -163 +162 @@
     $cmd .= " -about   \"$about_desc\"";
     $cmd .= " -plugin  \"GMLPlug\"";
-    $cmd .= " -plugin  \"${src_format}Plug\"";
+    if ($src_format eq "HTML") {
+        $cmd .= " -plugin  \"HTMLPlug -keep_head\"";
+    } else {
+        $cmd .= " -plugin  \"${src_format}Plug\"";
+    }
     $cmd .= " -plugin  \"ArcPlug\"";
     $cmd .= " -plugin  \"RecPlug\"";
-### $cmd .= " -refine  \"$refine_plugs\"";
     $cmd .= " $unique_dirname";
 
@@ -174 +176 @@
     if ($status == 0)
     {
-        # append copydir, file_or_url and input_dir to end of collect.cfg
-        # we'll also append DocumentUseHTML if processing HTML docs
+        # append copydir and input_dir to end of collect.cfg we'll also
+        # append DocumentUseHTML if processing HTML docs
         my $cfg_filename 
         = &util::filename_cat($ENV{'GSDLHOME'},"collect",$unique_dirname,
@@ -188 +190 @@
             }
 
-            print CFGAPP "building\tfileorurl\t$file_or_url\n";
-            print CFGAPP "building\tinputdir\t$input_dir\n";
+            print CFGAPP "building\tinputdir\t\"$input_dir\"\n";
             print CFGAPP "building\tcopydir\t\t$copy_dir\n";
             print CFGAPP "building\tingsdlarea\t$in_gsdl_area\n";