Changeset 3715 for trunk/gsdl/src/recpt

Timestamp:

2003-01-28T10:01:25+13:00 (21 years ago)

Author:

kde2

Message:

Updating Language Translation Agency

Location:

trunk/gsdl/src/recpt

Files:

• langaction.cpp (modified) (14 diffs)
• langaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/langaction.cpp

@@ -31 +31 @@
 #include "gsdlunicode.h"
 #include "langdb.h"
+#include "receptionist.h"
 #include "errno.h"
 #include <sys/utsname.h>
-
  
 /*====================*
@@ -49 +49 @@
  *========================*/
 
+void add_visited_page (text_t dir, ostream & logout, text_t pageno) { 
+ 
+  text_tarray oldpages;
+  bool visited = false;
+
+  // file 'logfile' contains all the page numbers, one number per line
+  text_t logfile = filename_cat(dir, "package_forms", "oldpages.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 << "IN File " << logfile.getcstr() << " could not be found.\n";
+    return;
+  }
+  
+  // 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;
+    oldpages.push_back(temp);
+    if (strcmp(pageno.getcstr(),t_temp.getcstr()) == 0) {
+      visited = true;
+    }
+  }
+  readfile.close();
+ 
+  if (visited == false) {
+    ofstream writefile(logfile.getcstr(), ios::out);
+    
+    for (text_tarray::iterator page_itr = oldpages.begin(); 
+     page_itr != oldpages.end(); 
+     page_itr++) {
+      
+      writefile << *page_itr <<endl;
+    }
+    time_t seconds;
+    seconds = time(NULL);
+
+    if (pageno == "2")
+      writefile << "1" <<endl;
+
+    writefile << pageno <<endl;
+
+    logout << "ADDING PAGE " << pageno.getcstr() << " " << seconds <<endl;
+
+    writefile.close();
+  }
+}
 // gets the list of packages/files that contain the content of the web-forms
 text_tarray get_pagenos(text_t dir, ostream &logout)
@@ -98 +147 @@
 }
 
+
+// set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros
+// reponse contains 1 metadata field (Title)
+
 bool langaction::init (ostream & /*logout*/) {
 
@@ -176 +229 @@
 void langaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
                    response_t &response,text_t &response_data, 
-                   ostream &/*logout*/) {
+                   ostream & logout) {
   response = content;
   response_data = "text/html";
@@ -183 +236 @@
 void langaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
+  
   text_t text = "";
   text_t cmd = "";
@@ -190 +244 @@
   text_t pageno ="";
   text_t lang = "";
+  text_t baselanguage = "";
+  
+  //creates output stream to argsfile (dir is gsdlhome/tmp/lang)
+  text_t argsfile = filename_cat(dir, "arguments.arg");
+  ofstream argsout(argsfile.getcstr(), ios::out);
+  
+  //informs user and returns if output stream not opened
+  if(!argsout) {
+    logout << "File " << argsfile.getcstr() << " could not be opened\n";
+      return;
+  }
+  
+  //ensures access permissions make the file world writable
+  text_t changemode = "chmod a+w ";
+  changemode += argsfile;
+  gsdl_system(changemode, false, logout);
+  
+  //write out the cgiargsclass passes as a parameter to the subroutine to the argsout file
+  argsout << args;
+  
+//    utf8outconvertclass text_tutf8;
+
+//    for (cgiargsclass::iterator args_itr = args.begin();
+//         args_itr != args.end();
+//         args_itr++) {
+
+//      if(text_t_substring(*args_itr->first, pageno, logout)) {
+//        argsout << text_t2utf8 << "\"" << args_itr->first << "\"=\n\""
+//            << (args_itr->second).value << "\"\n";
+//      }
+//    }
+
+  //close the argsout output stream
+  argsout.close();
+  
+  if (args["nextlink"] != "") {
+    add_visited_page(dir,logout,args["nextlink"]);
+  }
+
+  //sets the current foreign language
+  if (args["ownchoice"] != "") {
+    lang = args["ownchoice"];
+  }
+  else if (args["hiddenlanguage"] != "") {
+    lang = args["hiddenlanguage"];
+  }
+  else {
+    lang = args["language"];
+  }
+  
+  //sets current base language
+  if (args["baselanguage"] != "") {
+    baselanguage = args["baselanguage"];
+  }
 
   // argument for page is of the form 'macrofile_pageno' so
@@ -199 +307 @@
   if (splitarray.size() > 1)
     pageno = splitarray[splitarray.size()-1];
-  
-  if (pageno == "picklanguage")
+
+  if (pageno == "fromsearch") {
+    text_t macroname = args["macroname"];
+    text_t macrotext = args["macrotext"];
+
+    logout << "macro data " << macroname.getcstr() << macrotext.getcstr() <<endl;
+
+     //calls the translator file to create HTML files
+    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "fromsearch.pl") + " " + macroname + " " + macrotext;
+    logout << "COMMAND: " << cmd.getcstr() <<endl;
+
+    if ((gsdl_system(cmd, true, logout)) != 0) {
+      logout << "Process " << cmd.getcstr() << " did not execute.../;-D\n";
+      return;
+    }
+
+    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
+    return;
+  }
+
+  if (pageno == "picklanguage") {
     pageno = "1";
-  
-  if (pageno.empty())
+    
+    //calls the translator file to create HTML files
+    //  cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + lang + " " + baselanguage;
+//      if ((gsdl_system(cmd, true, logout)) != 0) {
+//        logout << "Process " << cmd.getcstr() << " did not execute.../;-D\n";
+//        return;
+//      }
+  }
+
+  //generates the picklanguage page
+  if (pageno.empty()) {
     pageno = "picklanguage";
-
-  //produce the picklanguage webpage
-  if (pageno == "picklanguage") {
+    logout << "@ the 1st pg\n";
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
+    logout << cmd.getcstr() << " PICKLANGUAGE\n" <<endl;
     if(gsdl_system(cmd,true,logout) != 0)
       return;
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text);
+    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
+    
     return;
   }
- 
-  //creates output stream to argsfile (dir is gsdlhome/tmp/lang)
-  text_t argsfile = filename_cat(dir, "arguments.arg");
-  ofstream argsout(argsfile.getcstr(), ios::out);
-  
-  //informs user and returns if output stream not opened
-  if(!argsout) {
-    logout << "File " << argsfile.getcstr() << " could not be opened\n";
-      return;
-  }
-  
-  //ensures access permissions make the file world writable
-  text_t changemode = "chmod a+w ";
-  changemode += argsfile;
-  gsdl_system(changemode, false, logout);
-  
-  //write out the cgiargsclass passes as a parameter to the subroutine to the argsout file
-  argsout << args;
-  
-  //close the argsout output stream
-  argsout.close();
-  
-  //sets the current foreign language
-  if (args["ownchoice"] != "") {
-    lang = args["ownchoice"];
-  }
-  else if (args["hiddenlanguage"] != "") {
-    lang = args["hiddenlanguage"];
-  }
-  else {
-    lang = args["language"];
-  }
-  text_t baselanguage = "";
-
-  //sets current base language
-  if (args["baselanguage"] != "") {
-    baselanguage = args["baselanguage"];
-  }
-  
-  
-  //calls the translator file to create HTML files
-  cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + lang + " " + baselanguage;
-
-  if ((gsdl_system(cmd, true, logout)) != 0) {
-    logout << "Process " << cmd.getcstr() << " did not execute.../;-D\n";
-    return;
-  }
-  
+
   //if no more pages will set pageno to thankyou script
   pagenos = get_pagenos(dir,logout);
-  if (pagenos.empty())
+  
+  if (pagenos.empty() && pageno == "")
     pageno = "thankyou";
-  
-
+ 
   text_t &submitargs = args[pageno];
-  text_t submit = "SUBMIT TRANSLATION >>";
+  text_t submit = "SUBMIT TRANSLATION";
   
   //if the SUBMIT TRANSLATION >> button has been pushed
@@ -286 +375 @@
      page_itr != pagenos.end(); 
      page_itr++) {
-      
+      logout << pageno.getcstr() << " page number before" <<endl;
+ 
       if (*page_itr == pageno) {
     page_itr++;
@@ -296 +386 @@
     break;  
       }
+
+      logout << pageno.getcstr() << " page number after" <<endl;
     }
-  }
-  //want it to automatically load the next page here instead of reloading page
-  //that has just been translated with everything empty again.
-  
-  define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text);
+    add_visited_page(dir,logout,pageno);
+  }
+
+  pagenos = get_pagenos(dir,logout);
+  logout << "PAGENOS... " << pagenos.size() <<endl;
+  define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
 }
 
 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 pageno, text_t &lang, text_t &dir, 
+                 text_tarray &pagenos, text_t &text, text_t &baselanguage) {
   
   // produces HTML page with the current pages contents
@@ -324 +417 @@
   
   /* ============================ 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_";
@@ -329 +424 @@
   text += "\">\n";
 
-  text += "<strong><br>\n";
-  text += "</center><img src=\"_httpimg_/gsdlhead.gif\"><center><p>";
-  text += "<img src=\"_httpimg_/divb.gif\"><p>";
-  text += "<font size=\"7\">Greenstone Language Translation Facility</font></strong><p>\n";
-           
+  text += "_texttranshead_";       
+
   
   //if not a special case page display translation info
   if ((pageno != "thankyou") && (pageno !="picklanguage")) {
-    text += "<center><strong>You are currently translating page ";
+  
+    logout << "PAGENOS " << pagenos.size() <<endl;
+
+    text += "<center><strong> _textcurrpage_ ";
     text += pageno;
-    text += " of ";
+    text += " _textof_ ";
     text += pagenos.size();
-    text += " in to ";
-    text += lang;
     text += "</strong></center><p><p>\n"; 
   }
   
+  utf8outconvertclass text_tutf8;
+
   //read in HTML from file
   while(readfile.getline(temp, BUFFSIZE-1)) {
     text_t t_temp = temp;
     text += t_temp;
+
+    //logout << t_temp.getcstr() <<endl;
+
+   //   text_t2utf8.setinput(&t_temp);
+//      char *buffer = new char[t_temp.size()];
+//      size_t num_chars;
+//      convertclass::status_t status;
+//      text_t2utf8.convert(buffer, t_temp.size(), num_chars, status);
+//      logout << buffer <<endl;
+//      delete buffer;
+
+//    for (cgiargsclass::iterator args_itr = args.begin();
+//         args_itr != args.end();
+//         args_itr++) {
+
+//      if(text_t_substring(*args_itr->first, pageno, logout)) {
+    //    argsout << text_t2utf8 << "\"" << args_itr->first << "\"=\n\""
+    //      << (args_itr->second).value << "\"\n";
+//      }
+//    }
+
+    // logout << t_temp.getcstr() <<endl;
     text += "\n";
   }
@@ -356 +473 @@
   //if not a special case page display translation info
   if ((pageno != "thankyou") && (pageno != "picklanguage")) {
-    text += "<center><strong>You are currently translating page ";
+    text += "<center><strong> _textcurrpage_ ";
     text += pageno;
-    text += " of ";
+    text += " _textof_ ";
     text += pagenos.size();
-    text += " in to ";
-    text += lang;
-    text += "</strong></center><br>\n";
+    text += "</strong><br>\n";
+   
+  
+   text_tarray oldpages;
+   
+   // file 'logfile' contains all the page numbers, one number per line
+   text_t logfile = filename_cat(dir, "package_forms", "oldpages.log");
+   
+   //open the file as a read only file
+   ifstream reader(logfile.getcstr(), ios::in);
+   
+   // if file isn't opened, print error and return
+   if (!reader) {
+     logout << "IN File " << logfile.getcstr() << " could not be found.\n";
+   }
+   
+   // go through file, pushing each page number on to the end of a text_tarray
+   while (reader.getline(temp, BUFFSIZE-1)) {
+       text += "<a href=\"_gwcgi_?a=lang&p=translang_";
+       text += temp;
+       text += "&baselanguage=";
+       text += baselanguage;
+       text += "&language=";
+       text += lang;
+       text += "\"><strong>";
+       text += temp;
+       text += "</strong></a>\n";
+     
+   }
+
+   text_t temp2 = "";
+
+   for (text_tarray::iterator page_itr = pagenos.begin(); 
+    page_itr != pagenos.end(); 
+    page_itr++) {
+     
+     logout << "TEMP2 " << temp2.getcstr() <<endl;
+     logout << "PAGENO " << pageno.getcstr() <<endl;
+
+     if (*page_itr == pageno) {
+       page_itr++;
+       if (page_itr != pagenos.end())
+     temp2 = *page_itr;
+       else
+     temp2 = "thankyou";
+       
+       logout << "TEMP2 " << temp2.getcstr() <<endl;
+       logout << "PAGENO " << pageno.getcstr() <<endl;
+       
+       break;   
+     }
+   }
+
+   text += "<a href=\"_gwcgi_?a=lang&p=translang_";
+   text += temp2;
+   text += "&baselanguage=";
+   text += baselanguage;
+   text += "&language=";
+   text += lang;
+   text += "&nextlink=";
+   text += pageno;
+   text += "\"><strong>";
+   text += "NEXT>>";
+   text += "</strong></a>\n";
+
+   text += "</body></html>\n";
+
+   reader.close();
   } 
-  
-  
   /* ============================ END WEB-FORM HTML CODE ============================ */
+  
   
   // THE FOLLOWING MACROS ARE DEFINED IN translang.dm MACRO FILE
@@ -375 +556 @@
   //  disp.setmacro("formaction", "translang", "/cgi-bin/dg5/library");
   disp.setmacro("formaction", "translang", "_gwcgi_");
+
+  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 += "_imageserch_</td></tr></table>";
+  navigationbar += "\n</nobr>\n";
+  navigationbar += "<!-- End of Navigation Bar -->\n";
+  disp.setmacro ("navigationbar", "translang", navigationbar);
 
 }
@@ -388 +578 @@
       << ("_" + arg_p + ":footer_\n");
 
+  logout << outconvert << disp << ("_" + arg_p + ":header_\n");
+
   return true;
 }
 
 
-
-

trunk/gsdl/src/recpt/langaction.h

@@ -65 +65 @@
   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 pageno, text_t &lang, text_t &dir,
+               text_tarray &pagenos, text_t &text, text_t &baselanguage);
     
-
+ 
 };