Changeset 4233

Timestamp:

2003-05-07T15:50:13+12:00 (21 years ago)

Author:

jrm21

Message:

print out better error messages when one of the perl scripts goes wrong,
rather than the default "oops..." message which is very uninformative

File:

• trunk/gsdl/src/recpt/langaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/langaction.cpp

@@ -216 +216 @@
   }
 
+  // overwrite the global content (which should be overwritten by package)
+  // makes it obvious that package macros aren't defined, compared to "oops..."
+  disp.setmacro("content", "Global", "\\_translang:content\\_");
+
   // Make sure the source and target languages are different!
   if (sourcelang == targetlang) {
@@ -265 +269 @@
     //calls the translator file to create HTML files
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + sourcelang + " " + targetlang;
-    if ((gsdl_system(cmd, true, logout)) != 0) {
+    int ret=gsdl_system(cmd, true, logout);
+    if (ret != 0) {
+      ret = ret >> 8;
+      text_t errmsg="<H1>Error</H1>\nrunning translator.pl: ";
+      if (ret==1) errmsg += "GSDLHOME unset";
+      else if (ret==2) errmsg += "missing arguments";
+      else if (ret==3) errmsg += "translation not yet initialised";
+      else if (ret==4) errmsg += "no source macro found";
+      errmsg+= " (error " + text_t(ret) + ")\n";
+      disp.setmacro("content", "translang", errmsg);
       logout << "Process " << cmd << " did not execute.../;-D\n";
       return;
@@ -305 +318 @@
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
     logout << cmd << endl;
-    if(gsdl_system(cmd,true,logout) != 0)
+    int ret=gsdl_system(cmd,true,logout);
+    if (ret != 0) { // determine error
+      /*
+    // ret=-1 => we couldn't run the script.
+    // ret=1 => GSDLHOME not set.
+    // >=2 implies some file IO error:
+    // ret=2 => can't read etc/main.cfg
+    // ret=3 => "can't create directory $GSDLHOME/tmp/lang/
+    // ret=4 => can't write $dir/picklanguage.lang
+      **/
+      // maybe this should be a "real" macro for translation?!
+      text_t errmsg="<H1>Error</H1>\nPermissions problem: picklanguage.pl failed ";
+
+      ret = ret >> 8; // man perlfunc for the reason for this
+      if (ret==255) errmsg+="running script";
+      else if (ret==1) errmsg+="GSDLHOME not set";
+      else if (ret==2) errmsg+="reading etc/main.cfg";
+      else if (ret==3) errmsg+="creating tmp/lang/";
+      else if (ret==4) errmsg+="writing picklanguage.lang";
+      errmsg += " (error="; errmsg += text_t(ret); errmsg += ")";
+      disp.setmacro("content", "translang", errmsg);
+
       return;
+    }
     define_webpage(disp, sourcelang, targetlang, dir, page, -1, false, logout);
     return;
@@ -317 +352 @@
   // Check file opened OK
   if (!numpagesfile) {
-    logout << "Error: File " << numpagesfilepath << " could not be opened." << endl;
+    text_t errmsg="Error: File " + numpagesfilepath + " could not be opened.";
+    logout << errmsg << endl;
+    disp.setmacro("content", "translang", errmsg);
     return;
   }