Changeset 4116

Timestamp:

2003-04-09T15:52:04+12:00 (21 years ago)

Author:

mdewsnip

Message:

Minor user interface improvements.

File:

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

trunk/gsdl/src/recpt/langaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include <ctype.h>
 #include <stdio.h>
 #include <fstream.h>
@@ -227 +228 @@
   }
 
+  // Case fold the target language
+  for (int i = 0; i < strlen(lang.getcstr()); i++) {
+    lang[i] = tolower(lang[i]);
+  }
+
+  // Make sure the source and target languages are different!
+  if (strcmp(baselanguage.getcstr(), lang.getcstr()) == 0) {
+    logout << "Same language!" << endl;
+    args["p"] = "translang";
+    pageno = "picklanguage";
+    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage, true);
+    return;
+  }
+
   // logout << "Lang: " << lang << " Baselanguage: " << baselanguage << endl;
   text_t translation = baselanguage + "-" + lang;
@@ -254 +269 @@
     }
     
-    define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage);
+    define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage, false);
     return;
   }
@@ -277 +292 @@
     logout << "@ the 1st pg\n";
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
-    logout << cmd << " PICKLANGUAGE\n" <<endl;
+    logout << cmd << endl;
     if(gsdl_system(cmd,true,logout) != 0)
       return;
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
+    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage, false);
     
     return;
@@ -326 +341 @@
 
   pagenos = get_pagenos(trans_dir, lang, logout);
-  define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage);
+  define_webpage(disp, protos, logout, pageno, lang, trans_dir, pagenos, text, baselanguage, false);
 }
 
@@ -354 +369 @@
 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) {
+                 text_t pageno, text_t &lang, text_t dir, 
+                 text_tarray &pagenos, text_t &text, text_t &baselanguage,
+                 bool error) {
   
   // produces HTML page with the current pages contents
@@ -375 +391 @@
   text += "\n<input type=hidden name=\"p\" value=\"translang_";
   text += pageno;
-  text += "\">\n";
+  text += "\">";
   text += "\n<input type=hidden name=\"e\" value=\"_decodedcompressedoptions_\">";
   
@@ -387 +403 @@
     text += " _textof_ ";
     text += pagenos.size();
-    text += "</strong></center><p><p>\n"; 
+    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";
+      }
+    }
   }
   
@@ -397 +450 @@
   }
   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")) {
@@ -406 +462 @@
     text += "</strong><br>\n";
 
-   text_t temp2 = "";
-
-   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())
-     temp2 = *page_itr;
-       else
-     temp2 = "thankyou";
+    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";
-     }
-   }
+    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";
+      }
+    }
   }
 
@@ -457 +512 @@
   // set the formcontent  as the content of the form-page
  
+  // logout << "Text: " << text;
+
   disp.setmacro("formcontent", "translang", text);
   
@@ -481 +538 @@
                 ostream &logout) {
   text_t &arg_p = args["p"];
-  
+  // logout << "Arg P: " << arg_p << endl;
+
   outconvertclass text2utf8;