Changeset 2774 for trunk/gsdl/src

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/src/recpt

Files:

• collectoraction.cpp (modified) (4 diffs)
• collectoraction.h (modified) (1 diff)

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;