Changeset 23365

Timestamp:

2010-12-01T14:21:31+13:00 (13 years ago)

Author:

mdewsnip

Message:

Fixed problem in receptionist::append_logstr() where any strings containing multi-byte Unicode characters were truncated because the UTF-8 conversion was bad.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp

@@ -759 +759 @@
                   ostream &logout) {
 
-  utf8outconvertclass text_t2utf8;
   char *lfile = filename.getcstr();
 
@@ -774 +773 @@
   GSDL_LOCK_FILE (fd);
   if (lock_val == 0) {
-    text_t tmp_log_str(logstr); // so we don't pass a const to setinput...
-    text_t2utf8.setinput(&tmp_log_str);
-    char *buffer=new char[logstr.size()];
-    size_t num_chars;
-    convertclass::status_t status;
-    text_t2utf8.convert(buffer, logstr.size(), num_chars, status);
-    // ignore status - assume it is "finished" as buffer is big enough
+    // Write the string out in UTF-8
+    text_t tmp_log_str_utf8 = to_utf8(logstr);
+    char *buffer = tmp_log_str_utf8.getcstr();
+    size_t num_chars = tmp_log_str_utf8.size();
     write(fd, buffer, num_chars);
     GSDL_UNLOCK_FILE (fd);