Changeset 1181 for trunk/gsdl/cgi-bin/webpage_buildcol.pl

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.

File:

• trunk/gsdl/cgi-bin/webpage_buildcol.pl (modified) (3 diffs)

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