Changeset 3715

Timestamp:

2003-01-28T10:01:25+13:00 (21 years ago)

Author:

kde2

Message:

Updating Language Translation Agency

Location:

trunk/gsdl

Files:

• bin/script/picklanguage.pl (modified) (2 diffs)
• bin/script/submit_translation.pl (modified) (11 diffs)
• bin/script/translator.pl (modified) (27 diffs)
• src/recpt/langaction.cpp (modified) (14 diffs)
• src/recpt/langaction.h (modified) (1 diff)

trunk/gsdl/bin/script/picklanguage.pl

@@ -39 +39 @@
 use GDBM_File;
 use CGI;
-
+use utf8;
 
 sub main
@@ -71 +71 @@
     open(HTMLFILE, ">$dir/picklanguage.lang") or die "MURGH\n";
     
-    print HTMLFILE ("<center><strong><br>\n",
-            "Welcome to the Greenstone Language Translation Facility</strong><p>\n",
+    print HTMLFILE (" _textinitial_ <br>\n",
             "<table border=\"2\" cellpadding=\"8\"><tr><td><center>",
-            "Please select a base language from which to translate: <p>\n",
+            "_textselectbase_ <p>\n",
             $query->popup_menu(-name=>"baselanguage",
                        -values=>\@languages,
                        -default=>'english'),
             "<p></center></td><td><center>\n",
-            "Please select the language you are translating into: <p>\n",
+            "_textselectforeign_ <p>\n",
             $query->popup_menu(-name=>"language",
                        -values=>\@languages),
             "<p>\n",
-            "Or enter the name of a new language: <p>\n",
+            "_textselectnew_ <p>\n",
             $query->textfield(-name=>"ownchoice",
                       -default=>"",
                       -size=>50),
             "<p></center></td></tr></table>\n",
-            $query->submit("submitlanguage","CONTINUE >>"),
-            "</center><br>\n");
+            $query->submit("submitlanguage","_textenter_"),
+            "</center><p>\n",
+            "<img src=\"_httpimg_/divb.gif\"><p>");
     
     close HTMLFILE;
+
+    open (VISITEDPAGES, ">$dir/oldpages.log") or die "MURGH\n";
+
+    print VISITEDPAGES "";
+
+    close VISITEDPAGES;
 }
 

trunk/gsdl/bin/script/submit_translation.pl

@@ -42 +42 @@
 use File::Basename;
 use GDBM_File;
+use utf8;
 
 sub main
@@ -76 +77 @@
     my ($macronames) = &parseusersubmission($filename);
 
-    foreach $key (keys %macronames) {
+    foreach $key (keys %$macronames) {
+    #print STDERR "$key\n";
     if ($key =~ m/(_\w+_)/) {
-        $macronames{$key} = " [l=$langcode] {" . $macronames{$key} . "}\n";
+        $macronames->{$key} = " [l=$langcode] {" . $macronames->{$key} . "}\n";
         $macro = $key;
         $macro =~ s/.*:://;
         if ($macronumbered{$macro}) {
         $number = $macronumbered{$macro};
-        $foreign{$number} = $macro . $macronames{$key};
+        $foreign{$number} = $macro . $macronames->{$key};
         }
     }
     else {
-        $macronames{$key} =~ s/\<br\>/\n/g;
+        $macronames->{$key} =~ s/\<br\>/\n/g;
         $macro = $key;
         $macro =~ s/.*:://;
         if ($macronumbered{$macro}) {
         $number = $macronumbered{$macro};
-        $foreign{$number} = $macronames{$key};
+        $foreign{$number} = $macronames->{$key};
         }
     }
@@ -99 +101 @@
     $language2 = $language . "2";
 
-    open MACROOUT, ">$ENV{'GSDLHOME'}/macros/$language.dm" or die "MURGH\n";
+    open MACROOUT, ">$ENV{'GSDLHOME'}/macros/$language.dm" or die "MURGH MACROOUT1\n";
 
     foreach $ky (sort {$a <=> $b} keys %foreign) {
     if ($foreign{$ky} =~ m/package\s*home/) {
         close MACROOUT;
-        open MACROOUT, ">$ENV{'GSDLHOME'}/macros/$language2.dm" or die "MURGH\n";
+        open MACROOUT, ">$ENV{'GSDLHOME'}/macros/$language2.dm" or die "MURGH MACROOUT2\n";
     }
     print MACROOUT "$foreign{$ky}\n";
-    
+    #print STDERR "$foreign{$ky}\n";
     }
 
@@ -122 +124 @@
     $language = shift (@_);
 
-    open(LANGFILE, "<$ENV{'GSDLHOME'}/tmp/lang/package_forms/languages.log") or die "MURGH\n";
+    open(LANGFILE, "<$ENV{'GSDLHOME'}/tmp/lang/package_forms/languages.log") or die "MURGH LANGFILE\n";
 
     while (<LANGFILE>) {
@@ -143 +145 @@
     $file = shift(@_);
 
-    open (BASEIN, "<$ENV{'GSDLHOME'}/macros/$file.dm") or die("MURGH\n");
+    open (BASEIN, "<$ENV{'GSDLHOME'}/macros/$file.dm") or return;
     
     while (<BASEIN>) {
@@ -182 +184 @@
         $macronumbered{$key} = $number;
     }
+    #print STDERR "$file $line\n";
     }
    
@@ -194 +197 @@
     $file = shift(@_);
 
-    open (MACROIN, "<$ENV{'GSDLHOME'}/macros/$file.dm") or die("MURGH\n");
+    open (MACROIN, "<$ENV{'GSDLHOME'}/macros/$file.dm") or return;
     
     
@@ -279 +282 @@
     
     #opens the args file or kills program
-    open(ARGUMENTS, "<$filename") or die("Did not open $filename\n");
+    open(ARGUMENTS, "<$filename") or die("MURGH USER SUBMISSION\n");
     #while there are still lines left to read
     while (<ARGUMENTS>) {
@@ -286 +289 @@
     #chomps off the final newline character
     chomp($line);
-    
+
         #if the line contains :: (browser converts to %3A%3A) then it has a macroname
     if ($line =~ m/%3A%3A/) {
@@ -327 +330 @@
         
     }
-    
+    #print STDERR "$key\n";
     $macronames{$key} = $macrotext;
     $macrotext = "";
@@ -345 +348 @@
     $combined{$key} = $hash1->{$key};
     }
-    foreach $key (keys %$hash2) {
+    foreach $key (sort keys %$hash2) {
     $combined{$key} = $hash2->{$key};
+    #print STDERR "$key\n";
     }
 

trunk/gsdl/bin/script/translator.pl

@@ -39 +39 @@
 use GDBM_File;
 use CGI;
+require utf8;
+use unicode;
 
 sub main
@@ -44 +46 @@
     #gets the name of the language that is being translated from base language
     my $file = shift(@_);
-    
     my $baselanguage = shift(@_);
-
+   
     #checks that argument was supplied
     if (!$file) {
     die "You didn't supply the name of the language file! Aborting...\n";
     }
+
+    my ($diffhash) = &initial_hashing($file, $baselanguage);
+
+    #generates HTML code to display user interface on webpage with what needs translation
+    #returns an array of CGI data
+   
+    my @queries = &generate_pages($diffhash, $file, $baselanguage);
+
+}
+
+sub initial_hashing {
+
+    my ($file, $baselanguage) = @_;
+
     $file = "port" if ($file =~ m/portuguese/);
     $file = "indo" if ($file =~ m/indonesian/);
@@ -68 +83 @@
     my $macrodir = "$ENV{'GSDLHOME'}/macros/";
     
-     # always do this update because english.dm changes often
+    # always do this update because english.dm changes often
     #hashes the macro file into form of macroname{macrotext}
     my ($englhash) = &parse_macrofile($macrodir.$baselanguage.".dm");
     my ($engl2hash) =  &parse_macrofile($macrodir.$baselanguage."2.dm");
-    $englhash = &combine_hashes($englhash,$engl2hash);
-
+    
     &file_to_db($baselanguage, $englhash);
+    &file_to_db($baselanguage."2", $engl2hash);
     
     my ($base) = &dateannotation($baselanguage);
     my ($base2) = &dateannotation($baselanguage."2");
     $base = &combine_hashes($base,$base2);
-
+    
     # language macro-filename and database-filename
     my $macrofile = $macrodir.$file.".dm";
@@ -89 +104 @@
              "home", "homehelp", "extlink", "authen", "collector", "docs", "usersedituser",
              "usersdeleteuser", "bsummary", "status", "users", "gsdl", "userschangepasswd",
-             "userschangepasswdok");
+             "userschangepasswdok", "translang");
 
     open MCROFILE, ">$macrofile" or die "MURGH\n";
@@ -120 +135 @@
     close LANGFILE;
     }
+
    
     # if it doesn't have a database file then create one afresh
@@ -125 +141 @@
     $macrofile = $macrodir.$file."2.dm";
     my ($langhash2) = &parse_macrofile($macrofile);
-    $langhash = &combine_hashes($langhash, $langhash2);
-
+     
     &file_to_db($file, $langhash);
-    
+    &file_to_db($file."2", $langhash2);
+
     my $foreign = &dateannotation($file);
     my $foreign2 = &dateannotation($file . "2");
     $foreign = &combine_hashes($foreign, $foreign2);
-
+    
     #finds the differences between the english database (base language)
     #and the supplied languages database and hashes these differences
     #in the form macroname{macrotext}
     my $diffhash = &db_db_diffs($gdbmdir.$baselanguage.".db", $dbfile, $base, $foreign, $baselanguage);
-    #generates HTML code to display user interface on webpage with what needs translation
-    #returns an array of CGI data
-   
-    $file = "indonesian" if ($file =~ m/indo/);
-    $file = "portuguese" if ($file =~ m/port/);
-
-    my @queries = &generate_pages($diffhash, $file, $baselanguage);
-
-}
+    $dbfile = $gdbmdir.$file."2.db";
+    my $diffhash2 = &db_db_diffs($gdbmdir.$baselanguage."2.db", $dbfile, $base, $foreign, $baselanguage);
+
+    $diffhash = &combine_diffhash($diffhash,$diffhash2);
+
+    #open DIFFILE, ">$ENV{'GSDLHOME'}/tmp/lang/diffhash.log" or die "MURGH\n";
+
+    #foreach $key (keys %$diffhash) {
+    #print DIFFILE "$key\n$diffhash->{$key}\n";
+    #print STDERR "$key\n$diffhash->{$key}\n";
+    #}
+    
+    #close DIFFILE;
+    
+    return (\%$diffhash);
+}
+
 
 sub combine_hashes {
@@ -152 +176 @@
     my %combined = ();
 
-    foreach $key (keys %$hash1) {
+    foreach $key (sort (keys %$hash1)) {
     $combined{$key} = $hash1->{$key};
     }
-    foreach $key (keys %$hash2) {
+    foreach $key (sort (keys %$hash2)) {
     $combined{$key} = $hash2->{$key};
+    }
+
+    return (\%combined);
+
+}
+
+sub combine_diffhash {
+    
+    my ($hash1, $hash2) = @_;
+    my %combined = ();
+
+    foreach $key (sort (keys %$hash1)) {
+    $combined{$key} = [$hash1->{$key},"1"];
+    }
+    foreach $key (sort (keys %$hash2)) {
+    $combined{$key} = [$hash2->{$key},"2"];
     }
 
@@ -201 +241 @@
         $macrotext .= $_;
         #hashes the macroname and the macrotext
+        #$macrotext =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+        #&unicode::ascii2utf8($macrotext);
         $macros{$key} = $macrotext;
+
+        #print STDERR "MACROTEXT $macrotext\n" if ($filename =~ m/french/);
     }
     #line in format ## "sometext" ## macro ## macroname ##
@@ -207 +251 @@
         my $macroname = $_;
         #saves the day/month/year
-        my $macrotext = $date[3]. "/" . $date[4] . "/" . $date[5] ."\n";
+        my $macrotext = " ".$date[3]. "/" . $date[4] . "/" . $date[5] ."\n";
                
         unless ($macroname =~ m/^\#\# .*\#\#/) {
@@ -232 +276 @@
         }
 
+        #$macrotext =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+        #&unicode::ascii2utf8($macrotext);
         $macros{$key} = $macrotext;
     }
@@ -237 +283 @@
     }    
     close IN;
+
     
     return (\%macros);
@@ -248 +295 @@
     $file = qx/cd $ENV{'GSDLHOME'}\/macros;cvs annotate $language.dm/;
     @file = split(/\n/,$file);
+    $file = "";
    
     for ($p = 0; $p < scalar(@file); $p++) {
@@ -259 +307 @@
     
     if ($line =~ m/\#\# .*/) {
-               
+        
         unless ($line =~ m/\A\#\# .*\#\#/) {
         $line = $file[++$p];
@@ -281 +329 @@
         $macrodated{$line} = $date;
     }
+    
+        
     }
     
@@ -295 +345 @@
 # has been made generic so that other database files can be
 # updated if the need arises in the future.
+
 sub file_to_db
 {
@@ -307 +358 @@
     tie(%dbhash, 'GDBM_File', $database, 1, 0640) or die "$!";
 
-    foreach $filekey (sort(keys(%$filehash))) {
+    foreach $filekey (sort keys(%$filehash)) {
+        #utf8::encode($foreigntext);
+        #Encode::encode_utf8($foreigntext);
+        
+        # ISO 8859-1 to UTF-8
+        #print STDERR "1 $foreigntext\n";
+        #$filehash->{$filekey} =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+        #&unicode::ascii2utf8($filehash->{$filekey});
+        
+        #print STDERR "FILEHASH $filehash->{$filekey}\n";
+        # UTF-8 to ISO 8859-1
+        #s/([\xC2\xC3])([\x80-\xBF])/chr(ord($1)<<6&0xC0|ord($2)&0x3F)/eg;
+        
+        #$foreigntext = &unicode::ascii2utf8($foreigntext);
+        #print STDERR "2 $foreigntext\n";
+        
         if (!($dbhash{$filekey})) {
         $dbhash{$filekey} = $filehash->{$filekey};
@@ -324 +390 @@
         }
     }
+    
     }
     else { # create the database file for the particular language file...
@@ -361 +428 @@
     tie(%db2hash, "GDBM_File", $db_two, GDBM_READER, 0640);
 
+   
     #the key is the name of the macro
-    foreach $key (sort(keys(%db1hash))) {
+    foreach $key (sort keys(%db1hash)) {
+
     #if the macro isn't there at all, then it's different
     if (!$db2hash{$key}) {
-        $diffhash{$key} = [$db1hash{$key},"",""];
+        $diffhash{$key} = [$db1hash{$key}, "", ""];
     }
     #else if the macro is in both, want to compare date stamps of date hashes HERE
     #and if foreign date is older than base date want to add to diffhash aswell
     else {
+        #print STDERR "$db_one $db_two DATE $key\n";
         $macro = $key;
         $macro =~ s/\A.*:://;
         $bdate = $basedates->{$macro};
-        $fdate = $foreigndates->{$macro};
-        @bdate = split(/-/,$bdate);
-        @fdate = split(/-/,$fdate);
-        if ($bdate[2] >= $fdate[2]) {
-        if ($months{$bdate[1]} >= $months{$fdate[1]}) {
-            if ($bdate[0] > $fdate[0]) {
-            $foreigntext = $db2hash{$key};
-            $foreigntext =~ s/^.*\n//;
-            $foreigntext =~ s/.*\{//;
-            $foreigntext =~ s/\}\Z//;
-
-            $file = qx/cd $ENV{'GSDLHOME'}\/macros;cvs diff -D $fdate $baselanguage.dm/;
-            $file .= qx/cd $ENV{'GSDLHOME'}\/macros;cvs diff -D $fdate $baselanguage"2.dm"/;
-            @file = split(/\n/,$file);
-
-            $found = 1;
-            foreach $key (@file) {
-                if ($key =~ m/$macro/) {
-                if ($key =~ m/\A</) {
-                    $key =~ s/\A<\s*(_\w+_)\s*\{//;
-                    $key =~ s/\}\Z//;
-                    print STDERR "KEY>>>>>||||| $key\n";
-                }
-                $found = 0;
-                }
+        $fdate = "";
+        if ($foreigndates->{$macro}) {
+        $fdate = $foreigndates->{$macro};
+        @fdate = split(/-/,$fdate);
+        @bdate = split(/-/,$bdate);
+        
+        if ($bdate[2] >= $fdate[2]) {
+            if ($months{$bdate[1]} >= $months{$fdate[1]}) {
+            if ($bdate[0] > $fdate[0]) {
+                $foreigntext = $db2hash{$key};
+                $foreigntext =~ s/^.*\n//;
+                $foreigntext =~ s/.*\{//;
+                $foreigntext =~ s/\}\Z//;
+                
+                #$file = qx/cd $ENV{'GSDLHOME'}\/macros;cvs diff -D $fdate $baselanguage.dm/;
+                #$file .= qx/cd $ENV{'GSDLHOME'}\/macros;cvs diff -D $fdate $baselanguage"2.dm"/;
+                #@file = split(/\n/,$file);
+                
+                #$found = 1;
+                #foreach $key (@file) {
+                #    if ($key =~ m/$macro/) {
+                #   if ($key =~ m/\A</) {
+                #       $key =~ s/\A<\s*(_\w+_)\s*\{//;
+                #       $key =~ s/\}\Z//;
+                #       print STDERR "KEY>>>>>||||| $key\n";
+                #   }
+                #   $found = 0;
+                #    }
+                #}
+                #print STDERR "NOTFOUND $macro\n" if ($found);
+                
+                #print STDERR "$bdate $fdate $foreigntext\n";
+                
+                #utf8::encode($foreigntext);
+                #Encode::encode_utf8($foreigntext);
+
+                # ISO 8859-1 to UTF-8
+                #print STDERR "1 $foreigntext\n";
+                #$foreigntext =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+                #&unicode::ascii2utf8($foreigntext);
+        
+                #print STDERR "FOREIGN TEXT $foreigntext\n";
+                # UTF-8 to ISO 8859-1
+                #s/([\xC2\xC3])([\x80-\xBF])/chr(ord($1)<<6&0xC0|ord($2)&0x3F)/eg;
+
+                #$foreigntext = &unicode::ascii2utf8($foreigntext);
+                #print STDERR "2 $foreigntext\n";
+                #print STDERR "HERE $key\n";
+                
+                $diffhash{$key} = [$db1hash{$key}, $foreigntext,""];
             }
-            print STDERR "NOTFOUND $macro\n" if ($found);
-            
-            $diffhash{$key} = [$db1hash{$key}, $foreigntext,""];
             }
         }
         }
-    }
-    }
-
+        else {
+        #print STDERR "THERE $key\n";
+        $foreigntext = $db2hash{$key};
+        #$foreigntext =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+        #&unicode::ascii2utf8($foreigntext);
+        $foreigntext =~ s/^.*\n//;
+        if ($foreigntext =~ m/\A\#\#/) {
+            $foreigntext =~ s/\A\#\#//;
+            $foreigntext =~ s/\#\#(.|\n)*//;
+        }
+        else {
+            $foreigntext =~ s/.*\{//;
+            $foreigntext =~ s/\}\Z//;
+        }
+        #print STDERR "$foreigntext\n";
+        $diffhash{$key} = [$db1hash{$key}, $foreigntext,""];
+        }
+        
+       
+    }
+    }
     untie %db1hash;
     untie %db2hash;
 
     return \%diffhash;    
-}
+} 
 
 
@@ -449 +559 @@
 
     # goes through hash of differences between base language and translation
-    foreach $key (sort(keys(%$datahash))) {
+    foreach $key (sort {$datahash->{$a}[1] <=> $datahash->{$b}[1]
+                ||
+                $datahash->{$a}[0] cmp $datahash->{$b}[0] } keys(%$datahash)) {
+    #print STDERR "$key\n";
     #in the hash of HTML pages, add this key to the current page and initialise it
     #with it's value in the datahash
-    $pagehash->{$pageno}->{$key} = $datahash->{$key};
+    #$datahash->{$key}[0] =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+    #&unicode::ascii2utf8($datahash->{$key}[0]);
+    #print STDERR "DATAHASH KEY $datahash->{$key}[0]\n";
+    $pagehash->{$pageno}->{$key} = [$datahash->{$key}[0],$datahash->{$key}[1]];
     $keysperpage++;
     
@@ -458 +574 @@
     $limit = 7 if(!($key =~ m/_.*\_/g));
     $limit = 7 if($key =~ m/help::_text.*/);
+    $limit = 1 if($key =~ m/translang::_textinitial_/);
     $limit = 3 if($key =~ m/home::.*/);
     $limit = 3 if($key =~ m/gsdl::.*/);
     $limit = 1 if($key =~ m/help::_(.*)texthelp.*/);
     $limit = $keysperpage if ($limit <= $keysperpage);
+
+    #print STDERR "$key $limit $keysperpage\n";
 
     #if have enough keys to generate a page with
@@ -501 +620 @@
     #write thankyou page for language translator once translation is complete
     open THANKYOU, ">$ENV{'GSDLHOME'}/tmp/lang/package_forms/thankyou.lang" or die("MURGH\n");
-    print THANKYOU "<center>Thankyou for completing the $lang translation<p></center>\n";
+    print THANKYOU "<center> _textthanks_ $lang _texttrans_ <p></center>\n";
     close THANKYOU;
 
@@ -518 +637 @@
     my $keynamecount = 1;
 
-    print $fh ("<center>\n",
-           "If an<font color=\"FF0000\"> UPDATED! </font>tag is present a translation already exists,<br>\n",
-           "however it's macro has since been updated.<br>\n",
-           "Please ensure that the current translation provided in the input field is correct.<br>\n",
-           $query->hidden(-name=>"hiddenlanguage",-default=>"$language"),
-           $query->hidden(-name=>"baselanguage",-default=>"$baselanguage"),
-           "<p><table border=\"5\" cellpadding=\"10\">\n",
-           "<tr><td><strong>BASE LANGUAGE FILE<br>",
-           "________________________________</strong></td>\n",
-           "<td><strong>TRANSLATED LANGUAGE<br>",
-           "________________________________</strong></td></tr>\n");
-    
-    
-    foreach $key (sort(keys(%$formhash))) {
-
-    my $text = $formhash->{$key}[0];
-    
+   
+    $first = "true";
+
+    foreach $key (sort {$formhash->{$a}[1] <=> $formhash->{$b}[1]} (keys(%$formhash))) {
+
+    #print STDERR "$key\n";
+
+    my $text = $formhash->{$key}[0][0];
+
     # whole lot of formatting on strings
     # escape all the '_' with '\' so that Greenstone doesn't substitute
@@ -547 +658 @@
     #$date = $&;
     
-    print STDERR "$text\n";
-
-    
-    # must take care of image macros single and multiple line ones
+        # must take care of image macros single and multiple line ones
     $text =~ s/(\<br\>\#\#.*\#\#\s*\<br\>).*/$1/g;
     
@@ -565 +673 @@
     $keynamecount = 1;
     
-    my $default = $formhash->{$key}[1];
-    my $updated = "";
-    $updated = "<font color=\"FF0000\"> UPDATED! </font><br>" if ($default =~ m/\S+/);
+    #utf8::encode($foreigntext);
+    #Encode::encode_utf8($foreigntext);
+    
+    # ISO 8859-1 to UTF-8
+    #$foreigntext =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+    
+    # UTF-8 to ISO 8859-1
+    #s/([\xC2\xC3])([\x80-\xBF])/chr(ord($1)<<6&0xC0|ord($2)&0x3F)/eg;
+    
+    #$foreigntext = &unicode::ascii2utf8($foreigntext);
+                
+    my $default = $formhash->{$key}[0][1];
+    #$default =~ s/([\x80-\xFF])/chr(0xC0|ord($1)>>6).chr(0x80|ord($1)&0x3F)/eg;
+    #&unicode::ascii2utf8($default);
+        
+    print STDERR "DEFAULT $default\n";
+
+    my $priority = $formhash->{$key}[1];
+    
+    if($priority eq "1" and $first eq "true") {
+
+        print $fh ($query->hidden(-name=>"hiddenlanguage",-default=>"$language"),
+               $query->hidden(-name=>"baselanguage",-default=>"$baselanguage"),
+               "</center><img src=\"_httpimg_/core.gif\">",
+               "<table cellpadding=\"10\">\n",
+               "<tr><td><strong><center>".uc $baselanguage."</strong></center></td>\n",
+               "<td><strong><center>". uc $language."</strong></center></td></tr>\n");
+        
+        $first = "been";
+    }
+    if($priority eq "2" and $first eq "true") {
+      print $fh ($query->hidden(-name=>"hiddenlanguage",-default=>"$language"),
+             $query->hidden(-name=>"baselanguage",-default=>"$baselanguage"),
+             "</center><img src=\"_httpimg_/auxiliary.gif\">",
+             "<table cellpadding=\"10\">\n",
+             "<tr><td><strong><center>". uc $baselanguage."</strong></center></td>\n",
+             "<td><strong><center>". uc $language."</strong></center></td></tr>\n");
+        $first = "false";
+    }   
+    if($priority eq "2" and $first eq "been") {
+        print $fh ("</table><br></center><img src=\"_httpimg_/auxiliary.gif\">",
+               "<table cellpadding=\"10\">",
+               "<tr><td><strong><center>".uc $baselanguage."</strong></center></td>\n",
+               "<td><strong><center>". uc $language."</strong></center></td></tr>\n");
+        $first = "false";
+    }
 
         # so that when it is an image only get the text to translate not coding stuff aswell
     if ($text =~ m/\#\# (^|.)*/) {
         if ($& =~ m/".*"/) {
-        print $fh ("<tr><td> $updated $&</td><td>",
+        print $fh ("<tr><td>",
+
+               $query->textfield(-name=>"whocares",
+                         -default=>"$&",
+                         -size=>60,
+                         -readonly=>1),
+               "</td><td>",
                $query->hidden(-name=>"$keyname" . "$keynamecount",-default=>"$`"));
         $keynamecount++;
         print $fh ($query->textfield(-name=>"$keyname" . "$keynamecount",
                          -default=>"$default",
-                         -size=>50));
+                         -size=>60));
         $keynamecount++;
         print $fh ($query->hidden(-name=>"$keyname" . "$keynamecount",-default=>"$'"),
@@ -590 +747 @@
         my $words = scalar(@words);
         my $rows = sprintf("%.0f", $words/5);
-        print $fh ("<tr><td> $updated $text </td><td>\n");
+        print $fh ("<tr><td>");
         if ($rows > 1) {
-            print $fh ($query->textarea(-name=>"$keyname" . "$keynamecount",
+            print $fh ($query->textarea(-name=>"whocares",
+                        -rows=>$rows * 2,
+                        -default=>"$text",
+                        -columns=>50,
+                        -readonly=>1), 
+                   "</td><td>",
+                   $query->textarea(-name=>"$keyname" . "$keynamecount",
                         -rows=>$rows * 2,
                         -default=>"$default",
@@ -599 +762 @@
         }
         else {
-            print $fh ($query->textfield(-name=>"$keyname" . "$keynamecount",
+            print $fh ($query->textfield(-name=>"whocares",
+                         -default=>"$text",
+                         -size=>50,
+                         -readonly=>1),
+                   "</td><td>",
+                   $query->textfield(-name=>"$keyname" . "$keynamecount",
                          -default=>"$default",
                          -size=>50),
@@ -607 +775 @@
     }
     #finishes table and adds a SUBMIT CHANGES option on the end
-    print $fh ("</table>\n", "<br>",
-           "Please ensure your $language translation is correct before proceeding.<br>\n",
-           "Input fields may be left empty if necessary and only those field which<br>\n",
-           "contain a translation will be submitted to the macro file.<br>\n",
-           "Submitting this page will result in the next page being loaded automatically.<br><strong>\n",
-           $query->submit($pageno, 'SUBMIT TRANSLATION >>'),
-           "</strong>","</center>\n");
+    print $fh ("</table>\n", "<br><center>",
+           $query->submit($pageno, "_textsubmit_"),
+           "<br> _textsubmittext_ \n");
 
     # adds the CGI area just written to the array of CGI areas

trunk/gsdl/src/recpt/langaction.cpp

@@ -31 +31 @@
 #include "gsdlunicode.h"
 #include "langdb.h"
+#include "receptionist.h"
 #include "errno.h"
 #include <sys/utsname.h>
-
  
 /*====================*
@@ -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)
@@ -98 +147 @@
 }
 
+
+// set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros
+// reponse contains 1 metadata field (Title)
+
 bool langaction::init (ostream & /*logout*/) {
 
@@ -176 +229 @@
 void langaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
                    response_t &response,text_t &response_data, 
-                   ostream &/*logout*/) {
+                   ostream & logout) {
   response = content;
   response_data = "text/html";
@@ -183 +236 @@
 void langaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
+  
   text_t text = "";
   text_t cmd = "";
@@ -190 +244 @@
   text_t pageno ="";
   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.getcstr() << " 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;
+  
+//    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"];
+  }
+  
+  //sets current base language
+  if (args["baselanguage"] != "") {
+    baselanguage = args["baselanguage"];
+  }
 
   // argument for page is of the form 'macrofile_pageno' so
@@ -199 +307 @@
   if (splitarray.size() > 1)
     pageno = splitarray[splitarray.size()-1];
-  
-  if (pageno == "picklanguage")
+
+  if (pageno == "fromsearch") {
+    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;
+    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 == "picklanguage") {
     pageno = "1";
-  
-  if (pageno.empty())
+    
+    //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;
+//      }
+  }
+
+  //generates the picklanguage page
+  if (pageno.empty()) {
     pageno = "picklanguage";
-
-  //produce the picklanguage webpage
-  if (pageno == "picklanguage") {
+    logout << "@ the 1st pg\n";
     cmd = "perl " + filename_cat(gsdlhome, "bin", "script", "picklanguage.pl");
+    logout << cmd.getcstr() << " PICKLANGUAGE\n" <<endl;
     if(gsdl_system(cmd,true,logout) != 0)
       return;
-    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text);
+    define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text, baselanguage);
+    
     return;
   }
- 
-  //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.getcstr() << " 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
-  if (args["ownchoice"] != "") {
-    lang = args["ownchoice"];
-  }
-  else if (args["hiddenlanguage"] != "") {
-    lang = args["hiddenlanguage"];
-  }
-  else {
-    lang = args["language"];
-  }
-  text_t baselanguage = "";
-
-  //sets current base language
-  if (args["baselanguage"] != "") {
-    baselanguage = args["baselanguage"];
-  }
-  
-  
-  //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;
-  }
-  
+
   //if no more pages will set pageno to thankyou script
   pagenos = get_pagenos(dir,logout);
-  if (pagenos.empty())
+  
+  if (pagenos.empty() && pageno == "")
     pageno = "thankyou";
-  
-
+ 
   text_t &submitargs = args[pageno];
-  text_t submit = "SUBMIT TRANSLATION >>";
+  text_t submit = "SUBMIT TRANSLATION";
   
   //if the SUBMIT TRANSLATION >> button has been pushed
@@ -286 +375 @@
      page_itr != pagenos.end(); 
      page_itr++) {
-      
+      logout << pageno.getcstr() << " page number before" <<endl;
+ 
       if (*page_itr == pageno) {
     page_itr++;
@@ -296 +386 @@
     break;  
       }
+
+      logout << pageno.getcstr() << " page number after" <<endl;
     }
-  }
-  //want it to automatically load the next page here instead of reloading page
-  //that has just been translated with everything empty again.
-  
-  define_webpage(disp, protos, logout, pageno, lang, dir, pagenos, text);
+    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);
 }
 
 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 pageno, text_t &lang, text_t &dir, 
+                 text_tarray &pagenos, text_t &text, text_t &baselanguage) {
   
   // produces HTML page with the current pages contents
@@ -324 +417 @@
   
   /* ============================ START WEB-FORM HTML CODE ============================ */
+  text += "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>";
+
   text += "\n<input type=hidden name=\"a\" value=\"lang\">";
   text += "\n<input type=hidden name=\"p\" value=\"translang_";
@@ -329 +424 @@
   text += "\">\n";
 
-  text += "<strong><br>\n";
-  text += "</center><img src=\"_httpimg_/gsdlhead.gif\"><center><p>";
-  text += "<img src=\"_httpimg_/divb.gif\"><p>";
-  text += "<font size=\"7\">Greenstone Language Translation Facility</font></strong><p>\n";
-           
+  text += "_texttranshead_";       
+
   
   //if not a special case page display translation info
   if ((pageno != "thankyou") && (pageno !="picklanguage")) {
-    text += "<center><strong>You are currently translating page ";
+  
+    logout << "PAGENOS " << pagenos.size() <<endl;
+
+    text += "<center><strong> _textcurrpage_ ";
     text += pageno;
-    text += " of ";
+    text += " _textof_ ";
     text += pagenos.size();
-    text += " in to ";
-    text += lang;
     text += "</strong></center><p><p>\n"; 
   }
   
+  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";
   }
@@ -356 +473 @@
   //if not a special case page display translation info
   if ((pageno != "thankyou") && (pageno != "picklanguage")) {
-    text += "<center><strong>You are currently translating page ";
+    text += "<center><strong> _textcurrpage_ ";
     text += pageno;
-    text += " of ";
+    text += " _textof_ ";
     text += pagenos.size();
-    text += " in to ";
-    text += lang;
-    text += "</strong></center><br>\n";
+    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 = "";
+
+   for (text_tarray::iterator page_itr = pagenos.begin(); 
+    page_itr != pagenos.end(); 
+    page_itr++) {
+     
+     logout << "TEMP2 " << temp2.getcstr() <<endl;
+     logout << "PAGENO " << pageno.getcstr() <<endl;
+
+     if (*page_itr == pageno) {
+       page_itr++;
+       if (page_itr != pagenos.end())
+     temp2 = *page_itr;
+       else
+     temp2 = "thankyou";
+       
+       logout << "TEMP2 " << temp2.getcstr() <<endl;
+       logout << "PAGENO " << pageno.getcstr() <<endl;
+       
+       break;   
+     }
+   }
+
+   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();
   } 
-  
-  
   /* ============================ END WEB-FORM HTML CODE ============================ */
+  
   
   // THE FOLLOWING MACROS ARE DEFINED IN translang.dm MACRO FILE
@@ -375 +556 @@
   //  disp.setmacro("formaction", "translang", "/cgi-bin/dg5/library");
   disp.setmacro("formaction", "translang", "_gwcgi_");
+
+  text_t navigationbar = "<!-- Navigation Bar -->\n";
+  navigationbar += "<table width=\"100%\" cellspacing=0 cellpadding=0>";
+  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";
+  navigationbar += "<!-- End of Navigation Bar -->\n";
+  disp.setmacro ("navigationbar", "translang", navigationbar);
 
 }
@@ -388 +578 @@
       << ("_" + arg_p + ":footer_\n");
 
+  logout << outconvert << disp << ("_" + arg_p + ":header_\n");
+
   return true;
 }
 
 
-
-

trunk/gsdl/src/recpt/langaction.h

@@ -65 +65 @@
   void 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 pageno, text_t &lang, text_t &dir,
+               text_tarray &pagenos, text_t &text, text_t &baselanguage);
     
-
+ 
 };