Changeset 3723

Timestamp:

2003-02-05T16:14:53+13:00 (21 years ago)

Author:

kde2

Message:

Submission of interface translation agency

File:

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

trunk/gsdl/src/recpt/langaction.cpp

@@ -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)
@@ -203 +154 @@
   package = "";
 
-  // this action uses cgi variables "a", and "p"
   cgiarginfo arg_ainfo;
 
   arg_ainfo.shortname = "l";
-  arg_ainfo.longname = "language";
+  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 (NULL, arg_ainfo);
+  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);
+
 }
 
@@ -263 +230 @@
   //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"];
-  }
-  
+  //  else if (args["hiddenlanguage"] != "") {
+//      lang = args["hiddenlanguage"];
+//    }
+//    else {
+//      lang = args["language"];
+//    }
+  else if (args["tlng"] != "") {
+    lang = args["tlng"];
+  }
+
+  if (args["bl"] != "") {
+    baselanguage = args["bl"];
+  }
+
   //sets current base language
-  if (args["baselanguage"] != "") {
-    baselanguage = args["baselanguage"];
-  }
-
+  //  if (args["baselanguage"] != "") {
+  //  baselanguage = args["baselanguage"];
+  //}
+  
   // argument for page is of the form 'macrofile_pageno' so
   // we need to split the argument to get the proper page content
@@ -308 +265 @@
     pageno = splitarray[splitarray.size()-1];
 
-  if (pageno == "fromsearch") {
+  //if are entering page from macro search
+  if (args["macroname"] != "") {
     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;
+    
+    //calls the translator file to create HTML files
+    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "fromsearch.pl") + " " + macroname + " " + lang + " " + baselanguage;
     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 == "fromsearch")
+    pageno = "thankyou";
 
   if (pageno == "picklanguage") {
     pageno = "1";
     
+    //THIS IS ONLY COMMENTED COS CVS IS SCREWED! NEED TO UNCOMMENT @ SOME POINT!!!
     //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;
-//      }
+    
+    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;
+    }
   }
 
@@ -375 +334 @@
      page_itr != pagenos.end(); 
      page_itr++) {
-      logout << pageno.getcstr() << " page number before" <<endl;
- 
       if (*page_itr == pageno) {
     page_itr++;
@@ -386 +343 @@
     break;  
       }
-
-      logout << pageno.getcstr() << " page number after" <<endl;
     }
-    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);
 }
@@ -423 +376 @@
   text += pageno;
   text += "\">\n";
-
+  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")) {
-  
-    logout << "PAGENOS " << pagenos.size() <<endl;
-
+  if ((pageno != "thankyou") && (pageno !="picklanguage") && (pageno != "fromsearch")) {
+  
     text += "<center><strong> _textcurrpage_ ";
     text += pageno;
@@ -439 +390 @@
   }
   
-  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";
   }
@@ -472 +399 @@
   
   //if not a special case page display translation info
-  if ((pageno != "thankyou") && (pageno != "picklanguage")) {
+  if ((pageno != "thankyou") && (pageno != "picklanguage") && (pageno != "fromsearch")) {
     text += "<center><strong> _textcurrpage_ ";
     text += pageno;
@@ -478 +405 @@
     text += pagenos.size();
     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 = "";
@@ -512 +411 @@
     page_itr != pagenos.end(); 
     page_itr++) {
-     
-     logout << "TEMP2 " << temp2.getcstr() <<endl;
-     logout << "PAGENO " << pageno.getcstr() <<endl;
-
+    
      if (*page_itr == pageno) {
        page_itr++;
@@ -523 +419 @@
      temp2 = "thankyou";
        
-       logout << "TEMP2 " << temp2.getcstr() <<endl;
-       logout << "PAGENO " << pageno.getcstr() <<endl;
-       
+       text += "<a href=\"_gwcgi_?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_?a=lang&p=translang_";
+       text += *page_itr;
+       text += "&baselanguage=";
+       text += baselanguage;
+       text += "&language=";
+       text += lang;
+       text += "\"><strong>";
+       text += *page_itr;
+       text += "</strong></a>\n";
+     }
    }
-
-   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();
-  } 
+  }
+
+  if (pageno == "fromsearch")
+    text += "<center><strong> _textcurrpage_ 1 _textof_ 1</strong><br>\n";
+
+  text += "</body></html>\n";
+  
+  
   /* ============================ END WEB-FORM HTML CODE ============================ */
   
@@ -551 +456 @@
   // THE FOLLOWING MACROS ARE DEFINED IN translang.dm MACRO FILE
   // set the formcontent  as the content of the form-page
+ 
+  logout << text.getcstr() <<endl;
+
   disp.setmacro("formcontent", "translang", text);
   
@@ -561 +469 @@
   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";
+
+  //PUT THIS LINE BACK IN TO RE CREATE THE LINK TO THE MACRO SEARCH FACILITY
+  //  if (pageno != "picklanguage")
+  //  navigationbar += "_imageserch_";
+  navigationbar += "</td></tr></table>\n</nobr>\n";
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "translang", navigationbar);
@@ -574 +485 @@
   text_t &arg_p = args["p"];
   
-  textout << outconvert << disp << ("_" + arg_p + ":header_\n")
+  outconvertclass text2utf8;
+
+  textout << text2utf8 << disp << ("_" + arg_p + ":header_\n")
       << ("_" + arg_p + ":content_\n")
       << ("_" + arg_p + ":footer_\n");
 
-  logout << outconvert << disp << ("_" + arg_p + ":header_\n");
-
   return true;
 }