Changeset 10041

Timestamp:

2005-06-10T10:58:10+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a check to prevent an infinite loop when reading badly formatted macrofiles, and other minor changes.

File:

• trunk/gsdl/bin/script/gti.pl (modified) (5 diffs)

trunk/gsdl/bin/script/gti.pl

@@ -323 +323 @@
     # The query string
     my $query_string = join(' ', @_);
-    # &log_message("Query string: $query_string");
 
     # Check that the necessary arguments were supplied
@@ -501 +500 @@
     # Apply the submitted translations
     foreach my $chunk_key (keys(%target_file_key_to_submission_mapping)) {
+    # Only apply the submission if it is a change, unless -force_submission has been specified
     if ($force_submission_flag || $target_file_key_to_submission_mapping{$chunk_key} ne $target_file_key_to_text_mapping{$chunk_key}) {
         $target_file_key_to_text_mapping{$chunk_key} = $target_file_key_to_submission_mapping{$chunk_key};
@@ -553 +553 @@
 
     foreach my $translation_file (@$gti_translation_files) {
-    # Have we found the correct translation file?
-    if ($translation_file_key eq $translation_file->{'key'}) {
-        # Resolve the target language file
-        my $target_language_file = $translation_file->{'target_file'};
-        if ($target_language_file =~ /(\{.+\;.+\})/) {
-        my $unresolved_target_language_file_part = $1;
-
-        # Check for a special case for the target language code
-        if ($unresolved_target_language_file_part =~ /(\{|\;)$target_language_code:([^\;]+)(\;|\})/) {
-            my $resolved_target_language_file_part = $2;
-            $target_language_file =~ s/$unresolved_target_language_file_part/$resolved_target_language_file_part/;
-        }
-        # Otherwise use the last part as the default value
-        else {
-            my ($default_target_language_file_part) = $unresolved_target_language_file_part =~ /([^\;]+)\}/;
-            $target_language_file =~ s/$unresolved_target_language_file_part/\{$default_target_language_file_part\}/;           
-        }
+    # If this isn't the correct translation file, move onto the next one
+    next if ($translation_file_key ne $translation_file->{'key'});
+
+    # Resolve the target language file
+    my $target_language_file = $translation_file->{'target_file'};
+    if ($target_language_file =~ /(\{.+\;.+\})/) {
+        my $unresolved_target_language_file_part = $1;
+
+        # Check for a special case for the target language code
+        if ($unresolved_target_language_file_part =~ /(\{|\;)$target_language_code:([^\;]+)(\;|\})/) {
+        my $resolved_target_language_file_part = $2;
+        $target_language_file =~ s/$unresolved_target_language_file_part/$resolved_target_language_file_part/;
         }
-
-        # Resolve instances of {iso_639_1_target_language_name}
-        my $iso_639_1_target_language_name = $iso639::fromiso639{$target_language_code};
-        $iso_639_1_target_language_name =~ tr/A-Z/a-z/ if $iso_639_1_target_language_name;
-        $target_language_file =~ s/\{iso_639_1_target_language_name\}/$iso_639_1_target_language_name/g;
-
-        # Resolve instances of {target_language_code}
-        $target_language_file =~ s/\{target_language_code\}/$target_language_code/g;
-
-        return ($translation_file->{'source_file'}, $target_language_file, $translation_file->{'file_type'});
-    }
+        # Otherwise use the last part as the default value
+        else {
+        my ($default_target_language_file_part) = $unresolved_target_language_file_part =~ /([^\;]+)\}/;
+        $target_language_file =~ s/$unresolved_target_language_file_part/\{$default_target_language_file_part\}/;           
+        }
+    }
+
+    # Resolve instances of {iso_639_1_target_language_name}
+    my $iso_639_1_target_language_name = $iso639::fromiso639{$target_language_code};
+    $iso_639_1_target_language_name =~ tr/A-Z/a-z/ if $iso_639_1_target_language_name;
+    $target_language_file =~ s/\{iso_639_1_target_language_name\}/$iso_639_1_target_language_name/g;
+
+    # Resolve instances of {target_language_code}
+    $target_language_file =~ s/\{target_language_code\}/$target_language_code/g;
+
+    return ($translation_file->{'source_file'}, $target_language_file, $translation_file->{'file_type'});
     }
 
@@ -737 +737 @@
     my @target_file_keys_requiring_translation = ();
     foreach my $chunk_key (keys(%$source_file_key_to_text_mapping)) {
-    if (!$target_file_key_to_text_mapping->{$chunk_key} && $source_file_key_to_text_mapping->{$chunk_key}) {
+    if ($source_file_key_to_text_mapping->{$chunk_key} && !$target_file_key_to_text_mapping->{$chunk_key}) {
         # &log_message("Chunk with key $chunk_key needs translating.");
         push(@target_file_keys_requiring_translation, $chunk_key);
@@ -854 +854 @@
         while ($line !~ /\}$/) {
         $i++;
+        if ($i == scalar(@file_lines)) {
+            &throw_fatal_error("Could not find end of macro $macro_key.");
+        }
         $line = $file_lines[$i];
         $line =~ s/\s*([^\\]\#.+)?$//;  # Remove any comments and nasty whitespace