Changeset 1181

Timestamp:

2000-05-23T00:26:44+12:00 (24 years ago)

Author:

sjboddie

Message:

got end-user collection building to work (almost) on windows 95.
there's still a problem with the gsdl_system routine, at least when
using the apache webserver. I can't get the server to carry on with
running library.exe (and displaying building update pages) as it waits
until the spawned building process finishes first. It works on NT.

Location:

trunk/gsdl

Files:

• cgi-bin/webpage_buildcol.pl (modified) (3 diffs)
• cgi-bin/webpage_editcol.pl (modified) (2 diffs)
• cgi-bin/webpage_mkcol.pl (modified) (3 diffs)
• perllib/gflock.pm (added)

trunk/gsdl/cgi-bin/webpage_buildcol.pl

@@ -32 +32 @@
 #   an already running cgi program.
 
-use Fcntl ':flock';
 use File::Basename;
 use GSDLHOME;
+use gflock;
 
 my $args;
@@ -61 +61 @@
     if (open(TMPOUT,">$full_tmpname"))
     {
-    if (flock(TMPOUT,LOCK_EX))
-    {
+    if (&gflock::lock (TMPOUT)) {
         print TMPOUT $text;
         close(TMPOUT);
-        flock(TMPOUT,LOCK_UN);
-    }
-    else
-    {
+        &gflock::unlock (TMPOUT);
+
+    } else {
         # Problem locking file
         my $mess = "Unable to lock temporary communication file:";
@@ -171 +169 @@
     }
 
-    if ($copy_dir =~ /^no$/i)
+    if ((defined $copy_dir) && ($copy_dir =~ /^no$/i))
     {
     # link it

trunk/gsdl/cgi-bin/webpage_editcol.pl

@@ -30 +30 @@
 use CGI;
 use GSDLHOME;
-use Fcntl ':flock';
+use gflock;
 
 require util;
@@ -70 +70 @@
     if (open(CFGOUT,">$cfg_filename"))
     {
-    if (flock(CFGOUT,LOCK_EX))
-    {
+    if (&gflock::lock (CFGOUT)) {
         my $cfg_text = $args->{'bc1cfgfile'};
         print CFGOUT "$cfg_text";
-        flock(CFGOUT,LOCK_UN);
+        &gflock::unlock (CFGOUT);
         close(CFGOUT);
     }

trunk/gsdl/cgi-bin/webpage_mkcol.pl

@@ -30 +30 @@
 use CGI;
 use GSDLHOME;
-use Fcntl ':flock';
+use gflock;
 
 require util;
@@ -179 +179 @@
         if (open(CFGAPP,">>$cfg_filename"))
         {
-        if (flock(CFGAPP,LOCK_EX))
-        {
+        if (&gflock::lock (CFGAPP)) {
             print CFGAPP "\n";
 
@@ -191 +190 @@
             print CFGAPP "building\tcopydir\t\t$copy_dir\n";
             print CFGAPP "building\tingsdlarea\t$in_gsdl_area\n";
-            flock(CFGAPP,LOCK_UN);
+            &gflock::unlock (CFGAPP);
             close(CFGAPP);
         }