Changeset 1192

Timestamp:

2000-05-25T14:42:12+12:00 (24 years ago)

Author:

sjboddie

Message:

fixed a bug in the new file locking stuff

Location:

trunk/gsdl/cgi-bin

Files:

• webpage_buildcol.pl (modified) (2 diffs)
• webpage_editcol.pl (modified) (2 diffs)
• webpage_mkcol.pl (modified) (3 diffs)

trunk/gsdl/cgi-bin/webpage_buildcol.pl

@@ -31 +31 @@
 #  the more traditional command line argument.  The program is executed by
 #   an already running cgi program.
+
+package webpage_buildcol;
 
 use File::Basename;
@@ -61 +63 @@
     if (open(TMPOUT,">$full_tmpname"))
     {
-    if (&gflock::lock (TMPOUT)) {
+    if (&gflock::lock (webpage_buildcol::TMPOUT)) {
         print TMPOUT $text;
         close(TMPOUT);
-        &gflock::unlock (TMPOUT);
+        &gflock::unlock (webpage_buildcol::TMPOUT);
 
     } else {

trunk/gsdl/cgi-bin/webpage_editcol.pl

@@ -27 +27 @@
 
 # This program is a webpage wrapper for saving an edited config file
+
+package webpage_editcol;
 
 use CGI;
@@ -70 +72 @@
     if (open(CFGOUT,">$cfg_filename"))
     {
-    if (&gflock::lock (CFGOUT)) {
+    if (&gflock::lock (webpage_editcol::CFGOUT)) {
         my $cfg_text = $args->{'bc1cfgfile'};
         print CFGOUT "$cfg_text";
-        &gflock::unlock (CFGOUT);
+        &gflock::unlock (webpage_editcol::CFGOUT);
         close(CFGOUT);
     }

trunk/gsdl/cgi-bin/webpage_mkcol.pl

@@ -27 +27 @@
 
 # This program is a webpage wrapper to the mkcol.pl process
+
+package webpage_mkcol;
 
 use CGI;
@@ -179 +181 @@
         if (open(CFGAPP,">>$cfg_filename"))
         {
-        if (&gflock::lock (CFGAPP)) {
+        if (&gflock::lock (webpage_mkcol::CFGAPP)) {
             print CFGAPP "\n";
 
@@ -190 +192 @@
             print CFGAPP "building\tcopydir\t\t$copy_dir\n";
             print CFGAPP "building\tingsdlarea\t$in_gsdl_area\n";
-            &gflock::unlock (CFGAPP);
+            &gflock::unlock (webpage_mkcol::CFGAPP);
             close(CFGAPP);
         }