Changeset 3855

Timestamp:

2003-03-12T11:43:26+13:00 (21 years ago)

Author:

davidb

Message:

General improvements to translator facility.

Location:

trunk/gsdl/bin/script

Files:

• fromsearch.pl (modified) (3 diffs)
• picklanguage.pl (modified) (2 diffs)
• submit_translation.pl (modified) (2 diffs)
• translator.pl (modified) (6 diffs)

trunk/gsdl/bin/script/fromsearch.pl

@@ -53 +53 @@
     $baselanguage = shift(@_);
     
-    $dir = "/research/kde2/gsdl/tmp/lang/gdbmfiles/";
+    $dir = util::filename_cat($ENV{'GSDLHOME'},"tmp","lang","gdbmfiles");
 
     #finds the macroname in the dbfiles
-    my ($formhash) = &db_db_diffs ($dir.$baselanguage.".db", $dir.$language.".db", $macroname);
-    my ($formhash2) = &db_db_diffs($dir.$baselanguage."2.db", $dir.$language."2.db", $macroname);
+    my $db1_blang = util::filename_cat($dir,$baselanguage.".db");
+    my $db1_lang  = util::filename_cat($dir,language.".db");
+    my $db2_blang = util::filename_cat($dir,$baselanguage."2.db");
+    my $db2_lang  = util::filename_cat($dir,language."2.db");
+
+    my ($formhash) = &db_db_diffs ($db1_blang, $db1_lang, $macroname);
+    my ($formhash2) = &db_db_diffs($db2_blang, $db2_lang, $macroname);
 
     #puts results of above calls into one hash
@@ -102 +107 @@
     tie(%db2hash, "GDBM_File", $db_two, GDBM_READER, 0640);
 
-   
     #the key is the name of the macro
     foreach $key (sort keys(%db1hash)) {
@@ -133 +137 @@
 {
     my ($formhash) = shift(@_);
-    open (FILE, ">/research/kde2/gsdl/tmp/lang/package_forms/fromsearch.lang") or die "MURGH FROMSEARCH\n";
+    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(@_);

trunk/gsdl/bin/script/picklanguage.pl

@@ -50 +50 @@
 
     # directory in which to put the generated html pages
-    my $dir = "$ENV{'GSDLHOME'}/tmp/lang/package_forms";
-    # creates directory if it doesn't already exist
-    if (!-e $dir) {
-    my $store_umask = umask(0000);
-    if (! mkdir($dir, 0777)) {
-        umask($store_umask);
-        die "Couldn't create directory $dir\n";
+    my $lang_dir = util::filename_cat($ENV{'GSDLHOME'},"tmp","lang");
+    my $forms_dir = util::filename_cat($lang_dir,"package_forms");
+
+    ## replace next two blocks of code with with util::mk_all_dir() ...
+    util::mk_all_dir($forms_dir);
+ 
+    my @lang_list;
+    my $langlog_fname = util::filename_cat($forms_dir,"languages.log");
+
+    if (!-e $langlog_fname) {
+    # generate one based on content of etc/main.cfg
+    my $maincfg_fname = util::filename_cat($ENV{'GSDLHOME'},"etc","main.cfg");
+
+    open(MCFILE, "<$maincfg_fname") 
+        || die "Unable to open $maincfg_fname: $!\n";
+    my $line;
+    while (defined ($line=<MCFILE>)) {
+        chomp($line);
+        if ($line =~ m/^Language\s+/i) {
+        my @args = split(/ +/,$line);
+        my ($lang_abbr) = ($args[1] =~ m/^shortname=(.*)$/);
+        my ($lang_long) = ($args[2] =~ m/^longname=(.*)$/);
+        push(@lang_list, { 'long' => $lang_long, 'abbr' => $lang_abbr } );
+        }
+
     }
-    umask($store_umask);
+    close MCFILE;
+
+    open(LANGFILE,">$langlog_fname")
+        || die "Unable to create $langlog_fname: $!\n";
+
+    my $l;
+    foreach $l ( @lang_list ) {
+        my $long = lc($l->{'long'});
+        my $abbr = $l->{'abbr'};
+        print LANGFILE "$long\n$abbr\n";
+    }
+    close LANGFILE;
     }
- 
-    open(LANGFILE, "<$dir/languages.log") or die "MURGH\n";
+     
+
+    open(LANGFILE, "<$langlog_fname") 
+    || die "Unable to open $langlog_fname for reading: $!\n";
 
     #reads into the languages array all languages currently in use
@@ -75 +106 @@
 
     #opens a file to write HTML content of the page to
-    open(HTMLFILE, ">$dir/picklanguage.lang") or die "MURGH\n";
+
+    my $picklang_fname = util::filename_cat($forms_dir,"picklanguage.lang");
+
+    open(HTMLFILE, ">$picklang_fname") 
+    || die "Unable to open $picklang_fname: $!\n";
     
     #writes to file the instructions on how to use the interface (_textinitial)

trunk/gsdl/bin/script/submit_translation.pl

@@ -105 +105 @@
 
     foreach $ky (sort {$a <=> $b} keys %foreign) {
-    if ($foreign{$ky} =~ m/package\s*home/) {
+    if ($foreign{$ky} =~ m/package\s+home(\s+|$)/) {
         close MACROOUT;
         open MACROOUT, ">$ENV{'GSDLHOME'}/macros/$language2.dm" or die "MURGH MACROOUT2\n";
@@ -345 +345 @@
     }
 
-    foreach $distinctkey (sort keys %distinctkeys) {
-
-    $key = $distinctkey;
-    $key =~ s/\d+//;
-    $number = $&;
+    for $key (sort keys %distinctkeys) {
     
-    $orderingHASH{$key}{$number} = $distinctkeys{$distinctkey};
-    }
-
-    for $key (sort keys %orderingHASH) {
-    
-    for $number (sort {$a <=> $b} keys %{$orderingHASH{$key}}) {
-        $macrotext .= $orderingHASH{$key}{$number};
-        
-    }
+    $macrotext = $distinctkeys{$key};
+
     #print STDERR "$key\n";
     $macronames{$key} = $macrotext;

trunk/gsdl/bin/script/translator.pl

@@ -312 +312 @@
     #system call which returns one big string containing the whole macro file
     #with each line annotated with the date it was last modified
+    $ENV{'CVS_RSH'}="ssh";
     $file = qx/cd $ENV{'GSDLHOME'}\/macros;cvs annotate $language.dm/;
     #split the file into an array of lines
@@ -590 +591 @@
     my $query = new CGI;
     my $keynamecount = 1;
-   
+
     $first = "true";
 
@@ -662 +663 @@
         #prints to the file two text fields, the left one contains the base language
         #macro text, the right contains the translation language macro text if any exists
-        print $fh ("<tr><td align=center>",
-
-               $query->textfield(-name=>"whocares",
-                         -default=>"$&",
-                         -size=>50,
-                         -readonly=>1),
+
+        my $textbox1;
+        if (1) {
+            $rows = 1 if ($rows < 1);
+            $textbox1 = "<textarea name=\"whocaresh\" rows=\"$rows\" cols=\"50\" readonly=\"1\">";
+            $textbox1 .= "$& </textarea>\n";
+        }
+        else {
+            $textbox1 = $query->textfield(-name=>"whocares",
+                         -default=>"$&",
+                         -size=>50,
+                         -readonly=>1);
+        }
+
+        print $fh ("<tr><td align=center>", $textbox1,
                "</td><td align=center>",
                $query->hidden(-name=>"$keyname" . "$keynamecount",-default=>"$`"));
         $keynamecount++;
-        print $fh ($query->textfield(-name=>"$keyname" . "$keynamecount",
-                         -default=>"$default",
-                         -size=>50));
+
+        my $textbox2;
+        if (1) {
+            $textbox2 = "<textarea name=\"$keyname$keynamecount\" rows=\"$rows\" cols=\"50\">";
+            $textbox2 .= "$default </textarea><br>\n";  
+        }
+        else {
+            $textbox2 = $query->textfield(-name=>"$keyname" . "$keynamecount",
+                          -default=>"$default",
+                          -size=>50);
+        }
+        print $fh $textbox2;
         $keynamecount++;
         print $fh ($query->hidden(-name=>"$keyname" . "$keynamecount",-default=>"$'"),
@@ -689 +708 @@
         #macro text then use this value to determine whether we should use a text area
         #or a text field
-        if ($rows > 1) {
-            #$rows = $rows * 2;
+
+        # Experimenting with textfield and text area
+        # for now use exclusively textareas.
+
+        # if ($rows >= 0) { 
+        if (1) { 
+            $rows = 1 if ($rows < 1);
+
             #prints to the file two text areas, the left one contains the base language
             #macro text, the right contains the translation language macro text if any exists
@@ -704 +729 @@
                    "$default </textarea><br></td></tr>\n");  
             
-            print STDERR "$text \n";
+            #### print STDERR "$text \n";
         }
         else {
@@ -733 +758 @@
     # adds the CGI area just written to the array of CGI areas
     push (@queries, $query);
-    
+
     return $query;
 }