Changeset 1279 for branches/New_Config_Format-branch/gsdl/cgi-bin/webpage_mkcol.pl

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/cgi-bin/webpage_mkcol.pl (modified) (9 diffs)

branches/New_Config_Format-branch/gsdl/cgi-bin/webpage_mkcol.pl

@@ -1 @@
-#!/usr/local/bin/perl5 -w
+#!perl -w
 
 ###########################################################################
@@ -28 +28 @@
 # This program is a webpage wrapper to the mkcol.pl process
 
+package webpage_mkcol;
+
 use CGI;
 use GSDLHOME;
-use Fcntl ':flock';
+use gflock;
 
 require util;
@@ -41 +43 @@
     my %args = ();
     
+    open (FILE, '>d:\gsdl\logout.txt') || die;
+
     foreach $p ($cgi->param()) 
     { 
     $args{$p} = $cgi->param($p);
-    }
-
+
+    print FILE "webpage_mkcol.pl - $p -> $args{$p}\n";
+    }
+
+    close FILE;
     return \%args;
 }
@@ -85 +92 @@
     else
     {
-    # clean up input for heuristic that derives directory name for a new collection
+    # clean up input for heuristic that derives directory name for a
+    # new collection
     $fullname =~ s/\s+/ /g;
     $fullname =~ tr/[A-Z]/[a-z]/;
@@ -149 +157 @@
     my $acronyms      = $args->{'bc1acronyms'};
 
-    my $cmd = "mkcol.pl";
+    my $cmd = "perl ";
+    $cmd .= &util::filename_cat($ENV{'GSDLHOME'}, "bin", "script", "mkcol.pl");
     $cmd .= " -title   \"$fullname\"";
     $cmd .= " -creator $contact_email";
     $cmd .= " -about   \"$about_desc\"";
-    $cmd .= " -plugins \"GMLPlug ${src_format}Plug ArcPlug RecPlug\"";
+    $cmd .= " -plugin  \"GMLPlug\"";
+    $cmd .= " -plugin  \"${src_format}Plug\"";
+    $cmd .= " -plugin  \"ArcPlug\"";
+    $cmd .= " -plugin  \"RecPlug\"";
 ### $cmd .= " -refine  \"$refine_plugs\"";
     $cmd .= " $unique_dirname";
+
     my $status = system($cmd);
     $status /= 256;
@@ -162 +175 @@
     {
         # append copydir, file_or_url 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,
@@ -167 +181 @@
         if (open(CFGAPP,">>$cfg_filename"))
         {
-        if (flock(CFGAPP,LOCK_EX))
-        {
+        if (&gflock::lock (webpage_mkcol::CFGAPP)) {
             print CFGAPP "\n";
+
+            if ($src_format eq "HTML") {
+            print CFGAPP "format\tDocumentUseHTML\ttrue\n\n";
+            }
+
             print CFGAPP "building\tfileorurl\t$file_or_url\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";
-            flock(CFGAPP,LOCK_UN);
+            &gflock::unlock (webpage_mkcol::CFGAPP);
             close(CFGAPP);
         }
@@ -195 +213 @@
         return;
         }
-
-
-        # append dirname to end of collection config file
-        my $collist_filename 
-        = &util::filename_cat($ENV{'GSDLHOME'},"etc","collections.txt");
-        if (open(CLAPP,">>$collist_filename"))
-        {
-        if (flock(CLAPP,LOCK_EX))
-        {
-            print CLAPP "$unique_dirname\n";
-            flock(CLAPP,LOCK_UN);
-            close(CLAPP);
-        }
-        else
-        {
-            # problem locking file
-            my $mess = "Unable to lock collection list";
-            $mess .= " configuration file: $collist_filename";
-            &webpageutil::error_location($args,$mess);
-            close(CLAPP);
-            return;
-        }
-        }
-        else
-        {
-        # problem
-        my $mess = "Unable to append to collection list";
-        $mess .= " configuration file: $collist_filename";
-        &webpageutil::error_location($args,$mess);
-        return;
-        }
-        
     }
     else
@@ -248 +234 @@
 
 &main();
-
-
-
-
-