Changeset 13372 for trunk/cic-hcap

Timestamp:

2006-11-29T14:35:04+13:00 (17 years ago)

Author:

mdewsnip

Message:

Fixed a couple of encoding problems.

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (2 diffs)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -1042 +1042 @@
     $metadata_name =~ s/ /_/g;
 
-    # Anything from the database is ISO 8859-1 encoded, so convert to UTF-8
-    $metadata_value = &unicode::ascii2utf8(\$metadata_value);
+    # Anything from the database is Windows-1252 encoded, so convert to UTF-8
+    $metadata_value = &unicode::unicode2utf8(&unicode::convert2unicode("windows_1252", \$metadata_value));
 
     # Escape any '[' and ']' characters so Greenstone doesn't try to treat the text as metadata...
@@ -1292 +1292 @@
         $anchor_name = $letter;
     }
-    print BROWSER_MACROFILE &get_static_browser_macro_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
+    my $static_browser_macro_chunk = &get_static_browser_macro_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
+    print BROWSER_MACROFILE &unicode::unicode2utf8(&unicode::convert2unicode("windows_1252", \$static_browser_macro_chunk));
     }
     print BROWSER_MACROFILE "</table>\n";