Changeset 1175

Timestamp:

2000-05-19T16:54:39+12:00 (24 years ago)

Author:

sjboddie

Message:

finished off on tidying up end-user collection building

Location:

trunk/gsdl/cgi-bin

Files:

• webpage_buildcol.pl (modified) (6 diffs)
• webpage_buildstatus.pl (modified) (3 diffs)
• webpage_delcol.pl (modified) (2 diffs)
• webpage_mkcol.pl (modified) (4 diffs)

trunk/gsdl/cgi-bin/webpage_buildcol.pl

@@ -32 +32 @@
 #   an already running cgi program.
 
-#use Fcntl ':flock';
+use Fcntl ':flock';
 use File::Basename;
 use GSDLHOME;
@@ -61 +61 @@
     if (open(TMPOUT,">$full_tmpname"))
     {
-#   if (flock(TMPOUT,LOCK_EX))
-#   {
+    if (flock(TMPOUT,LOCK_EX))
+    {
         print TMPOUT $text;
         close(TMPOUT);
-#       flock(TMPOUT,LOCK_UN);
-#   }
-#   else
-#   {
+        flock(TMPOUT,LOCK_UN);
+    }
+    else
+    {
         # Problem locking file
-#       my $mess = "Unable to lock temporary communication file:";
-#       $mess .= " $full_tmpname";
-#       print STDERR "$mess\n";
-#       return;
-#   }
+        my $mess = "Unable to lock temporary communication file:";
+        $mess .= " $full_tmpname";
+        print STDERR "$mess\n";
+        return;
+    }
     }
     else
@@ -117 +117 @@
     if ($copy_dir =~ m/^yes$/i)
     {
-        my $download_cmd = "";
+        my $download_cmd = "perl " . &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "script");
         my $file_or_url  = $building_cfg_text->{'building'}->{'fileorurl'};
         
@@ -123 +123 @@
         {
         # run urlcopy.pl to download files
-        $download_cmd = "urlcopy.pl ";
+        $download_cmd = " urlcopy.pl ";
         my @urls = split("\n",$input_dir);
         my $u;
@@ -138 +138 @@
         $input_dir =~ s/^\s+//;
         $input_dir =~ s/\s+$//;
-        $download_cmd = "filecopy.pl $input_dir";
+        $download_cmd = " filecopy.pl $input_dir";
         }
         
@@ -332 +332 @@
     = &util::filename_cat($full_dirname,"etc","collect.cfg");
 
-    if (open(CFGIN,"<$cfg_filename"))
-    {
-#   if (flock(CFGIN,LOCK_EX))
-#   {
-        # do requested stages for building
-        my $result = do_build($full_dirname,$dirname,$args);
-        flock(CFGIN,LOCK_UN);
-        close(CFGIN);
-        return if ($result ne "success");
-#   }
-#   else
-#   {
-        # Problem locking file
-#       my $mess = "Unable to lock configuration file: $cfg_filename";
-#       print STDERR "$mess\n";
-#       return;
-#   }
-    }
-
-#    my $mess_url = "$args->{'httpbuild'}&bca=mess&bc1dirname=$dirname";
-#    print "Location: $mess_url&head=_headdone_&mess=_messdonebuildcol_\n\n";
-#    print "done\n"; # in tmp file
+    # do requested stages for building
+    my $result = do_build($full_dirname,$dirname,$args);
+    return if ($result ne "success");
+
+    my $mess_url = "$args->{'httpbuild'}&bca=mess&bc1dirname=$dirname";
+    print "Location: $mess_url&head=_headdone_&mess=_messdonebuildcol_\n\n";
+    print "done\n"; # in tmp file
 }
 

trunk/gsdl/cgi-bin/webpage_buildstatus.pl

@@ -31 +31 @@
 use CGI;
 use GSDLHOME;
-use Fcntl ':flock';
 
 require util;
@@ -86 +85 @@
     $bc1finished = 1 if ($mess eq "Done");
     $bc1finished = -1 if ($mess =~ m/^Error:/);
+    # escape backslashes so they don't vanish from printed filenames
+    $mess =~ s/\\/\\\\/g;
     &webpageutil::status_location($args,$mess,$tmpname,$bc1finished);
 
@@ -101 +102 @@
 
 &main();
-
-
-
-
-

trunk/gsdl/cgi-bin/webpage_delcol.pl

@@ -30 +30 @@
 use CGI;
 use GSDLHOME;
-use Fcntl ':flock';
 
 require util;
@@ -73 +72 @@
     &util::rm_r($col_dir);
 
-    # delete from collections.txt
-    my $collist_filename 
-        = &util::filename_cat($ENV{'GSDLHOME'},"etc","collections.txt");
-    if (open(CLIN,"<$collist_filename"))
-    {
-        if (flock(CLIN,LOCK_EX))
-        {
-        my @keep_dirnames = ();
-        while (defined($line=<CLIN>))
-        {
-            chop $line;
-            push(@keep_dirnames,$line) if ($line ne $dirname);
-        }
-        close(CLIN);
-
-        if (open(CLIN,">$collist_filename"))
-        {
-            print CLIN join("\n",@keep_dirnames), "\n";
-        }
-
-        flock(CLIN,LOCK_UN);
-        close(CLIN);
-        }
-        else
-        {
-        # problem locking file
-        my $mess = "Unable to lock collection list configuration";
-        $mess .= " file: $collist_filename";
-        &webpageutil::error_location($args,$mess);
-        return;
-        }
-    }
-    else
-    {
-        # problem opening file for reading in
-
-        my $mess = "Unable to open for input the collection list";
-        $mess .= " configuration file: $collist_filename";
-        &webpageutil::error_location($args,$mess);
-        return;
-    }
     }
     elsif ($delete_area eq "import")

trunk/gsdl/cgi-bin/webpage_mkcol.pl

@@ -30 +30 @@
 use CGI;
 use GSDLHOME;
-#use Fcntl ':flock';
+use Fcntl ':flock';
 
 require util;
@@ -179 +179 @@
         if (open(CFGAPP,">>$cfg_filename"))
         {
-#       if (flock(CFGAPP,LOCK_EX))
-#       {
+        if (flock(CFGAPP,LOCK_EX))
+        {
             print CFGAPP "\n";
 
@@ -191 +191 @@
             print CFGAPP "building\tcopydir\t\t$copy_dir\n";
             print CFGAPP "building\tingsdlarea\t$in_gsdl_area\n";
-#           flock(CFGAPP,LOCK_UN);
+            flock(CFGAPP,LOCK_UN);
             close(CFGAPP);
-#       }
-#       else
-#       {
+        }
+        else
+        {
             # problem locking file
-#           my $mess = "Unable to lock collection";
-#           $mess .= " configuration file: $cfg_filename";
-#           &webpageutil::error_location($args,$mess);
-#           close(CFGAPP);
-#           return;
-#       }
+            my $mess = "Unable to lock collection";
+            $mess .= " configuration file: $cfg_filename";
+            &webpageutil::error_location($args,$mess);
+            close(CFGAPP);
+            return;
+        }
         }
         else
@@ -212 +212 @@
         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