Changeset 4232

Timestamp:

2003-05-07T15:49:26+12:00 (21 years ago)

Author:

jrm21

Message:

now return codes when an error occurs, so that the receptionist can tell!

Location:

trunk/gsdl/bin/script

Files:

• picklanguage.pl (modified) (4 diffs)
• translator.pl (modified) (7 diffs)

trunk/gsdl/bin/script/picklanguage.pl

@@ -32 +32 @@
 
 BEGIN {
-    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
+    if (!defined($ENV{'GSDLHOME'})) {
+    print STDERR "GSDLHOME not set\n";
+    return 1;
+    }
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
@@ -44 +47 @@
 {
     my $gsdldir = "$ENV{'GSDLHOME'}";
-
     # Read the languages available from etc/main.cfg
     my $maincfg_fname = util::filename_cat($gsdldir, "etc", "main.cfg");
-    open(MCFILE, "<$maincfg_fname") or die "Error: Could not open $maincfg_fname: $!\n";
+    if (!open(MCFILE, "<$maincfg_fname")) {
+    print STDERR "Error: Could not open $maincfg_fname: $!\n";
+    return 2;
+    }
 
     my @languages;
@@ -63 +68 @@
 
     # Write the HTML content of the page to tmp/lang/picklanguage.lang
-    my $picklang_fname = util::filename_cat($gsdldir, "tmp", "lang", "picklanguage.lang");
+    my $dir = util::filename_cat($gsdldir, "tmp", "lang");
+    # creates directory if it doesn't already exist
+    my $currentmask = umask;
+    umask(0000);
+    if (!-e $dir) {
+    if (! mkdir($dir, 0777)) {
+        print STDERR "Couldn't create directory $dir\n";
+        return 3;
+    }
+    }
+    my $picklang_fname = util::filename_cat($dir, "picklanguage.lang");
 
     # Make the file world writeable
-    my $currentmask = umask;
-    umask(0000);
     if (! open(HTMLFILE,">$picklang_fname")) {
     umask($currentmask);
-    die "Error: Could not create $picklang_fname: $!\n";
+    print STDERR "Error: Could not create $picklang_fname: $!\n";
+    return 4;
     }
     umask($currentmask);
@@ -99 +113 @@
             "<center><img src=\"_httpimg_/divb.gif\"></center><p>");
     close HTMLFILE;
+    return 0;
 }
 
 
-&main();
+exit &main();

trunk/gsdl/bin/script/translator.pl

@@ -29 +29 @@
 
 BEGIN {
-    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
+    if (!defined $ENV{'GSDLHOME'}) {
+    print STDERR "GSDLHOME not set\n";
+    return 1;
+    }
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
@@ -55 +58 @@
     # Check that both arguments were supplied
     if (!$sourcelang) {
-    die "Error: You didn't supply the name of the source language!\n";
+    print STDERR "Error: You didn't supply the name of the source language!\n";
+    return 2;
     }
     if (!$targetlang) {
-    die "Error: You didn't supply the name of the target language!\n";
+    print STDERR "Error: You didn't supply the name of the target language!\n";
+    return 2;
     }
 
@@ -73 +78 @@
     if (! -e $translationdir) {
     print STDERR "Error: Translation has not been initialised (exiting).\n";
-    return;
+    return 3;
     }
 
@@ -84 +89 @@
     # Make sure some macros exist to be translated
     if (!$sourcehash1 && !$sourcehash2) {
-    die "Error: No source macro information exists.\n";
+    print STDERR "Error: No source macro information exists.\n";
+    return 4;
     }
 
@@ -372 +378 @@
     # Write the number of pages to a file for use by the receptionist
     my $numpagesfile = util::filename_cat($translationdir, "numpages.log");
-    open NUMPAGESLOG, ">$numpagesfile" or die "Error: Could not write $numpagesfile.\n";
+    if (!open NUMPAGESLOG, ">$numpagesfile") {
+    print STDERR "Error: Could not write $numpagesfile.\n";
+    return 5;
+    }
     print NUMPAGESLOG ($pageno - 1);
     close NUMPAGESLOG;
@@ -378 +387 @@
     # Write thankyou page for language translator once translation is complete
     my $thankyoufile = util::filename_cat($translationdir, "thankyou.lang");
-    open THANKYOU, ">$thankyoufile" or die "Error: Could not write $thankyoufile.\n";
+    if (!open THANKYOU, ">$thankyoufile") {
+    print STDERR "Error: Could not write $thankyoufile.\n";
+    return 6;
+    }
     print THANKYOU ("<center> _textthanks_ $targetlang _texttrans_ ",
             "<br> _textviewtranslation_ ",
@@ -614 +626 @@
 }
 
-
-&main(@ARGV);
+exit &main(@ARGV);