Changeset 2774 for trunk/gsdl

Timestamp:

2001-10-02T22:36:37+12:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up the collector's error handling. Hopefully the situation where the
status page loops continuously after an error will now be rare (it can
still happen if perl or one of the third party converters hangs though)

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (2 diffs)
• macros/collect.dm (modified) (2 diffs)
• src/recpt/collectoraction.cpp (modified) (4 diffs)
• src/recpt/collectoraction.h (modified) (1 diff)

trunk/gsdl/bin/script/build

@@ -464 +464 @@
 }
 
-# creates a file called $outfile.final (should only be called if -out option
-# is used and isn't STDERR or STDOUT) and writes an output code to it.
+# creates a file called $outfile.final and writes an output code to it.
 # An output code of 0 specifies that there was no error
 sub final_out {
     my ($exit_code) = @_;
 
-    if (open (FINAL, ">$outfile.final")) {
-    print FINAL $exit_code;
-    close FINAL;
+    if ($use_out && (!-e "$outfile.final")) {
+
+    if (open (FINAL, ">$outfile.final")) {
+        print FINAL $exit_code;
+        close FINAL;
+    }
     }
 }
@@ -578 +580 @@
     }
 
+    # this will produce a .final file if one doesn't exist yet - that
+    # should only happen if there's been an error somewhere in the perl
+    # code
+    &final_out(7);
+
     sub recursive_chmod {
     my ($dir) = @_;

trunk/gsdl/macros/collect.dm

@@ -904 +904 @@
 <table width=_pagewidth_>
 <tr><td>
-<p>An error has occurred while attempting to build your collection.
-<br> The build log contains the following:
-<p>_faillog_
-
+_textfailmsg_
+</td></tr>
+</table></center>
+}
+
+# _textfailmsg_ will be set to one of the following macros from within
+# the server
+
+_textfailmsg1_ {
+The collection could not be built as it contains no data. Make sure that at
+least one of the directories or files you specified on the <i>source
+data</i> page exists and is of a type or (in the case of a directory)
+contains files of a type, that Greenstone can process.
 <p><center>
 _collectorbar_
 </center>
-
-</td></tr>
-</table></center>
-}
-
+}
+
+_textfailmsg6_ {_textfailmsg1_}
+
+_textfailmsg2_ {
+The collection could not be built (import.pl failed).
+<p>the build log contains the following information:
+<p>_faillog_
+<p>Please <a href="_httppagecollector_" target=_top>restart the collector</a> and try
+again.
+}
+
+_textfailmsg3_ {
+The collection could not be built (buildcol.pl failed).
+<p>the build log contains the following information:
+<p>_faillog_
+<p>Please <a href="_httppagecollector_" target=_top>restart the collector</a> and try
+again.
+}
+
+_textfailmsg4_ {
+The collection was built successfully but could not be installed.
+<p>the build log contains the following information:
+<p>_faillog_
+}
+
+_textfailmsg5_ {_textfailmsg4_}
+
+_textfailmsg7_ {
+An unexpected error occurred while attepting to build your collection
+<p>Please <a href="_httppagecollector_" target=_top>restart the collector</a> and try
+again.
+}
 
 #######################################################################
@@ -1051 +1088 @@
 }
 
-_installfailcontent_ {
-_messagehead_
-<p>
-
-The collector failed to install your new collection correctly. 
-Possible causes are:
-<ul>
-<li> Greenstone does not have permission to write to the _gsdlhome_/collect
-     directory.
-<li> A _cgiargbc1dirname_ collection already exists in the _gsdlhome_/collect
-     directory.
-</ul>
-_messagefoot_
-}
-
 _exptsuccesscontent_ {
 _messagehead_

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -457 +457 @@
       ifstream fbld_in (fbldc);
       if (fbld_in) {
-    char c = fbld_in.get();
+    failcode = fbld_in.get();
     fbld_in.close();
-    if (c == '0') {
+    if (failcode == '0') {
       // success - we need to create and configure a collection server for the
       // newly built collection (for fastcgi and local library where
@@ -467 +467 @@
       current_page = "bilddone";
     }
-    else if (c == '4' || c == '5') message = "installfail";
     else current_page = "bildfail";
       } else {
@@ -1027 +1026 @@
   // _statusline_ -- if displaying the bildstatus page
   // _header_ -- may be set for pages that require it
+  // _textfailmsg_ -- set to different messages depending on failcode returned
+  //                  by build script (if build fails)
   // _faillog_ - set to last 6 lines of .bld file if build failed
   // _gsdlhome_ - the gsdlhome path (dm_safe)
@@ -1155 +1156 @@
 
   if (collector_page == "bildfail") {
+
+    text_t textfailmsg = "_textfailmsg";
+    textfailmsg.push_back(failcode);
+    textfailmsg.push_back('_');
+    disp.setmacro("textfailmsg", "collector", textfailmsg);
+
     text_t bldlog = filename_cat(gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld");
     text_t rawlog = file_tail (bldlog, 6, 0);

trunk/gsdl/src/recpt/collectoraction.h

@@ -42 +42 @@
 
   text_t message;
+  char failcode;
 
   bool do_mkcol;