Changeset 28949 for main

Timestamp:

2014-03-24T17:29:19+13:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed an encoding issue in the depositor, where if you enter utf8 characters into metadata on one page and then click the wizardbutton to go back to the previous page of the wizard, then the character looked wrong (split into 2 parts).

File:

• main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp (modified) (1 diff)

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

@@ -129 +129 @@
       
           if (args_prefix == macro_prefix) {
-            saved_args[args_name] = args[args_name];
+            // the saved_args are destined to be saved in the database.
+            // our database code assumes keys and values are in unicode code-point form
+            // for e.g. 'a macron' is a code-point of 257 in utf-16, represented as a u-short 
+            // and not the 2 bytes version (0xC4 0x81) which is utf-8.
+            saved_args[args_name] = to_uni(args[args_name]);
           } 
       }