Changeset 8102

Timestamp:

2004-09-08T13:34:23+12:00 (20 years ago)

Author:

mdewsnip

Message:

Unfinished, but I'm committing it now so I don't lose it.

Location:

trunk/gsdl

Files:

• perllib/translator.pm (modified) (16 diffs)
• src/recpt/langaction.cpp (modified) (9 diffs)
• src/recpt/langaction.h (modified) (2 diffs)

trunk/gsdl/perllib/translator.pm

@@ -55 +55 @@
 sub read_languages_from_main_cfg_file
 {
-    local %name2abbrhash = ();
+    local %code2namehash = ();
 
     # Read the main.cfg file
@@ -68 +68 @@
     # Parse the lines containing a language definition
     if ($line =~ m/^Language\s+/i) {
-        local @lineparts = split(/\s+/, $line);
-        local ($langabbr) = ($lineparts[1] =~ m/^shortname=(.*)$/);
-        local ($langname) = ($lineparts[2] =~ m/^longname=(.*)$/);
-
-        # Casefold language name and code
-        $langabbr =~ tr/A-Z/a-z/;
-        $langname =~ tr/A-Z/a-z/;
-
-        $name2abbrhash{$langname} = $langabbr;
+        local ($langcode) = ($line =~ /shortname=(\S+)/i);
+        local ($langname) = ($line =~ /longname=(\"[^\"]+\"|\S+)/i);
+
+        # Casefold the language code, and remove any quotes around the language name
+        $langcode =~ tr/A-Z/a-z/;
+        $langname =~ s/^\"(.+)\"$/$1/;
+
+        $code2namehash{$langcode} = $langname;
     }
     }
     close(MAIN_CFG_FILE);
 
-    return %name2abbrhash;
+    return %code2namehash;
 }
 
@@ -100 +99 @@
     # Check if a file is being defined
     if ($line =~ m/^File\s+/i) {
-        local @lineparts = split(/\s+/, $line);
-        local ($fileid) = ($lineparts[1] =~ m/^id=(.*)$/i);
-        local ($filedesc) = ($lineparts[2] =~ m/^description=(.*)$/i);
+        local ($fileid) = ($line =~ /id=(\S+)/i);
+        local ($filedesc) = ($line =~ /description=(\S+)/i);
         $name2deschash{$fileid} = $filedesc;
     }
@@ -114 +112 @@
 sub read_file_data_from_config_file
 {
-    my ($sourcelang, $sourceabbr, $targetlang, $targetabbr, $file) = @_;
+    my ($sourceabbr, $targetabbr, $file) = @_;
 
     # Read the translator config file
@@ -137 +135 @@
         local ($filetype) = ($lineparts[5] =~ m/^type=(.*)$/);
 
-        # Resolve instances of {sourcelang}, {sourceabbr}, {targetlang}, {targetabbr}
-        $sourcefile =~ s/\{sourcelang\}/$sourcelang/g;
+        # Determine sourcebase and targetbase, using the filetype
+        local $sourcebase = &get_file_base($sourceabbr, $filetype);
+        local $targetbase = &get_file_base($targetabbr, $filetype);
+
+        # Resolve instances of {sourceabbr}, {sourcebase}, {targetabbr}, {targetbase}
         $sourcefile =~ s/\{sourceabbr\}/$sourceabbr/g;
-        $targetfile =~ s/\{targetlang\}/$targetlang/g;
+        $sourcefile =~ s/\{sourcebase\}/$sourcebase/g;
         $targetfile =~ s/\{targetabbr\}/$targetabbr/g;
+        $targetfile =~ s/\{targetbase\}/$targetbase/g;
 
         close(CONFIG_FILE);
@@ -164 +166 @@
 
 
+sub get_file_base
+{
+    my ($langabbr, $filetype) = @_;
+
+    if ($filetype =~ /^macrofile/) {
+    return &get_macrofile_base($langabbr);
+    }
+    if ($filetype =~ /^resourcebundle/ || $filetype =~ /^myresourcebundle/) {
+    return &get_resource_bundle_base($langabbr);
+    }
+
+    print STDERR "Error: Unknown file type $filetype.\n";
+    die "\n";
+}
+
+
 sub process_file
 {
@@ -185 +203 @@
     if ($filetype =~ /^resourcebundle/) {
     return &build_key_to_line_mapping_for_resource_bundle($filepath);
+    }
+    if ($filetype =~ /^myresourcebundle/) {
+    return &build_key_to_line_mapping_for_my_resource_bundle($filepath);
     }
 
@@ -232 +253 @@
     if ($filetype =~ /^resourcebundle/) {
     return &import_chunk_from_resource_bundle($chunktext);
+    }
+    if ($filetype =~ /^myresourcebundle/) {
+    return &import_chunk_from_my_resource_bundle($chunktext);
     }
 
@@ -323 +347 @@
 # ==========================================================================================
 
+sub get_macrofile_base
+{
+    local ($langcode) = @_;
+
+    # List special cases here (macrofile names differ from language longnames)
+    local %specialcases = ('id', 'indo',
+               'pt-br', 'port-br',
+               'pt-pt', 'port-pt',
+               'zh', 'chinese' );
+
+    # Special cases override main.cfg entries
+    if ($specialcases{$langcode}) {
+    return $specialcases{$langcode};
+    }
+
+    # Use the language name defined in the main.cfg file as the macrofile name
+    my %langhash = &read_languages_from_main_cfg_file();
+    my $langname = $langhash{$langcode} || die "Error: Language to base mapping undefined!\n";
+    $langname =~ tr/A-Z/a-z/;
+    return $langname;
+}
+
+
 sub build_key_to_line_mapping_for_macrofile
 {
@@ -355 +402 @@
         # While there is still text of the macro to go...
         local $startline = $i;
-        while ($line !~ /.*\}/) {
+        while ($line !~ /\}$/) {
         $i++;
         $line = $lines[$i];
+        $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
         }
 
@@ -373 +421 @@
         local $startline = $i;
         unless ($line =~ m/^\#\# .*\#\#/) {
-        $line = $lines[++$i];
+        $i++;
+        $line = $lines[$i];
         $macroname .= $line;
         }
@@ -383 +432 @@
 
         # Read the rest of the text associated with the image macro
-        while ($line !~ /^\s*$/) {
+        while (defined($line) && $line !~ /^\s*$/) {
         $i++;
         $line = $lines[$i];
@@ -404 +453 @@
 
     # Is this an icon macro??
-    if ($chunktext =~ m/^\#\# (.*)/) {
+    if ($chunktext =~ /^\#\# (.*)/) {
     # Extract image macro text
-    $chunktext =~ s/^\#\# ((.|\n)+) \#\# (.+) \#\# (.|\n)+/$1/;
+    $chunktext =~ /^\#\#\s+([^\#]+)\s+\#\#/;
+    $chunktext = $1;
 
     # Remove enclosing quotes
-    $chunktext =~ s/^\s*\"((.|\n)+)\"\s*/$1/;
+    $chunktext =~ s/^\"//;
+    $chunktext =~ s/\"$//;
     }
 
@@ -430 +481 @@
 # ------------------------------------------------------------------------------------------
 
+sub get_resource_bundle_base
+{
+    local ($langabbr) = @_;
+
+    return "";
+}
+
+
 sub build_key_to_line_mapping_for_resource_bundle
 {
@@ -451 +510 @@
 
     # Line contains a dictionary string
-    if ($line =~ m/^((\w|\.)+):/) {
+    if ($line =~ /^((\w|\.)+):(.*)$/) {
         local $key = $1;
 
@@ -474 +533 @@
 
 
+
+# ------------------------------------------------------------------------------------------
+
+sub build_key_to_line_mapping_for_my_resource_bundle
+{
+    local ($filepath) = @_;
+
+    # Open file for reading
+    if (!open(FILE_IN, "<$filepath")) {
+    print STDERR "Error: Could not open resource bundle $filepath.\n";
+    die "\n";
+    }
+    local @lines = <FILE_IN>;
+    close FILE_IN;
+
+    # Initialise some local variables
+    local %linehash = ();
+
+    # Process the contents of the file, line by line
+    for ($i = 0; $i < scalar(@lines); $i++) {
+    local $line = $lines[$i];
+    $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
+
+    # Line contains a dictionary string
+    if ($line =~ /^((\w|\.|\-)+):\"(.*)$/) {
+        local $key = $1;
+        local $text = $3;
+
+        # While there is still text of the chunk to go...
+        local $startline = $i;
+        while ($text !~ /\"$/ || $text =~ /\\\"$/) {
+        $i++;
+        $text = $lines[$i];
+        }
+
+        $linehash{$key} = $startline . "-" . $i;
+    }
+    }
+
+    return %linehash;
+}
+
+
+sub import_chunk_from_my_resource_bundle
+{
+    local ($chunktext) = @_;
+
+    # Remove chunk key and quotes
+    $chunktext =~ s/^((\w|\.|\-)+)://;
+    $chunktext =~ s/^\"//;
+    $chunktext =~ s/\"$//;
+
+    return $chunktext;
+}
+
+
 1;

trunk/gsdl/src/recpt/langaction.cpp

@@ -48 +48 @@
 
 
-/*========================*
- * LOCAL UTILITY ROUTINES *
- *========================*/
-
-bool text_t_substring (text_t &text, text_t &substr)
-{
-  int SIZE = substr.size();
-
-  if (text.size() >= SIZE) {
-    if (substr <= text) {
-      if (text[0] == substr[0]) {
-    text_t temp = "";
-    // copy first SIZE elements of 'text' into 'temp'
-    for (int size = 0; size < SIZE; size++) {
-      temp.push_back(text[size]);
-    }
-    if (temp == substr)
-      return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-
 /*====================*
  * CLASS DEFINITIONS  *
  *====================*/
 
-langaction::langaction () {
-
+langaction::langaction()
+{
   package = "";
 
@@ -92 +66 @@
   argsinfo.addarginfo (&cerr, arg_ainfo);
 
-  arg_ainfo.shortname = "bl";
-  arg_ainfo.longname = "base language";
+  arg_ainfo.shortname = "slng";
+  arg_ainfo.longname = "translation source language";
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "english";
+  arg_ainfo.argdefault = "en";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (&cerr, arg_ainfo);
 
   arg_ainfo.shortname = "tlng";
-  arg_ainfo.longname = "translation language";
+  arg_ainfo.longname = "translation target language";
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "french";
+  arg_ainfo.argdefault = "fr";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (&cerr, arg_ainfo);
@@ -110 +84 @@
 
 
+
 langaction::~langaction () {
   // Nothing to do in destructor
 }
+
 
 
@@ -163 +139 @@
 
 
+
 bool langaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args,
                 recptprotolistclass* /*protos*/, ostream &logout)
 {
   // Authenticate the user before allowing modifications
-  args["uan"] = 1;
-  args["ug"] = "langadmin";
+  // args["uan"] = 1;
+  // args["ug"] = "langadmin";
   return true;
 }
+
 
 
@@ -182 +160 @@
 
 
+
 void langaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout)
 {
-  text_t text = "";
-  text_t cmd = "";
-  text_t dir = filename_cat(gsdlhome, "tmp", "lang");
-  text_t page = "";
-  text_t sourcelang = "";
-  text_t targetlang = "";
-
-  // Get the source language from the CGI arguments
-  if (args["bl"] != "") {
-    sourcelang = args["bl"];
-  }
-
-  // Get the target language from the CGI arguments
-  if (args["ownchoice"] != "") {
-    targetlang = args["ownchoice"];
-  }
-  else if (args["language"] != "") {
-    targetlang = args["language"];
-  }
-  else if (args["tlng"] != "") {
-    targetlang = args["tlng"];
-  }
-
-  // Case fold both languages
-  for (int i = 0; i < strlen(sourcelang.getcstr()); i++) {
-    sourcelang[i] = tolower(sourcelang[i]);
-  }
-  for (int i = 0; i < strlen(targetlang.getcstr()); i++) {
-    targetlang[i] = tolower(targetlang[i]);
-  }
+  text_t scriptdir = filename_cat(gsdlhome, "bin", "script", "translator");
+  text_t translatordir = filename_cat(gsdlhome, "translator");
+
+  text_t page = args["p"];
+  logout << endl << "Page arg: " << page << endl;
+  args["p"] = "translang";
+
+  if (page == "translang") {
+    // Run the inittranslator.pl script to generate the translation agency start page
+    text_t cmd = "perl " + filename_cat(scriptdir, "inittranslator.pl");
+    if (gsdl_system(cmd, true, logout) != 0) {
+      logout << "Error: Command " << cmd << " did not execute.\n";
+      return;
+    }
+
+    define_webpage(disp, translatordir, "picklanguage", false, logout);
+    return;
+  }
+
+  // Get the source and target languages, and file to translate, from the CGI arguments
+  text_t sourceabbr = args["slng"];
+  text_t targetabbr = args["tlng"];
+  text_t transfile = args["file"];
+
+  // Case fold both language codes, just in case
+  for (int i = 0; i < strlen(sourceabbr.getcstr()); i++) {
+    sourceabbr[i] = tolower(sourceabbr[i]);
+  }
+  for (int i = 0; i < strlen(targetabbr.getcstr()); i++) {
+    targetabbr[i] = tolower(targetabbr[i]);
+  }
+
+  logout << "Source abbr: " << sourceabbr << " Target abbr: " << targetabbr << endl;
+  logout << "Trans file: " << transfile << endl;
 
   // overwrite the global content (which should be overwritten by package)
@@ -220 +203 @@
   disp.setmacro("content", displayclass::defaultpackage, "\\_translang:content\\_");
 
-  // Make sure the source and target languages are different!
-  if (sourcelang == targetlang) {
+  // Make sure the source and target languages are different
+  if (sourceabbr == targetabbr) {
     logout << "Same language!" << endl;
-    args["p"] = "translang";
-    page = "picklanguage";
-    define_webpage(disp, sourcelang, targetlang, dir, page, -1, true, logout);
+    define_webpage(disp, translatordir, "picklanguage", true, logout);
     return;
   }
 
-  // logout << "Source lang: " << sourcelang << " Target lang: " << targetlang << endl;
-  text_t translation = sourcelang + "-" + targetlang;
-  logout << "Translation: " << translation << endl;
-  text_t trans_dir = filename_cat(dir, translation);
-
-  // argument for page is of the form 'macrofile_pageno' so
-  // we need to split the argument to get the proper page content
-  text_t &arg_p = args["p"];
+  text_t translation = sourceabbr + "-" + targetabbr;
+  text_t translationdir = filename_cat(translatordir, translation, transfile);
+  logout << "Translation dir: " << translationdir << endl;
+
+  if (page == "translang_picklanguage") {
+    // Run the inittranslation.pl script to make sure everything is ready
+    text_t cmd = "perl " + filename_cat(scriptdir, "inittranslation.pl") +
+      " " + sourceabbr + " " + targetabbr + " " + transfile;
+    if (gsdl_system(cmd, true, logout) != 0) {
+      logout << "Error: Command " << cmd << " did not execute...\n";
+      return;
+    }
+
+    // Run the writetranslationmedium.pl script to generate the HTML pages
+    cmd = "perl " + filename_cat(scriptdir, "writetranslationmedium.pl") +
+      " " + sourceabbr + " " + targetabbr + " " + transfile + " " + "html";
+    if (gsdl_system(cmd, true, logout) != 0) {
+      logout << "Error: Command " << cmd << " did not execute...\n";
+      return;
+    }
+
+    // Send an email notification to the site maintainer
+    text_t mailfilepath = filename_cat(translationdir, "email.txt");
+    char *mailfilenamec = mailfilepath.getcstr();
+    ofstream mailfile (mailfilenamec);
+    if (!mailfile) {
+      logout << "Error: Couldn't write file " << mailfilepath << "." << endl;
+      return;
+    }
+
+    mailfile << "[Translator Event]\n"
+         << "Date: " << get_date (true) << "\n"
+         << "Greenstone Username: " << args["un"] << "\n"
+         << "The " << targetabbr << " language translation was entered.\n";
+    mailfile.close();
+
+    const recptconf &rcinfo = recpt->get_configinfo();
+
+    // Use sendmail.pl perl script to send an email notification
+    text_t sendmail_cmd = "perl -S sendmail.pl";
+    sendmail_cmd += " -to \"" + rcinfo.maintainer + "\"";
+    sendmail_cmd += " -from \"[email protected]\"";
+    sendmail_cmd += " -smtp \"" + rcinfo.MailServer + "\"";
+    sendmail_cmd += " -subject \"Greenstone Translator Event\"";
+    sendmail_cmd += " -msgfile \"" + mailfilepath + "\"";
+
+    // if (gsdl_system(sendmail_cmd, true, logout) != 0) {
+    // logout << "Error: Command " << sendmail_cmd << " did not execute...\n";
+    // return;
+    // }
+
+    // Finished with the temporary file
+    unlink(mailfilenamec);
+    delete mailfilenamec;
+
+    define_webpage(disp, translationdir, "1", false, logout);
+    return;
+  }
+
+  // One of the translation pages
   text_tarray splitarray;
-  splitchar(arg_p.begin(), arg_p.end(), '_', splitarray);
-
-  arg_p = splitarray[0];
-  if (splitarray.size() > 1)
-    page = splitarray[splitarray.size()-1];
-
-  //if are entering page from macro search
-  if (args["macroname"] != "") {
-    text_t macroname = args["macroname"];
-
-    // !! TO DO !!
-    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "fromsearch.pl") + " " + sourcelang + " " + targetlang + " " + macroname;
-    logout << "COMMAND: " << cmd <<endl;
-
-    if ((gsdl_system(cmd, true, logout)) != 0) {
-      logout << "Process " << cmd << " did not execute.../;-D\n";
-      return;
-    }
-
-    define_webpage(disp, sourcelang, targetlang, trans_dir, page, -1, false, logout);
+  splitchar(page.begin(), page.end(), '_', splitarray);
+  text_t subpage = splitarray[0];
+  if (splitarray.size() > 1) {
+    subpage = splitarray[splitarray.size() - 1];
+  }
+  logout << "Subpage: " << subpage << endl;
+
+  // Check if the "NEXT" button has been pressed
+  if (args[subpage] == "NEXT") {    // !! This is BAD !!
+    // Write the submitted translations to a temporary file
+    text_t submissionfilepath = filename_cat(translationdir, "submission.tmp");
+    ofstream submissionfile(submissionfilepath.getcstr(), ios::out);
+    if (!submissionfile) {
+      logout << "Error: File " << submissionfilepath << " could not be created." << endl;
+      return;
+    }
+
+    // Write out the cgiargsclass variable to the submission file
+    submissionfile << args;
+    submissionfile.close();
+
+    // Make the file world writable
+    gsdl_system("chmod a+w " + submissionfilepath, false, logout);
+
+    // Run the submittranslation.pl script to record the translations
+    text_t cmd = "perl " + filename_cat(scriptdir, "submittranslations.pl") +
+      " " + sourceabbr + " " + targetabbr + " " + transfile + " " + "html";
+    if (gsdl_system(cmd, true, logout) != 0) {
+      logout << "Error: Command " << cmd << " did not execute...\n";
+      return;
+    }
+
+    // Move onto the next page
+    subpage = atoi(subpage.getcstr()) + 1;
+  }
+
+  define_webpage(disp, translationdir, subpage, false, logout);
+}
+
+
+
+void langaction::define_webpage (displayclass &disp, text_t dir, text_t page, bool error,
+                 ostream &logout)
+{
+  // Open the file to read the webpage from
+  text_t webpagefilename = filename_cat(dir, page + ".trans");
+  ifstream webpagefile(webpagefilename.getcstr(), ios::in);
+  if (!webpagefile) {
+    logout << "Error: File " << webpagefilename << " could not be found.\n";
     return;
   }
 
-  if (page == "fromsearch")
-    page = "thankyou";
-
-  if (page == "picklanguage") {
-    page = "1";
-
-    //calls the translator file to create HTML files
-    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + sourcelang + " " + targetlang;
-    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;
-    }
-
-    const recptconf &rcinfo = recpt->get_configinfo();
-
-    // Use sendmail.pl perl script to send email events
-    text_t tmpmailfile = filename_cat (gsdlhome, "tmp", "lang", "email.txt");
-    char *tmpmailfilec = tmpmailfile.getcstr();
-    ofstream tmpfile (tmpmailfilec);
-    if (tmpfile) {
-      tmpfile << "[Translator Event]\n"
-          << "Date: " << get_date (true) << "\n"
-          << "Greenstone Username: " << args["un"] << "\n";
-      tmpfile << "The " << targetlang << " language translation was entered.\n";
-      tmpfile.close();
-
-      text_t sendmail_cmd = "perl -S sendmail.pl";
-      sendmail_cmd += " -to \"" + rcinfo.maintainer + "\"";
-      sendmail_cmd += " -from \"[email protected]\"";
-      sendmail_cmd += " -smtp \"" + rcinfo.MailServer + "\"";
-      sendmail_cmd += " -subject \"Greenstone Translator Event\"";
-      sendmail_cmd += " -msgfile \"" + tmpmailfile + "\"";
-      // logout << "Sendmail command: " << sendmail_cmd << endl;
-      gsdl_system (sendmail_cmd, true, logout);
-      unlink(tmpmailfilec);
-    }
-    else {
-      logout << "translatoraction:: ERROR: Couldn't open "
-         << "temporary event log file " << tmpmailfile << " for email event.\n";
-    }
-    delete tmpmailfilec;
-  }
-
-  //generates the picklanguage page
-  if (page.empty()) {
-    page = "picklanguage";
-    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
-    logout << cmd << endl;
-    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;
-  }
-
-  // Read the number of translation pages from numpages.log
-  text_t numpagesfilepath = filename_cat(trans_dir, "numpages.log");
-  ifstream numpagesfile(numpagesfilepath.getcstr(), ios::in);
-
-  // Check file opened OK
-  if (!numpagesfile) {
-    text_t errmsg="Error: File " + numpagesfilepath + " could not be opened.";
-    logout << errmsg << endl;
-    disp.setmacro("content", "translang", errmsg);
-    return;
-  }
-
-  // Read the number of pages from the file
-  int numpages;
-  char line[LINESIZE];
-  if (numpagesfile.getline(line, LINESIZE-1)) {
-    numpages = atoi(line);
-  }
-  numpagesfile.close();
-
-  // if (pagenos.empty() && pageno == "")
-  if (numpages == 0)
-    page = "thankyou";
-
-  text_t &submitargs = args[page];
-  text_t submit = "SUBMIT TRANSLATION";
-
-  //if the SUBMIT TRANSLATION >> button has been pushed
-  if (text_t_substring(submitargs,submit)) {
-    //creates output stream to argsfile
-    text_t argsfile = filename_cat(trans_dir, "arguments.arg");
-    logout << "Argsfile: " << argsfile << endl;
-    write_args_file(args, argsfile, logout);
-
-    //create the command line for submitting the translation
-    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "submit_translation.pl") + " ";
-    cmd += (sourcelang + " " + targetlang + " " + "arguments.arg");
-
-    //give command to system to execute submission of translation
-    if((gsdl_system(cmd, true, logout)) != 0)
-      logout << "Process " << cmd << " did not execute\n";
-
-    //increments which page is displayed when translation is submitted
-    int pageno = atoi(page.getcstr());
-    if (pageno >= numpages)
-      page = "thankyou";
-    else
-      page = (pageno + 1);
-  }
-
-  define_webpage(disp, sourcelang, targetlang, trans_dir, page, numpages, false, logout);
-}
-
-
-void langaction::write_args_file (cgiargsclass &args, text_t argsfile, ostream &logout)
-{
-  ofstream argsout(argsfile.getcstr(), ios::out);
-
-  // Informs user and returns if output stream not opened
-  if (!argsout) {
-    logout << "Error: File " << argsfile << " could not be opened." << endl;
-    return;
-  }
-
-  // Make the file world writable
-  text_t changemode = "chmod a+w " + argsfile;
-  gsdl_system(changemode, false, logout);
-
-  // Write out the cgiargsclass variable to the argsout file
-  argsout << args;
-  argsout.close();
-}
-
-
-void langaction::define_webpage (displayclass &disp, text_t sourcelang, text_t targetlang,
-                 text_t dir, text_t page, int numpages, bool error,
-                 ostream &logout)
-{
-  // produces HTML page with the current pages contents
-  // formfile is the file that contains web-form for the
-  // current package whose name is stored in 'package'
-
-  text_t formfile = filename_cat(dir, page + ".lang");
-  ifstream readfile(formfile.getcstr(), ios::in);
-  if (!readfile) {
-    logout << "File " << formfile << " could not be found.\n";
-    return;
-  }
-
-
-  /* ============================ START WEB-FORM HTML CODE ============================ */
-  text_t text = "";
-  text += "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>\n";
+  // ============================ START HTML CODE ============================
+  text_t text = "<html>\n";
+  text += "<head>\n";
+  text += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n";
+  text += "</head>\n";
+
+  text += "<body>\n";
+  text += "_texttranshead_\n";
 
   text += "<input type=hidden name=\"a\" value=\"lang\">\n";
@@ -444 +336 @@
   text += "<input type=hidden name=\"e\" value=\"_decodedcompressedoptions_\">\n";
 
-  text += "_texttranshead_";
-
-  // If not a special case page display "Page x of y" and Next button
-  if ((page != "thankyou") && (page != "picklanguage") && (page != "fromsearch")) {
-    text += "<center><strong>";
-    text += " _textcurrpage_ " + page + " _textof_ " + numpages;
-    text += "</strong>";
-
-    int pageno = atoi(page.getcstr());
-    text += " <a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    if (pageno >= numpages)
-      text += "thankyou";
-    else
-      text += (pageno + 1);
-    text += "&baselanguage=" + sourcelang;
-    text += "&language=" + targetlang;
-    text += "\">";
-    text += "<strong>NEXT>></strong></a></center>\n";
-  }
-
   // Read in HTML from file
   char line[LINESIZE];
-  while (readfile.getline(line, LINESIZE-1)) {
+  while (webpagefile.getline(line, LINESIZE-1)) {
     text_t temp = line;
     text += temp + "\n";
   }
-  readfile.close();
-
+  webpagefile.close();
+
+  // Display an error if the source and target languages are the same
   if (page == "picklanguage" && error) {
     text += "<center><strong>_textchoosedifferent_</strong></center>";
   }
 
-  // If not a special case page display "Page x of y" and Next button
-  if ((page != "thankyou") && (page != "picklanguage") && (page != "fromsearch")) {
-    text += "<center><strong>";
-    text += " _textcurrpage_ " + page + " _textof_ " + numpages;
-    text += "</strong>";
-
-    int pageno = atoi(page.getcstr());
-    text += " <a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    if (pageno >= numpages)
-      text += "thankyou";
-    else
-      text += (pageno + 1);
-    text += "&baselanguage=" + sourcelang;
-    text += "&language=" + targetlang;
-    text += "\">";
-    text += "<strong>NEXT>></strong></a></center>\n";
-  }
-
-  if (page == "fromsearch")
-    text += "<center><strong> _textcurrpage_ 1 _textof_ 1</strong><br>\n";
-
-  text += "</body></html>\n";
-  
-  
-  /* ============================ END WEB-FORM HTML CODE ============================ */
-  
-  
-  // THE FOLLOWING MACROS ARE DEFINED IN translang.dm MACRO FILE
-  // set the formcontent  as the content of the form-page
-
+  text += "</body>\n";
+  text += "</html>\n";
+
+  // if (page == "fromsearch") {
+  //   text += "<center><strong> _textcurrpage_ 1 _textof_ 1</strong><br>\n";
+  // }
+
+  // ============================ END HTML CODE ============================
+
+  // The following macros are defined in translang.dm
   disp.setmacro("formcontent", "translang", text);
-  
-  // set the action for the form
   disp.setmacro("formaction", "translang", "_gwcgi_");
 
+  // Change the navigation bar to include a search button
   text_t navigationbar = "<!-- Navigation Bar -->\n";
   navigationbar += "<table width=\"100%\" cellspacing=0 cellpadding=0>";
-  navigationbar += "<tr valign=top><td rowspan=2 align=left>_imagecollection_</td>";
-  navigationbar += "<td align=right>_javalinks_</td><td>";
+  navigationbar += "<tr valign=top>\n";
+  navigationbar += "<td rowspan=2 align=left>_imagecollection_</td>";
+  navigationbar += "<td align=right>_javalinks_</td>";
 
   // if (page != "picklanguage") {
-    // navigationbar += "_imageserch_";
+  // navigationbar += "<td>_imageserch_</td>";
   // }
-  navigationbar += "</td></tr></table>\n</nobr>\n";
+
+  navigationbar += "</tr></table>\n</nobr>\n";
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "translang", navigationbar);
 }
+
 
 
@@ -530 +385 @@
                 ostream &logout) {
   text_t &arg_p = args["p"];
-  // logout << "Arg P: " << arg_p << endl;
 
   outconvertclass text2utf8;
-
   textout << text2utf8 << disp << ("_" + arg_p + ":header_\n")
       << ("_" + arg_p + ":content_\n")
@@ -540 +393 @@
   return true;
 }
+
+
+
+
+  //if are entering page from macro search
+  /* if (args["macroname"] != "") {
+    text_t macroname = args["macroname"];
+
+    // !! TO DO !!
+    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "fromsearch.pl") + " " + sourceabbr + " " + targetabbr + " " + macroname;
+    logout << "COMMAND: " << cmd <<endl;
+
+    if ((gsdl_system(cmd, true, logout)) != 0) {
+      logout << "Process " << cmd << " did not execute.../;-D\n";
+      return;
+    }
+
+    define_webpage(disp, sourcelang, targetlang, trans_dir, page, -1, false, logout);
+    return;
+  }
+
+  if (page == "fromsearch")
+  page = "thankyou"; */

trunk/gsdl/src/recpt/langaction.h

@@ -58 +58 @@
                    recptprotolistclass *protos, ostream &logout);
 
-  void write_args_file (cgiargsclass &args, text_t argsfile, ostream &logout);
+  void write_submission_file (cgiargsclass &args, text_t filename, ostream &logout);
 
   void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
@@ -71 +71 @@
   bool init (ostream & /*logout*/);
 
-  void define_webpage (displayclass &disp, text_t sourcelang, text_t targetlang,
-               text_t dir, text_t pageno, int numpages, bool error,
+  void define_webpage (displayclass &disp, text_t dir, text_t page, bool error,
                ostream &logout);
 };