Changeset 30329 for main/trunk/greenstone2/runtime-src

Timestamp:

2015-12-02T14:39:38+13:00 (8 years ago)

Author:

kjdon

Message:

need to convert the text_t to utf8 before writing out the metadata.xml file

File:

• main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp (modified) (5 diffs)

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

@@ -35 +35 @@
 // following line required to get fstream.filedesc() on darwin (Mac OS X)
 #define _STREAM_COMPAT  1
-
 // required for utsname on solaris???
 #ifndef _XOPEN_SOURCE
@@ -48 +47 @@
 #include "cfgread.h"
 #include "gsdltools.h"
+#include "gsdlunicode.h"
 #include "gsdltimes.h"
 #include "argdb.h"
@@ -372 +372 @@
 
             for (int i = 0; i < numvalues; ++i) {
-              if (!mdvalues[i].empty()) {         
+              if (!mdvalues[i].empty()) {
+                
                 decode_cgi_arg(mdvalues[i]);
-
+                
                 if (cached_metadata_values == "") {
                   cached_metadata_values = "var CachedMDValues = new Array(\\{";
@@ -813 +814 @@
             for (int i = 0; i < numvalues; ++i) {
               if (!mdvalues[i].empty()) {
-                decode_cgi_arg(mdvalues[i]);
+                decode_cgi_arg(mdvalues[i]);
                 metadata_file += "            <Metadata mode=\"accumulate\" name=\"";       
                 metadata_file += args_suffix;
@@ -842 +843 @@
       cerr << "Cannot open metadata.xml!" << endl; 
     } else {
-
+      
       //write metadata.xml
-      metadata.write(metadata_file.getcstr(), metadata_file.size()); 
-      my_tmp.write(metadata_file.getcstr(), metadata_file.size()); 
+      // need to convert to utf8 before writing it out.
+      text_t utf8_meta = to_utf8(metadata_file);
+      metadata.write(utf8_meta.getcstr(), utf8_meta.size()); 
+      my_tmp.write(utf8_meta.getcstr(), utf8_meta.size()); 
     }
 }