Changeset 8102 for trunk/gsdl/perllib

Timestamp:

2004-09-08T13:34:23+12:00 (20 years ago)

Author:

mdewsnip

Message:

Unfinished, but I'm committing it now so I don't lose it.

File:

• trunk/gsdl/perllib/translator.pm (modified) (16 diffs)

trunk/gsdl/perllib/translator.pm

@@ -55 +55 @@
 sub read_languages_from_main_cfg_file
 {
-    local %name2abbrhash = ();
+    local %code2namehash = ();
 
     # Read the main.cfg file
@@ -68 +68 @@
     # Parse the lines containing a language definition
     if ($line =~ m/^Language\s+/i) {
-        local @lineparts = split(/\s+/, $line);
-        local ($langabbr) = ($lineparts[1] =~ m/^shortname=(.*)$/);
-        local ($langname) = ($lineparts[2] =~ m/^longname=(.*)$/);
-
-        # Casefold language name and code
-        $langabbr =~ tr/A-Z/a-z/;
-        $langname =~ tr/A-Z/a-z/;
-
-        $name2abbrhash{$langname} = $langabbr;
+        local ($langcode) = ($line =~ /shortname=(\S+)/i);
+        local ($langname) = ($line =~ /longname=(\"[^\"]+\"|\S+)/i);
+
+        # Casefold the language code, and remove any quotes around the language name
+        $langcode =~ tr/A-Z/a-z/;
+        $langname =~ s/^\"(.+)\"$/$1/;
+
+        $code2namehash{$langcode} = $langname;
     }
     }
     close(MAIN_CFG_FILE);
 
-    return %name2abbrhash;
+    return %code2namehash;
 }
 
@@ -100 +99 @@
     # Check if a file is being defined
     if ($line =~ m/^File\s+/i) {
-        local @lineparts = split(/\s+/, $line);
-        local ($fileid) = ($lineparts[1] =~ m/^id=(.*)$/i);
-        local ($filedesc) = ($lineparts[2] =~ m/^description=(.*)$/i);
+        local ($fileid) = ($line =~ /id=(\S+)/i);
+        local ($filedesc) = ($line =~ /description=(\S+)/i);
         $name2deschash{$fileid} = $filedesc;
     }
@@ -114 +112 @@
 sub read_file_data_from_config_file
 {
-    my ($sourcelang, $sourceabbr, $targetlang, $targetabbr, $file) = @_;
+    my ($sourceabbr, $targetabbr, $file) = @_;
 
     # Read the translator config file
@@ -137 +135 @@
         local ($filetype) = ($lineparts[5] =~ m/^type=(.*)$/);
 
-        # Resolve instances of {sourcelang}, {sourceabbr}, {targetlang}, {targetabbr}
-        $sourcefile =~ s/\{sourcelang\}/$sourcelang/g;
+        # Determine sourcebase and targetbase, using the filetype
+        local $sourcebase = &get_file_base($sourceabbr, $filetype);
+        local $targetbase = &get_file_base($targetabbr, $filetype);
+
+        # Resolve instances of {sourceabbr}, {sourcebase}, {targetabbr}, {targetbase}
         $sourcefile =~ s/\{sourceabbr\}/$sourceabbr/g;
-        $targetfile =~ s/\{targetlang\}/$targetlang/g;
+        $sourcefile =~ s/\{sourcebase\}/$sourcebase/g;
         $targetfile =~ s/\{targetabbr\}/$targetabbr/g;
+        $targetfile =~ s/\{targetbase\}/$targetbase/g;
 
         close(CONFIG_FILE);
@@ -164 +166 @@
 
 
+sub get_file_base
+{
+    my ($langabbr, $filetype) = @_;
+
+    if ($filetype =~ /^macrofile/) {
+    return &get_macrofile_base($langabbr);
+    }
+    if ($filetype =~ /^resourcebundle/ || $filetype =~ /^myresourcebundle/) {
+    return &get_resource_bundle_base($langabbr);
+    }
+
+    print STDERR "Error: Unknown file type $filetype.\n";
+    die "\n";
+}
+
+
 sub process_file
 {
@@ -185 +203 @@
     if ($filetype =~ /^resourcebundle/) {
     return &build_key_to_line_mapping_for_resource_bundle($filepath);
+    }
+    if ($filetype =~ /^myresourcebundle/) {
+    return &build_key_to_line_mapping_for_my_resource_bundle($filepath);
     }
 
@@ -232 +253 @@
     if ($filetype =~ /^resourcebundle/) {
     return &import_chunk_from_resource_bundle($chunktext);
+    }
+    if ($filetype =~ /^myresourcebundle/) {
+    return &import_chunk_from_my_resource_bundle($chunktext);
     }
 
@@ -323 +347 @@
 # ==========================================================================================
 
+sub get_macrofile_base
+{
+    local ($langcode) = @_;
+
+    # List special cases here (macrofile names differ from language longnames)
+    local %specialcases = ('id', 'indo',
+               'pt-br', 'port-br',
+               'pt-pt', 'port-pt',
+               'zh', 'chinese' );
+
+    # Special cases override main.cfg entries
+    if ($specialcases{$langcode}) {
+    return $specialcases{$langcode};
+    }
+
+    # Use the language name defined in the main.cfg file as the macrofile name
+    my %langhash = &read_languages_from_main_cfg_file();
+    my $langname = $langhash{$langcode} || die "Error: Language to base mapping undefined!\n";
+    $langname =~ tr/A-Z/a-z/;
+    return $langname;
+}
+
+
 sub build_key_to_line_mapping_for_macrofile
 {
@@ -355 +402 @@
         # While there is still text of the macro to go...
         local $startline = $i;
-        while ($line !~ /.*\}/) {
+        while ($line !~ /\}$/) {
         $i++;
         $line = $lines[$i];
+        $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
         }
 
@@ -373 +421 @@
         local $startline = $i;
         unless ($line =~ m/^\#\# .*\#\#/) {
-        $line = $lines[++$i];
+        $i++;
+        $line = $lines[$i];
         $macroname .= $line;
         }
@@ -383 +432 @@
 
         # Read the rest of the text associated with the image macro
-        while ($line !~ /^\s*$/) {
+        while (defined($line) && $line !~ /^\s*$/) {
         $i++;
         $line = $lines[$i];
@@ -404 +453 @@
 
     # Is this an icon macro??
-    if ($chunktext =~ m/^\#\# (.*)/) {
+    if ($chunktext =~ /^\#\# (.*)/) {
     # Extract image macro text
-    $chunktext =~ s/^\#\# ((.|\n)+) \#\# (.+) \#\# (.|\n)+/$1/;
+    $chunktext =~ /^\#\#\s+([^\#]+)\s+\#\#/;
+    $chunktext = $1;
 
     # Remove enclosing quotes
-    $chunktext =~ s/^\s*\"((.|\n)+)\"\s*/$1/;
+    $chunktext =~ s/^\"//;
+    $chunktext =~ s/\"$//;
     }
 
@@ -430 +481 @@
 # ------------------------------------------------------------------------------------------
 
+sub get_resource_bundle_base
+{
+    local ($langabbr) = @_;
+
+    return "";
+}
+
+
 sub build_key_to_line_mapping_for_resource_bundle
 {
@@ -451 +510 @@
 
     # Line contains a dictionary string
-    if ($line =~ m/^((\w|\.)+):/) {
+    if ($line =~ /^((\w|\.)+):(.*)$/) {
         local $key = $1;
 
@@ -474 +533 @@
 
 
+
+# ------------------------------------------------------------------------------------------
+
+sub build_key_to_line_mapping_for_my_resource_bundle
+{
+    local ($filepath) = @_;
+
+    # Open file for reading
+    if (!open(FILE_IN, "<$filepath")) {
+    print STDERR "Error: Could not open resource bundle $filepath.\n";
+    die "\n";
+    }
+    local @lines = <FILE_IN>;
+    close FILE_IN;
+
+    # Initialise some local variables
+    local %linehash = ();
+
+    # Process the contents of the file, line by line
+    for ($i = 0; $i < scalar(@lines); $i++) {
+    local $line = $lines[$i];
+    $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
+
+    # Line contains a dictionary string
+    if ($line =~ /^((\w|\.|\-)+):\"(.*)$/) {
+        local $key = $1;
+        local $text = $3;
+
+        # While there is still text of the chunk to go...
+        local $startline = $i;
+        while ($text !~ /\"$/ || $text =~ /\\\"$/) {
+        $i++;
+        $text = $lines[$i];
+        }
+
+        $linehash{$key} = $startline . "-" . $i;
+    }
+    }
+
+    return %linehash;
+}
+
+
+sub import_chunk_from_my_resource_bundle
+{
+    local ($chunktext) = @_;
+
+    # Remove chunk key and quotes
+    $chunktext =~ s/^((\w|\.|\-)+)://;
+    $chunktext =~ s/^\"//;
+    $chunktext =~ s/\"$//;
+
+    return $chunktext;
+}
+
+
 1;