Changeset 17533

Timestamp:

2008-10-15T12:27:10+13:00 (16 years ago)

Author:

oranfry

Message:

protect against a particular error message poluting XML output

File:

• gsdl/trunk/perllib/gsprintf.pm (modified) (8 diffs)

gsdl/trunk/perllib/gsprintf.pm

@@ -77 +77 @@
     # Try the default resource bundle next
     if (!defined($utf8string)) {
-    # Load the default resource bundle if it is not already loaded
-    &load_default_resource_bundle() if (!%defaultresourcebundle);
-
-    $utf8string = $defaultresourcebundle{$stringkey};
-    $outputencoding = $defaultoutputencoding;
+    # Load the default resource bundle if it is not already loaded
+    &load_default_resource_bundle() if (!%defaultresourcebundle);
+
+    $utf8string = $defaultresourcebundle{$stringkey};
+    $outputencoding = $defaultoutputencoding;
     }
 
     # Try the English resource bundle last
     if (!defined($utf8string)) {
-    # Load the English resource bundle if it is not already loaded
-    &load_english_resource_bundle() if (!%englishresourcebundle);
-
-    $utf8string = $englishresourcebundle{$stringkey};
-    $outputencoding = $englishoutputencoding;
+    # Load the English resource bundle if it is not already loaded
+    &load_english_resource_bundle() if (!%englishresourcebundle);
+
+    $utf8string = $englishresourcebundle{$stringkey};
+    $outputencoding = $englishoutputencoding;
     }
 
     # No matching string was found, so just return the key
     if (!defined($utf8string)) {
-    return $stringkey;
+    return $stringkey;
     }
 
     # Return the string matching the key
     return $utf8string if (!defined($outputencoding) || $outputstringsinUTF8
-               || $outputencoding eq "utf8");
+               || $outputencoding eq "utf8");
 
     # If an 8-bit output encoding has been defined, encode the string appropriately
@@ -128 +128 @@
     # Read the output encoding to use from the resource bundle
     if ($ENV{'GSDLOS'} =~ /windows/) {
-    $specialoutputencoding = $specialresourcebundle{"{OutputEncoding.windows}"};
+    $specialoutputencoding = $specialresourcebundle{"{OutputEncoding.windows}"};
     }
     else {
-    # see if there is an encoding set in the appropriate locale env var
-
-    foreach my $envvar ('LC_ALL', 'LANG') {
-        if (!exists $ENV{$envvar}) { next }
-        my $locale=$ENV{$envvar};
-        if ($locale !~ /^\w+\.(.+)$/) { next }
-        my $enc=lc($1);
-        $enc =~ s/-/_/g;
-        if ($enc eq 'utf_8') { $enc='utf8' } # normalise to this name
-        $specialoutputencoding = $enc;
-        return;
-    }
-    $specialoutputencoding = $specialresourcebundle{"{OutputEncoding.unix}"};
+    # see if there is an encoding set in the appropriate locale env var
+
+    foreach my $envvar ('LC_ALL', 'LANG') {
+        if (!exists $ENV{$envvar}) { next }
+        my $locale=$ENV{$envvar};
+        if ($locale !~ /^\w+\.(.+)$/) { next }
+        my $enc=lc($1);
+        $enc =~ s/-/_/g;
+        if ($enc eq 'utf_8') { $enc='utf8' } # normalise to this name
+        $specialoutputencoding = $enc;
+        return;
+    }
+    $specialoutputencoding = $specialresourcebundle{"{OutputEncoding.unix}"};
     }
 }
@@ -159 +159 @@
         # $! will still have the error value for the last failed syscall
         print STDERR "$! $resourcebundlefile\n";
-    # set something so we don't bother trying to load it again
-    $defaultresourcebundle{0}=undef; 
+    # set something so we don't bother trying to load it again
+    $defaultresourcebundle{0}=undef; 
         return;
     }
@@ -166 +166 @@
     # Read the output encoding to use from the resource bundle
     if ($ENV{'GSDLOS'} =~ /windows/) {
-    $defaultoutputencoding = $defaultresourcebundle{"{OutputEncoding.windows}"};
+    $defaultoutputencoding = $defaultresourcebundle{"{OutputEncoding.windows}"};
     }
     else {
-    $defaultoutputencoding = $defaultresourcebundle{"{OutputEncoding.unix}"};
+    $defaultoutputencoding = $defaultresourcebundle{"{OutputEncoding.unix}"};
     }
 }
@@ -178 +178 @@
     # Ensure the English resource bundle hasn't already been loaded
     if (%specialresourcebundle && $specialresourcebundle{"{Language.code}"} eq "en") {
-    %englishresourcebundle = %specialresourcebundle;
-    $englishoutputencoding = $specialoutputencoding;
+    %englishresourcebundle = %specialresourcebundle;
+    $englishoutputencoding = $specialoutputencoding;
     }
     
     if ($defaultresourcebundle{"{Language.code}"} &&
-        $defaultresourcebundle{"{Language.code}"} eq "en") {
-    %englishresourcebundle = %defaultresourcebundle;
-    $englishoutputencoding = $defaultoutputencoding;
+        $defaultresourcebundle{"{Language.code}"} eq "en") {
+    %englishresourcebundle = %defaultresourcebundle;
+    $englishoutputencoding = $defaultoutputencoding;
     }
 
@@ -198 +198 @@
     # Read the output encoding to use from the resource bundle
     if ($ENV{'GSDLOS'} =~ /windows/) {
-    $englishoutputencoding = $englishresourcebundle{"{OutputEncoding.windows}"};
+    $englishoutputencoding = $englishresourcebundle{"{OutputEncoding.windows}"};
     }
     else {
-    $englishoutputencoding = $englishresourcebundle{"{OutputEncoding.unix}"};
+    $englishoutputencoding = $englishresourcebundle{"{OutputEncoding.unix}"};
     }
 }
@@ -220 +220 @@
     my %resourcebundle = ();
     foreach my $line (@resourcebundlelines) {
-    # Remove any trailing whitespace
-    $line =~ s/(\s*)$//;
-
-    # Ignore comments and empty lines
-    if ($line !~ /^\#/ && $line ne "") {
-        # Parse key (everything up to the first colon)
-        $line =~ /^([^:]+):(.+)$/;
-        my $linekey = "{" . $1 . "}";
-        my $linetext = $2;
-        $linetext =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d).*$//i;
-
-        # Map key to text
-        $resourcebundle{$linekey} = $linetext;
-    }
+        # Remove any trailing whitespace
+        $line =~ s/(\s*)$//;
+
+        # Ignore comments and empty lines
+        if ($line !~ /^\#/ && $line ne "") {
+            # Parse key (everything up to the first colon)
+            if ($line =~ m/^([^:]+):(.+)$/) {
+                my $linekey = "{" . $1 . "}";
+                my $linetext = $2;
+                $linetext =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d).*$//i;
+
+                # Map key to text
+                $resourcebundle{$linekey} = $linetext;
+            }
+        }
     }
 
@@ -249 +250 @@
 {
     join("",
-     map { $_ > 255 ?                      # if wide character...
-           sprintf("\\x{%04X}", $_) :  # \x{...}
-           chr($_)          
-           } unpack("U*", $_[0]));         # unpack Unicode characters
+     map { $_ > 255 ?                      # if wide character...
+           sprintf("\\x{%04X}", $_) :  # \x{...}
+           chr($_)          
+           } unpack("U*", $_[0]));         # unpack Unicode characters
 }