Changeset 1279 for branches/New_Config_Format-branch/gsdl/cgi-bin/webpage_delcol.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_delcol.pl (modified) (4 diffs)

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

@@ -1 @@
-#!/usr/local/bin/perl5 -w
+#!perl -w
 
 ###########################################################################
@@ -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")
@@ -140 +98 @@
     my $mess_url = "$args->{'httpbuild'}&bca=mess";
     $mess_url .= "&bc1dirname=$dirname" if ($delete_area ne "all");
-    print "Content: text/html\n\n $mess_url&head=_headdone_&mess=_messdonedelcol_\n\n";
+    print "Location: $mess_url&head=_headdone_&mess=_messdonedelcol_\n\n";
     return;