X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.cpp;h=70cf4b77847aa58f7bf156e7e98f826bdeafb32e;hb=deeb5434b7e061741700eff08588539d34b717a6;hp=8f8739d282075902db75097245923c8b38a2c4e4;hpb=016317b1e519d67177bf606b83f17f386caace9b;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.cpp b/XMLTree.cpp
index 8f8739d..70cf4b7 100644
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -223,8 +223,7 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
 
     // loads the texts
     if (!XML_Tree->disable_tc){
-      XML_Tree->Text = TextCollection::InitTextCollection(sample_rate_text);
-      XML_Tree->Text->Load(fp,sample_rate_text);
+      XML_Tree->Text = TextCollection::Load(fp,sample_rate_text);
       int sst;
       int st;
       ufread(&sst, sizeof(int),1,fp);
@@ -284,7 +283,9 @@ XMLTree::~XMLTree()
     Tags = NULL;
 
     //Text->~TextCollection();
-    delete Text;
+    delete TextBuilder; 
+    TextBuilder = NULL;
+    delete Text; 
     Text = NULL;
 
     initialized = false;
@@ -1013,9 +1014,11 @@ int XMLTree::OpenDocument(bool empty_texts, int sample_rate_text,bool dtc)
     if (!indexing_empty_texts) 
       empty_texts_aux = (unsigned int *)umalloc(sizeof(unsigned int));
        
-    
-    
-    Text = TextCollection::InitTextCollection((unsigned)sample_rate_text);
+    if (disable_tc)
+        TextBuilder = 0;
+    else 
+        TextBuilder = new TextCollectionBuilder((unsigned)sample_rate_text);
+    Text = 0;
     
     return 1;  // indicates success in the initialization of the data structure
  }
@@ -1073,10 +1076,16 @@ int XMLTree::CloseDocument()
     //delete ssb;
 
     
-		// makes the text collection static
+    // makes the text collection static
     if (!disable_tc)
-      Text->MakeStatic();
-    
+    {
+        assert(Text = 0);
+        assert(TextBuilder != 0);
+        Text = TextBuilder->InitTextCollection();
+        delete TextBuilder;
+        TextBuilder = 0;
+    }
+
     // creates the data structure marking the non-empty texts (just in the case it is necessary)
     if (!indexing_empty_texts)  {
        EBVector = new static_bitsequence_rrr02((uint *)empty_texts_aux,(ulong)npar,(uint)32);
@@ -1214,7 +1223,7 @@ int XMLTree::NewText(unsigned char *s)
               bitset(empty_texts_aux, npar-1);  // marks the non-empty text with a 1 in the bit vector
     }
     
-    Text->InsertText(s);
+    TextBuilder->InsertText(s);
     string cpps = (char*) s;
     CachedText.push_back(cpps); 
     
@@ -1239,7 +1248,7 @@ int XMLTree::NewEmptyText()
        
        bitclean(empty_texts_aux, npar-1);  // marks the empty text with a 0 in the bit vector
     }
-    else Text->InsertText(&c); // we insert the empty text just in case we index all the texts
+    else TextBuilder->InsertText(&c); // we insert the empty text just in case we index all the texts
     
     return 1; // success    
  }