Changeset 9215

Timestamp:

2005-02-28T16:00:11+13:00 (19 years ago)

Author:

kjdon

Message:

changed from using global vars to passing in the user data

File:

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

trunk/gsdl/src/colservr/expat_document.cpp

@@ -18 +18 @@
 
 struct resultpack {
-  text_t text;
-  text_t current_section;
+  text_t *current_text;
+  text_t section_num;
+  text_t section_level;
+  bool store_text;
 };
-
-text_t current_text;
-text_t section_num;
-text_t section_level;
-
-bool store_text = false;
 
 
@@ -32 +28 @@
 startElement(void *userData, const char *name, const char **attributes)
 {
+  resultpack * rpack_ptr = (resultpack*)userData;
   text_t element_name = (char*)name;
-  if (element_name == section_level) {
+  if (element_name == rpack_ptr->section_level) {
     text_t id_att = (char *)get_attribute(attributes,"gs2:id");
-    if (id_att == section_num) {
-      store_text = true;
+    if (id_att == rpack_ptr->section_num) {
+      rpack_ptr->store_text = true;
     }
     
@@ -45 +42 @@
 endElement(void *userData, const char *name)
 {
+  resultpack * rpack_ptr = (resultpack*)userData;
   text_t element_name = (char*)name;
-  if (element_name == section_level) {
-    if (store_text == true) {
+  if (element_name == rpack_ptr->section_level) {
+    if (rpack_ptr->store_text == true) {
       // we have finished now, can we quit this??
-      store_text = false;
+      rpack_ptr->store_text = false;
     }
   }
@@ -57 +55 @@
 static void XMLCALL
 characterData(void *userData, const char * text, int len) {
-  if  (store_text) {
-    current_text.appendcarr(text, len);
+  resultpack * rpack_ptr = (resultpack*)userData;
+  if  (rpack_ptr->store_text) {
+    rpack_ptr->current_text->appendcarr(text, len);
   }
 }
 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 current_section;
-  resultpack rpack = { doc_content, current_section };
-  
-  section_num = sec_num;
-  section_level = sec_level;
+  text_t section_num = sec_num;
+  text_t section_level = sec_level;
+ 
+
+  resultpack rpack = { &current_text, section_num, section_level, false};
+  //cerr << "sec num = "<<sec_num<<", sec level="<<sec_level<<", filename="<<filename<<endl;
   text_t doc_text;
   read_file(filename, doc_text);