Changeset 4107

Timestamp:

2003-04-08T16:21:35+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many small modifications. Most important were changes to authenticate users, and minor changes to fit the modified back-end.

File:

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

trunk/gsdl/src/recpt/langaction.cpp

@@ -55 +55 @@
 
   // 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, "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);
@@ -179 +180 @@
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (&cerr, arg_ainfo);
-
 }
 
@@ -186 +186 @@
 
 bool langaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
-                ostream &logout) {
-  // authenticate the user before allowing modifications
-  //  args["uan"] = 1;
-  //  args["ug"] = "langadmin";
-
+                recptprotolistclass *protos, ostream &logout) {
+  // authenticate the user before allowing modifications (if authentication is available)
+  args["uan"] = 1;
+  args["ug"] = "langadmin";
   return true;
 }
@@ -212 +211 @@
   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 << " 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
@@ -237 +216 @@
     lang = args["ownchoice"];
   }
-  //  else if (args["hiddenlanguage"] != "") {
-//      lang = args["hiddenlanguage"];
-//    }
-//    else {
-//      lang = args["language"];
-//    }
-
-  // else if (args["tlng"] != "") {
-  //   lang = args["tlng"];
-  // }
   else if (args["language"] != "") {
     lang = args["language"];
@@ -258 +227 @@
   }
 
-  //sets current base language
-  //  if (args["baselanguage"] != "") {
-  //  baselanguage = args["baselanguage"];
-  //}
-
-  logout << "Lang: " << lang << " Baselanguage: " << baselanguage << endl;
+  // logout << "Lang: " << lang << " Baselanguage: " << baselanguage << endl;
+  text_t translation = baselanguage + "-" + lang;
+  logout << "Translation: " << translation << endl;
+  text_t trans_dir = filename_cat(dir, translation);
 
   // argument for page is of the form 'macrofile_pageno' so
@@ -287 +254 @@
     }
     
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
+    define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage);
     return;
   }
+
   if (pageno == "fromsearch")
     pageno = "thankyou";
@@ -296 +264 @@
     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;
+    cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "translator.pl") + " " + baselanguage + " " + lang;
     if ((gsdl_system(cmd, true, logout)) != 0) {
       logout << "Process " << cmd << " did not execute.../;-D\n";
@@ -320 +286 @@
 
   //if no more pages will set pageno to thankyou script
-  pagenos = get_pagenos(dir, lang, logout);
+  pagenos = get_pagenos(trans_dir, lang, logout);
   
   if (pagenos.empty() && pageno == "")
@@ -330 +296 @@
   //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 += (argsfile + " " + lang + " " + baselanguage);
-    
+    cmd += (baselanguage + " " + lang + " " + "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
-    for (text_tarray::iterator page_itr = pagenos.begin(); 
-     page_itr != pagenos.end(); 
+    for (text_tarray::iterator page_itr = pagenos.begin();
+     page_itr != pagenos.end();
      page_itr++) {
       if (*page_itr == pageno) {
@@ -349 +319 @@
     else
       pageno = "thankyou";
-    
+
     break;  
       }
@@ -355 +325 @@
   }
 
-  pagenos = get_pagenos(dir, lang, logout);
-  define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
-}
+  pagenos = get_pagenos(trans_dir, lang, logout);
+  define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage);
+}
+
+
+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 << "File " << argsfile << " 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();
+}
+
 
 void langaction::define_webpage (displayclass &disp, 
@@ -368 +361 @@
   // current package whose name is stored in 'package'
 
-  text_t formfile;
-  if (pageno == "picklanguage")
-    formfile = filename_cat(dir, "package_forms");
-  else
-    formfile = filename_cat(dir, "package_forms", lang);
-  formfile += ("/" + pageno + ".lang");
-    
+  text_t formfile = filename_cat(dir, pageno + ".lang");
   ifstream readfile(formfile.getcstr(), ios::in);
   if (!readfile) {
@@ -380 +367 @@
     return;
   }
-  
-  
+
+
   /* ============================ START WEB-FORM HTML CODE ============================ */
   text += "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>";
@@ -432 +419 @@
      temp2 = "thankyou";
        
-       text += "<a href=\"_gwcgi_?a=lang&p=translang_";
+       text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
        text += temp2;
        text += "&baselanguage=";
@@ -442 +429 @@
        text += "</strong></a>\n";
 
-       break;   
+       break;
      }
      else {
-       text += "<a href=\"_gwcgi_?a=lang&p=translang_";
+       text += "<a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang_";
        text += *page_itr;
        text += "&baselanguage=";
@@ -473 +460 @@
   
   // set the action for the form
-  //  disp.setmacro("formaction", "translang", "/cgi-bin/dg5/library");
   disp.setmacro("formaction", "translang", "_gwcgi_");