Changeset 4123

Timestamp:

2003-04-11T09:39:17+12:00 (21 years ago)

Author:

mdewsnip

Message:

Added e-mail notification when translator is entered.

Location:

trunk/gsdl/src/recpt

Files:

• langaction.cpp (modified) (16 diffs)
• langaction.h (modified) (3 diffs)

trunk/gsdl/src/recpt/langaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+
 #include <ctype.h>
 #include <stdio.h>
 #include <fstream.h>
+#include <unistd.h>
 #include "langaction.h"
 #include "fileutil.h"
+#include "gsdltimes.h"
 #include "gsdltools.h"
 #include "gsdlunicode.h"
@@ -35 +38 @@
 #include "errno.h"
 #include <sys/utsname.h>
+
  
 /*====================*
@@ -41 +45 @@
 
 // text file reading buffer
-const int BUFFSIZE = 1024;
-char temp[BUFFSIZE];
-
+const int LINESIZE = 1024;
 
 
@@ -49 +51 @@
  * LOCAL UTILITY ROUTINES *
  *========================*/
-
-// gets the list of packages/files that contain the content of the web-forms
-text_tarray get_pagenos(text_t dir, text_t lang, ostream &logout)
-{
-  text_tarray pagenos;
-
-  // file 'logfile' contains all the page numbers, one number per line
-  // text_t logfile = filename_cat(dir, "package_forms", lang, "pageno.log");
-  text_t logfile = filename_cat(dir, "pageno.log");
-
-  //open the file as a read only file
-  ifstream readfile(logfile.getcstr(), ios::in);
-  
-  // if file isn't opened, print error and return
-  if (!readfile) {
-    logout << "File " << logfile << " could not be found.\n";
-    return pagenos;
-  }
-  
-  // go through file, pushing each page number on to the end of a text_tarray
-  while (readfile.getline(temp, BUFFSIZE-1)) {
-    text_t t_temp = temp;
-    pagenos.push_back(temp);
-  }
-  readfile.close();
-    
-  //returns the array of page numbers
-  return pagenos;
-}
 
 bool text_t_substring (text_t &text, text_t &substr)
@@ -101 +74 @@
 
 
+/*====================*
+ * CLASS DEFINITIONS  *
+ *====================*/
+
+langaction::langaction () {
+
+  package = "";
+
+  cgiarginfo arg_ainfo;
+
+  arg_ainfo.shortname = "l";
+  arg_ainfo.longname = "interface language";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "en";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (&cerr, arg_ainfo);
+
+  arg_ainfo.shortname = "bl";
+  arg_ainfo.longname = "base language";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "english";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (&cerr, arg_ainfo);
+
+  arg_ainfo.shortname = "tlng";
+  arg_ainfo.longname = "translation language";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "french";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (&cerr, arg_ainfo);
+}
+
+
+langaction::~langaction () {
+  // Nothing to do in destructor
+}
+
+
 // set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros
 // reponse contains 1 metadata field (Title)
-
-bool langaction::init (ostream & /*logout*/) {
-
+bool langaction::init (ostream & /*logout*/)
+{
   // set up GSDLOS, GSDLHOME and PATH environment variables
   text_t gsdlos, path;
@@ -148 +161 @@
   return true;
 }
-/*====================*
- * CLASS DEFINITIONS  *
- *====================*/
-
-langaction::langaction () {
-
-  package = "";
-
-  cgiarginfo arg_ainfo;
-
-  arg_ainfo.shortname = "l";
-  arg_ainfo.longname = "interface language";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "en";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (&cerr, arg_ainfo);
-
-  arg_ainfo.shortname = "bl";
-  arg_ainfo.longname = "base language";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "english";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (&cerr, arg_ainfo);
-
-  arg_ainfo.shortname = "tlng";
-  arg_ainfo.longname = "translation language";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "french";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (&cerr, arg_ainfo);
-}
-
-langaction::~langaction () {
-}
-
-bool langaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
-                recptprotolistclass *protos, ostream &logout) {
-  // authenticate the user before allowing modifications (if authentication is available)
+
+
+bool langaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args,
+                recptprotolistclass* /*protos*/, ostream &logout)
+{
+  // Authenticate the user before allowing modifications
   args["uan"] = 1;
   args["ug"] = "langadmin";
@@ -194 +172 @@
 }
 
-void langaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
-                   response_t &response,text_t &response_data, 
-                   ostream & logout) {
+
+void langaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass* /*protos*/,
+                   response_t &response, text_t &response_data, 
+                   ostream &logout)
+{
   response = content;
   response_data = "text/html";
 }
 
+
 void langaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
-                     recptprotolistclass *protos, ostream &logout) {
-  
+                     recptprotolistclass *protos, ostream &logout)
+{
   text_t text = "";
   text_t cmd = "";
-  text_t &arg_p = args["p"];
-  text_tarray pagenos;
   text_t dir = filename_cat(gsdlhome, "tmp", "lang");
-  text_t pageno ="";
-  text_t lang = "";
-  text_t baselanguage = "";
-
-  //sets the current foreign language
+  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"] != "") {
-    lang = args["ownchoice"];
+    targetlang = args["ownchoice"];
   }
   else if (args["language"] != "") {
-    lang = args["language"];
+    targetlang = args["language"];
   }
   else if (args["tlng"] != "") {
-    lang = args["tlng"];
-  }
-
-  if (args["bl"] != "") {
-    baselanguage = args["bl"];
-  }
-
-  // Case fold the target language
-  for (int i = 0; i < strlen(lang.getcstr()); i++) {
-    lang[i] = tolower(lang[i]);
+    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]);
   }
 
   // Make sure the source and target languages are different!
-  if (strcmp(baselanguage.getcstr(), lang.getcstr()) == 0) {
+  if (sourcelang == targetlang) {
     logout << "Same language!" << endl;
     args["p"] = "translang";
-    pageno = "picklanguage";
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage, true);
+    page = "picklanguage";
+    define_webpage(disp, sourcelang, targetlang, dir, page, -1, true, logout);
     return;
   }
 
-  // logout << "Lang: " << lang << " Baselanguage: " << baselanguage << endl;
-  text_t translation = baselanguage + "-" + lang;
+  // 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);
@@ -249 +232 @@
   // 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_tarray splitarray;
   splitchar(arg_p.begin(), arg_p.end(), '_', splitarray);
-  
+
   arg_p = splitarray[0];
   if (splitarray.size() > 1)
-    pageno = splitarray[splitarray.size()-1];
+    page = splitarray[splitarray.size()-1];
 
   //if are entering page from macro search
   if (args["macroname"] != "") {
     text_t macroname = args["macroname"];
-    
-    //calls the translator file to create HTML files
-    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "fromsearch.pl") + " " + macroname + " " + lang + " " + baselanguage;
+
+    // !! 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, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage, false);
+
+    define_webpage(disp, sourcelang, targetlang, trans_dir, page, -1, false, logout);
     return;
   }
 
-  if (pageno == "fromsearch")
-    pageno = "thankyou";
-
-  if (pageno == "picklanguage") {
-    pageno = "1";
-    
+  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") + " " + baselanguage + " " + lang;
+    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + sourcelang + " " + targetlang;
     if ((gsdl_system(cmd, true, logout)) != 0) {
       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 (pageno.empty()) {
-    pageno = "picklanguage";
-    logout << "@ the 1st pg\n";
+  if (page.empty()) {
+    page = "picklanguage";
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
     logout << cmd << endl;
     if(gsdl_system(cmd,true,logout) != 0)
       return;
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage, false);
-    
+    define_webpage(disp, sourcelang, targetlang, dir, page, -1, false, logout);
     return;
   }
 
-  //if no more pages will set pageno to thankyou script
-  pagenos = get_pagenos(trans_dir, lang, logout);
-  
-  if (pagenos.empty() && pageno == "")
-    pageno = "thankyou";
- 
-  text_t &submitargs = args[pageno];
+  // 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) {
+    logout << "Error: File " << numpagesfilepath << " could not be opened." << endl;
+    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)) {
@@ -318 +345 @@
     //create the command line for submitting the translation
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "submit_translation.pl") + " ";
-    cmd += (baselanguage + " " + lang + " " + "arguments.arg");
+    cmd += (sourcelang + " " + targetlang + " " + "arguments.arg");
 
     //give command to system to execute submission of translation
@@ -325 +352 @@
 
     //increments which page is displayed when translation is submitted
-    for (text_tarray::iterator page_itr = pagenos.begin();
-     page_itr != pagenos.end();
-     page_itr++) {
-      if (*page_itr == pageno) {
-    page_itr++;
-    if (page_itr != pagenos.end())
-      pageno = *page_itr;
-    else
-      pageno = "thankyou";
-
-    break;  
-      }
-    }
-  }
-
-  pagenos = get_pagenos(trans_dir, lang, logout);
-  define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage, false);
+    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);
 }
 
@@ -349 +367 @@
   ofstream argsout(argsfile.getcstr(), ios::out);
 
-  //informs user and returns if output stream not opened
-  if(!argsout) {
-    logout << "File " << argsfile << " could not be opened\n";
+  // Informs user and returns if output stream not opened
+  if (!argsout) {
+    logout << "Error: File " << argsfile << " could not be opened." << endl;
     return;
   }
 
-  //ensures access permissions make the file world writable
-  text_t changemode = "chmod a+w ";
-  changemode += argsfile;
+  // Make the file world writable
+  text_t changemode = "chmod a+w " + argsfile;
   gsdl_system(changemode, false, logout);
 
-  //write out the cgiargsclass passes as a parameter to the subroutine to the argsout file
+  // Write out the cgiargsclass variable to the argsout file
   argsout << args;
-  //close the argsout output stream
   argsout.close();
 }
 
 
-void langaction::define_webpage (displayclass &disp, 
-                 recptprotolistclass *protos, ostream &logout,
-                 text_t pageno, text_t &lang, text_t dir, 
-                 text_tarray &pagenos, text_t &text, text_t &baselanguage,
-                 bool error) {
-  
+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, pageno + ".lang");
+  text_t formfile = filename_cat(dir, page + ".lang");
   ifstream readfile(formfile.getcstr(), ios::in);
   if (!readfile) {
@@ -386 +400 @@
 
   /* ============================ START WEB-FORM HTML CODE ============================ */
-  text += "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>";
-
-  text += "\n<input type=hidden name=\"a\" value=\"lang\">";
-  text += "\n<input type=hidden name=\"p\" value=\"translang_";
-  text += pageno;
-  text += "\">";
-  text += "\n<input type=hidden name=\"e\" value=\"_decodedcompressedoptions_\">";
-  
-  text += "_texttranshead_";       
-
-  //if not a special case page display translation info
-  if ((pageno != "thankyou") && (pageno !="picklanguage") && (pageno != "fromsearch")) {
-  
-    text += "<center><strong> _textcurrpage_ ";
-    text += pageno;
-    text += " _textof_ ";
-    text += pagenos.size();
-    text += "</strong></center>\n"; 
-
-    for (text_tarray::iterator page_itr = pagenos.begin(); 
-     page_itr != pagenos.end(); 
-     page_itr++) {
-    
-      if (*page_itr == pageno) {
-    page_itr++;
-    text_t temp2;
-    if (page_itr != pagenos.end())
-      temp2 = *page_itr;
-    else
-      temp2 = "thankyou";
-       
-    text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    text += temp2;
-    text += "&baselanguage=";
-    text += baselanguage;
-    text += "&language=";
-    text += lang;
-    text += "\"><strong>";
-    text += "NEXT>>";
-    text += "</strong></a>\n";
-
-    break;
-      }
-      else {
-    text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    text += *page_itr;
-    text += "&baselanguage=";
-    text += baselanguage;
-    text += "&language=";
-    text += lang;
-    text += "\"><strong>";
-    text += *page_itr;
-    text += "</strong></a>\n";
-      }
-    }
-  }
-  
-  //read in HTML from file
-  while(readfile.getline(temp, BUFFSIZE-1)) {
-    text_t t_temp = temp;
-    text += t_temp;
-    text += "\n";
+  text_t text = "";
+  text += "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>\n";
+
+  text += "<input type=hidden name=\"a\" value=\"lang\">\n";
+  text += "<input type=hidden name=\"p\" value=\"translang_" + page + "\">\n";
+  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)) {
+    text_t temp = line;
+    text += temp + "\n";
   }
   readfile.close();
-  if (pageno == "picklanguage" && error) {
-    text += "<center><strong>Please choose different source and target languages!</strong></center>";
-  }
-
-  //if not a special case page display translation info
-  if ((pageno != "thankyou") && (pageno != "picklanguage") && (pageno != "fromsearch")) {
-    text += "<center><strong> _textcurrpage_ ";
-    text += pageno;
-    text += " _textof_ ";
-    text += pagenos.size();
-    text += "</strong><br>\n";
-
-    for (text_tarray::iterator page_itr = pagenos.begin(); 
-     page_itr != pagenos.end(); 
-     page_itr++) {
-    
-      if (*page_itr == pageno) {
-    page_itr++;
-    text_t temp2;
-    if (page_itr != pagenos.end())
-      temp2 = *page_itr;
-    else
-      temp2 = "thankyou";
-       
-    text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    text += temp2;
-    text += "&baselanguage=";
-    text += baselanguage;
-    text += "&language=";
-    text += lang;
-    text += "\"><strong>";
-    text += "NEXT>>";
-    text += "</strong></a>\n";
-
-    break;
-      }
-      else {
-    text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
-    text += *page_itr;
-    text += "&baselanguage=";
-    text += baselanguage;
-    text += "&language=";
-    text += lang;
-    text += "\"><strong>";
-    text += *page_itr;
-    text += "</strong></a>\n";
-      }
-    }
-  }
-
-  if (pageno == "fromsearch")
+
+  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";
 
@@ -511 +468 @@
   // THE FOLLOWING MACROS ARE DEFINED IN translang.dm MACRO FILE
   // set the formcontent  as the content of the form-page
- 
-  // logout << "Text: " << text;
 
   disp.setmacro("formcontent", "translang", text);
@@ -524 +479 @@
   navigationbar += "<td align=right>_javalinks_</td><td>";
 
-  if (pageno != "picklanguage") {
+  if (page != "picklanguage") {
     navigationbar += "_imageserch_";
   }
@@ -530 +485 @@
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "translang", navigationbar);
-
-}
+}
+
 
 bool langaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/, 
@@ -548 +503 @@
   return true;
 }
-
-

trunk/gsdl/src/recpt/langaction.h

@@ -30 +30 @@
 
 #include "action.h"
+#include "receptionist.h"
+
 
 class langaction : public action {
 
 protected:
+  receptionist *recpt;
+
   // package whose contents will be displayed in the form space
   text_t package;
@@ -43 +47 @@
   langaction ();
   virtual ~langaction ();
+
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
 
   text_t get_action_name () {return "lang";}
@@ -65 +71 @@
   bool init (ostream & /*logout*/);
 
-  void define_webpage (displayclass &disp, 
-               recptprotolistclass *protos, ostream &logout,
-               text_t pageno, text_t &lang, text_t dir,
-               text_tarray &pagenos, text_t &text, text_t &baselanguage, bool error);
+  void define_webpage (displayclass &disp, text_t sourcelang, text_t targetlang,
+               text_t dir, text_t pageno, int numpages, bool error,
+               ostream &logout);
 };