Changeset 9984

Timestamp:

2005-05-30T15:10:41+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now works for non-ASCII documents.

File:

• trunk/gsdl/src/colservr/expat_document.cpp (modified) (4 diffs)

trunk/gsdl/src/colservr/expat_document.cpp

@@ -3 +3 @@
 #include <string.h>
 #include <expat.h>
+#include "gsdlunicode.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -63 +64 @@
   }
 }
-int expat_document(const text_t &filename, const text_t &sec_level, const text_t &sec_num, text_t & doc_content){
 
+
+int expat_document(const text_t &filename, const text_t &sec_level, const text_t &sec_num, text_t & doc_content)
+{
   text_t current_text;
   current_text.clear();
   text_t section_num = sec_num;
   text_t section_level = sec_level;
- 
 
   resultpack rpack = { &current_text, &section_num, &section_level, false};
@@ -76 +78 @@
   read_file(filename, doc_text);
 
-  
-  char * c_doc_text = doc_text.getcstr();
+  char* c_doc_text = doc_text.getcstr();
   XML_Parser parser = XML_ParserCreate(NULL);
   
@@ -97 +98 @@
   XML_ParserFree(parser);
   free(c_doc_text);
-  doc_content.clear();
-  doc_content.append(current_text);
+  doc_content = to_uni(current_text);  // Vital for non-ASCII documents
   return return_status;
 }