Changeset 9216

Timestamp:

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

Author:

kjdon

Message:

a few changes to make it compile on windows - changed the text_t inside the resultpack to text_t*

File:

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

trunk/gsdl/src/colservr/expat_document.cpp

@@ -1 +1 @@
 #include <string.h>
 #include <expat.h>
-
-#include "expat_document.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -13 +11 @@
 #endif
 
+#include "queryinfo.h"
+
+#include "expat_document.h"
+
 #include "text_t.h"
 #include "fileutil.h"
@@ -19 +21 @@
 struct resultpack {
   text_t *current_text;
-  text_t section_num;
-  text_t section_level;
+  text_t *section_num;
+  text_t *section_level;
   bool store_text;
 };
-
 
 static void XMLCALL 
@@ -30 +31 @@
   resultpack * rpack_ptr = (resultpack*)userData;
   text_t element_name = (char*)name;
-  if (element_name == rpack_ptr->section_level) {
+  if (element_name == *(rpack_ptr->section_level)) {
     text_t id_att = (char *)get_attribute(attributes,"gs2:id");
-    if (id_att == rpack_ptr->section_num) {
+    if (id_att == *(rpack_ptr->section_num)) {
       rpack_ptr->store_text = true;
     }
@@ -44 +45 @@
   resultpack * rpack_ptr = (resultpack*)userData;
   text_t element_name = (char*)name;
-  if (element_name == rpack_ptr->section_level) {
+  if (element_name == *(rpack_ptr->section_level)) {
     if (rpack_ptr->store_text == true) {
       // we have finished now, can we quit this??
@@ -68 +69 @@
  
 
-  resultpack rpack = { &current_text, section_num, section_level, false};
+  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;
@@ -83 +84 @@
   const int parse_status 
     = XML_Parse(parser, c_doc_text, strlen(c_doc_text), XML_TRUE);
-
+  
   if (parse_status == XML_STATUS_ERROR) {
     fprintf(stderr,