Changeset 3351

Timestamp:

2002-08-13T17:25:35+12:00 (22 years ago)

Author:

jrm21

Message:

If a message is in an unsupported encoding, we assume iso8859-1. Otherwise
we lose all the header metadata, etc, as everything gets converted to "".

File:

• trunk/gsdl/perllib/plugins/EMAILPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -817 +817 @@
       }
   }
-  $$textref=&unicode::unicode2utf8(&unicode::convert2unicode($charset,$textref));
+  my $utf8_text=&unicode::unicode2utf8(&unicode::convert2unicode($charset,$textref));
+
+  if ($utf8_text ne "") {
+      $$textref=$utf8_text;
+  } else {
+      # we didn't get any text... unsupported encoding perhaps? Or it is
+      # empty anyway. We'll try to continue, assuming 8859-1. We could strip
+      # characters out here if this causes problems...
+      $$textref=&unicode::unicode2utf8(&unicode::convert2unicode("iso_8859_1",$textref));
+
+  }
 }