X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=SXSIStorageInterface.cpp;h=43ea1551518b05009d74a5ac8c7f74b6a6c2be58;hb=70ff0bfc463882ecf233f1b1a7ac4a8007fa4cc2;hp=d770d7e044be60816fa42f915fc7c65ff62cc881;hpb=83aa6cf8a120ea6681402ce42ae56631fca1ddf4;p=SXSI%2Fxpathcomp.git

diff --git a/SXSIStorageInterface.cpp b/SXSIStorageInterface.cpp
index d770d7e..43ea155 100644
--- a/SXSIStorageInterface.cpp
+++ b/SXSIStorageInterface.cpp
@@ -11,11 +11,11 @@
 #include "SXSIStorageInterface.h"
 #include "Utils.h"
 
-
 SXSIStorageInterface::SXSIStorageInterface(int sf,bool iet,bool dtc)
 {
-  tree = new XMLTree();
-  tree->OpenDocument(iet,sf,dtc);
+  tree = NULL;
+  tb = new XMLTreeBuilder();
+  tb ->OpenDocument(iet,sf,dtc);
 }
 
 SXSIStorageInterface::~SXSIStorageInterface()
@@ -25,35 +25,29 @@ SXSIStorageInterface::~SXSIStorageInterface()
 void SXSIStorageInterface::newChild(string name)
 { 
   _new_child++;
-  tree->NewOpenTag((unsigned char*) name.c_str());
+  tb->NewOpenTag((unsigned char*) name.c_str());
 }
 
 
 void SXSIStorageInterface::newText(string text)
 {
 
-  if (text.empty()) {
-    _new_empty_text++;
-    tree->NewEmptyText();
-  }
-  else {
-    _new_text++;
-    _length_text += text.size();
-    tree->NewText((unsigned char*) text.c_str());  
-  }
+  _new_text++;
+  _length_text += text.size();
+  tb->NewText((unsigned char*) text.c_str());
 }
 
 
 void SXSIStorageInterface::nodeFinished(string name)
 {  
-  tree->NewClosingTag((unsigned char*) name.c_str());
+  tb->NewClosingTag((unsigned char*) name.c_str());
 
 }	      
 	      
   void SXSIStorageInterface::parsingFinished()
 {
 
-  tree->CloseDocument();
+  tree = tb->CloseDocument();
  	
 }
 
@@ -64,6 +58,7 @@ void *SXSIStorageInterface::returnDocument(){
   return ((void *) tree);
   
 }
+
 void SXSIStorageInterface::printStats(){
   std::cerr << "Parsing stats :  \n";
   std::cerr << _new_child << " calls to newOpenTag/newClosingTag\n";