X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.cpp;h=99d03954a55e94fbbae1d7bfebc0dd5bca488e28;hb=79d19dd14db25dd04e9fc9e0137ce9e8c6e4744f;hp=ae80fc2a489680d270c6fba2d59939a8c9bddc00;hpb=b53633fb64f387edb5cebefbb3308b6347b2389c;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.cpp b/XMLTree.cpp
index ae80fc2..99d0395 100644
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -212,19 +212,18 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
     s_tree+= XML_Tree->Tags->size();
 
 		/// FIXME:UGLY tests!
-		/*uint * seq = new uint[XML_Tree->tags_len];
+		uint * seq = new uint[XML_Tree->tags_len];
 		for(uint i=0;i<XML_Tree->tags_len;i++)
 			seq[i] = get_field(XML_Tree->tags_fix,XML_Tree->tags_blen,i);
 		cout << "Tags test: " << XML_Tree->Tags->test(seq,XML_Tree->tags_len) << endl;
-		delete [] seq;*/
+		delete [] seq;
 		/// End ugly tests
 
     s_text = ftell(fp);
 
     // 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
  }
@@ -1041,9 +1044,9 @@ int XMLTree::CloseDocument()
 
     // If we found an attribute then "<@>" is present in the tree
     // if we didn't then it is not. "<$>" is never present in the tree
-		//uint max_tag = 0;
-		//for(uint i=0;i<(uint)npar-1;i++)
-		//	max_tag = max(max_tag,tags_aux[i]);
+		uint max_tag = 0;
+		for(uint i=0;i<(uint)npar-1;i++)
+			max_tag = max(max_tag,tags_aux[i]);
 		//max_tag++;
 		//tags_aux = (TagType *) urealloc(tags_aux, sizeof(TagType)*(npar + 1));
 		//tags_aux[npar++] = max_tag;
@@ -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    
  }