Changeset 4068

Timestamp:

2003-04-01T16:19:09+12:00 (21 years ago)

Author:

mdewsnip

Message:

Files specific to a translation process are now stored in a separate subdirectory of tmp/lang.

Location:

trunk/gsdl

Files:

• bin/script/fromsearch.pl (modified) (1 diff)
• bin/script/translator.pl (modified) (3 diffs)
• src/recpt/langaction.cpp (modified) (6 diffs)

trunk/gsdl/bin/script/fromsearch.pl

@@ -137 +137 @@
 {
     my ($formhash) = shift(@_);
-    my $fs_fname = util::filename_cat($ENV{'GSDLHOME'},"tmp","lang",
-                      "package_forms","fromsearch.lang");
-
-    open (FILE, ">$fs_fname") or die "Unable to open $fs_fname: $!\n";
     my $language = shift(@_);
     my $baselanguage = shift(@_);
+    my $fs_fname = util::filename_cat($ENV{'GSDLHOME'},"tmp","lang",
+                      "package_forms", "$lang", "fromsearch.lang");
+
+    open (FILE, ">$fs_fname") or die "Unable to open $fs_fname: $!\n";
     # common gateway interface for writing the stuff to the web
     my $query = new CGI;

trunk/gsdl/bin/script/translator.pl

@@ -497 +497 @@
 
     # directory in which to put the generated html pages
-    my $dir = "$ENV{'GSDLHOME'}/tmp/lang/package_forms";
+    my $dir = "$ENV{'GSDLHOME'}/tmp/lang/package_forms/$lang";
    
     # creates directory if it doesn't already exist
@@ -567 +567 @@
 
     #writes each page number to a file
-    open PAGELOG, ">$ENV{'GSDLHOME'}/tmp/lang/package_forms/pageno.log" or die("MURGH\n");
+    open PAGELOG, ">$dir/pageno.log" or die("MURGH\n");
     foreach $page (@pageno) {
     print PAGELOG $page, "\n";
@@ -574 +574 @@
 
     #write thankyou page for language translator once translation is complete
-    open THANKYOU, ">$ENV{'GSDLHOME'}/tmp/lang/package_forms/thankyou.lang" or die("MURGH\n");
+    open THANKYOU, ">$dir/thankyou.lang" or die("MURGH\n");
     print THANKYOU "<center> _textthanks_ $lang _texttrans_ <p></center>\n";
     close THANKYOU;

trunk/gsdl/src/recpt/langaction.cpp

@@ -50 +50 @@
 
 // gets the list of packages/files that contain the content of the web-forms
-text_tarray get_pagenos(text_t dir, ostream &logout)
+text_tarray get_pagenos(text_t dir, text_t lang, ostream &logout)
 {
   text_tarray pagenos;
 
   // file 'logfile' contains all the page numbers, one number per line
-  text_t logfile = filename_cat(dir, "package_forms", "pageno.log");
+  text_t logfile = filename_cat(dir, "package_forms", lang, "pageno.log");
   
   //open the file as a read only file
@@ -243 +243 @@
 //      lang = args["language"];
 //    }
+
+  // else if (args["tlng"] != "") {
+  //   lang = args["tlng"];
+  // }
+  else if (args["language"] != "") {
+    lang = args["language"];
+  }
   else if (args["tlng"] != "") {
     lang = args["tlng"];
@@ -255 +262 @@
   //  baselanguage = args["baselanguage"];
   //}
-  
+
+  logout << "Lang: " << lang << " Baselanguage: " << baselanguage << endl;
+
   // argument for page is of the form 'macrofile_pageno' so
   // we need to split the argument to get the proper page content
@@ -311 +320 @@
 
   //if no more pages will set pageno to thankyou script
-  pagenos = get_pagenos(dir,logout);
+  pagenos = get_pagenos(dir, lang, logout);
   
   if (pagenos.empty() && pageno == "")
@@ -346 +355 @@
   }
 
-  pagenos = get_pagenos(dir,logout);
+  pagenos = get_pagenos(dir, lang, logout);
   define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
 }
@@ -359 +368 @@
   // current package whose name is stored in 'package'
 
-  text_t formfile = filename_cat(dir, "package_forms");
+  text_t formfile;
+  if (pageno == "picklanguage")
+    formfile = filename_cat(dir, "package_forms");
+  else
+    formfile = filename_cat(dir, "package_forms", lang);
   formfile += ("/" + pageno + ".lang");