Changeset 3859

Timestamp:

2003-03-12T14:03:36+13:00 (21 years ago)

Author:

davidb

Message:

Improvements to translator facility.

File:

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

trunk/gsdl/src/recpt/langaction.cpp

@@ -62 +62 @@
   // if file isn't opened, print error and return
   if (!readfile) {
-    logout << "File " << logfile.getcstr() << " could not be found.\n";
+    logout << "File " << logfile << " could not be found.\n";
     return pagenos;
   }
@@ -219 +219 @@
   //informs user and returns if output stream not opened
   if(!argsout) {
-    logout << "File " << argsfile.getcstr() << " could not be opened\n";
+    logout << "File " << argsfile << " could not be opened\n";
       return;
   }
@@ -232 +232 @@
   //close the argsout output stream
   argsout.close();
- 
+
   //sets the current foreign language
   if (args["ownchoice"] != "") {
@@ -271 +271 @@
     //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;
+    logout << "COMMAND: " << cmd <<endl;
     
     if ((gsdl_system(cmd, true, logout)) != 0) {
-      logout << "Process " << cmd.getcstr() << " did not execute.../;-D\n";
+      logout << "Process " << cmd << " did not execute.../;-D\n";
       return;
     }
@@ -292 +292 @@
     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";
+      logout << "Process " << cmd << " did not execute.../;-D\n";
       return;
     }
@@ -302 +302 @@
     logout << "@ the 1st pg\n";
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
-    logout << cmd.getcstr() << " PICKLANGUAGE\n" <<endl;
+    logout << cmd << " PICKLANGUAGE\n" <<endl;
     if(gsdl_system(cmd,true,logout) != 0)
       return;
@@ -328 +328 @@
     //give command to system to execute submission of translation
     if((gsdl_system(cmd, true, logout)) != 0)
-      logout << "Process " << cmd.getcstr() << " did not execute\n";
+      logout << "Process " << cmd << " did not execute\n";
     
     //increments which page is displayed when translation is submitted
@@ -364 +364 @@
   ifstream readfile(formfile.getcstr(), ios::in);
   if (!readfile) {
-    logout << "File " << formfile.getcstr() << " could not be found.\n";
+    logout << "File " << formfile << " could not be found.\n";
     return;
   }
@@ -457 +457 @@
   // set the formcontent  as the content of the form-page
  
-  logout << text.getcstr() <<endl;
-
   disp.setmacro("formcontent", "translang", text);
   
@@ -470 +468 @@
   navigationbar += "<td align=right>_javalinks_</td><td>";
 
-  //PUT THIS LINE BACK IN TO RE CREATE THE LINK TO THE MACRO SEARCH FACILITY
-  //  if (pageno != "picklanguage")
-  //  navigationbar += "_imageserch_";
+  if (pageno != "picklanguage") {
+    navigationbar += "_imageserch_";
+  }
   navigationbar += "</td></tr></table>\n</nobr>\n";
   navigationbar += "<!-- End of Navigation Bar -->\n";