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

Timestamp:

1999-12-13T16:58:37+13:00 (24 years ago)

Author:

davidb

Message:

General improvements

File:

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

trunk/gsdl/cgi-bin/webpage_buildcol.pl

@@ -122 +122 @@
     {
     my $mess = "Error: Unable to open log file '$log_filename'";
+    print LOGOUT "$mess\n";
     communicate_single_line($full_tmpname,$mess);
     return "failure";
@@ -169 +170 @@
         {
         my $mess = "Error: Unable to open pipe to command '$download_cmd'";
+        print LOGOUT "$mess\n";
         communicate_single_line($full_tmpname,$mess);
         close(LOGOUT);
@@ -179 +181 @@
         if ($line =~ m/^Error:/)
         {
+            print LOGOUT "$line";
             communicate_single_line($full_tmpname,"$line");
             close(DOWNLOADOUT);
@@ -197 +200 @@
     my $sym_dirname = &util::filename_cat($full_importname,$tail_dir);
     
-    &util::rm($sym_dirname) if (-e $sym_dirname);
+    &util::rm_r($sym_dirname) if (-e $sym_dirname);
 
     if (&util::soft_link($input_dir,$sym_dirname))
@@ -208 +211 @@
         my $mess = "Error: unable to make symbolic link to source:";
         $mess .= " $input_dir";
+        print LOGOUT "$mess\n";
         communicate_single_line($full_tmpname,$mess);
         close(LOGOUT);
@@ -222 +226 @@
     {
         my $mess = "Error: Unable to open pipe to command '$import_cmd'";
+        print LOGOUT "$mess\n";
         communicate_single_line($full_tmpname,$mess);
         close(LOGOUT);
@@ -232 +237 @@
         if ($line =~ m/^Error:/)
         {
+        print LOGOUT "$line";
         communicate_single_line($full_tmpname,"$line");
         close(IMPORTOUT);
@@ -245 +251 @@
     if ($do_build eq "true")
     {
+    my $full_archivename = &util::filename_cat($full_dirname,"archives");
+
     # Build operation
     my $build_cmd = "";
-    if ($do_import eq "true")
+    if (($do_import eq "true") 
+        || (($do_import eq "false") && (-e $full_archivename)))
     {
         $build_cmd = "buildcol.pl $dirname";
@@ -253 +262 @@
     else
     {
-        my $full_archivename = &util::filename_cat($full_dirname,"archives");
 
         $build_cmd = "buildcol.pl";
@@ -264 +272 @@
     {
         my $mess = "Error: Unable to open pipe to command '$build_cmd'";
+        print LOGOUT "$mess\n";
         communicate_single_line($full_tmpname,$mess);
         close(LOGOUT);
@@ -274 +283 @@
         if ($line =~ m/^Error:/)
         {
+        print LOGOUT "$line";
         communicate_single_line($full_tmpname,"$line");
         close(BUILDOUT);