X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTreeBuilder.cpp;h=68c5bf3e5db8513394c3bce65317e089996e82a1;hb=aad0ef1d1e05d23d3466e263160cda0a8fdf6866;hp=9c7e3f6c941a008be31182d233d76d46d96a00ee;hpb=19534e3089bc0c36bc50e5e522c145e73dcda9cc;p=SXSI%2FXMLTree.git

diff --git a/XMLTreeBuilder.cpp b/XMLTreeBuilder.cpp
index 9c7e3f6..68c5bf3 100644
--- a/XMLTreeBuilder.cpp
+++ b/XMLTreeBuilder.cpp
@@ -4,13 +4,16 @@
 using std::string;
 
 XMLTreeBuilder::~XMLTreeBuilder(){
-  
+  //free(par_aux);
+  free(tags_aux);
+  //delete other stuff.
+
 }
 
 // OpenDocument(empty_texts): it starts the construction of the data structure for
 // the XML document. Parameter empty_texts indicates whether we index empty texts
 // in document or not. Returns a non-zero value upon success, NULLT in case of error.
-int XMLTreeBuilder::OpenDocument(bool empty_texts, 
+int XMLTreeBuilder::OpenDocument(bool empty_texts,
 				 int sample_rate_text,
 				 bool dtc,
 				 TextCollectionBuilder::index_type_t index_type)
@@ -20,11 +23,11 @@ int XMLTreeBuilder::OpenDocument(bool empty_texts,
     disable_tc = dtc;
     text_index_type = index_type;
     STARTTIMER();
-   
+
     par_aux = (pb *)umalloc(sizeof(pb)*parArraySize);
-    
+
     tags_aux = (TagType *) umalloc(sizeof(TagType));
-    
+
     TagName = new vector<string>();
     tIdMap = new std::unordered_map<string,int>();
 
@@ -41,7 +44,7 @@ int XMLTreeBuilder::OpenDocument(bool empty_texts,
 
     if (disable_tc)
         TextBuilder = 0;
-    else 
+    else
         TextBuilder = TextCollectionBuilder::create((unsigned)sample_rate_text, index_type);
 
     Text = 0;
@@ -51,16 +54,16 @@ int XMLTreeBuilder::OpenDocument(bool empty_texts,
  }
 
 // CloseDocument(): it finishes the construction of the data structure for the XML
-// document. Tree and tags are represented in the final form, dynamic data 
-// structures are made static, and the flag "finished" is set to true. After that, 
+// document. Tree and tags are represented in the final form, dynamic data
+// structures are made static, and the flag "finished" is set to true. After that,
 // the data structure can be queried.
 XMLTree *XMLTreeBuilder::CloseDocument()
- {    
+ {
     //closing parenthesis for the tree root
     //par_aux = (pb *)urealloc(par_aux, sizeof(pb)*(1+npar/(8*sizeof(pb))));
     //setbit(par_aux, npar, CP);
     //npar++;
-    
+
     // makes the text collection static
    STOPTIMER(Parsing);
    PRINTTIME("Parsing XML Document", Parsing);
@@ -76,17 +79,19 @@ XMLTree *XMLTreeBuilder::CloseDocument()
        PRINTTIME("Building TextCollection", Building);
 
     }
-    
+
     XMLTree *T = new XMLTree(par_aux,
-			     npar, 
+			     npar,
 			     TagName,
 			     tIdMap,
-			     empty_texts_aux,                // freed by the constructor
-			     tags_aux,                       //freed by the constructor
+			     empty_texts_aux, // freed by the constructor
+			     tags_aux,        // freed by the constructor
 			     Text,
 			     disable_tc,
 			     text_index_type);
-    return T; 
+    tags_aux = 0;
+    empty_texts_aux = 0;
+    return T;
  }
 
 
@@ -96,17 +101,17 @@ XMLTree *XMLTreeBuilder::CloseDocument()
 int XMLTreeBuilder::NewOpenTag(string tagname)
  {
     int i;
-    
+
     // inserts a new opening parentheses in the bit sequence
     if (sizeof(pb)*8*parArraySize == npar) { // no space left for the new parenthesis
        par_aux = (pb *)urealloc(par_aux, sizeof(pb)*2*parArraySize);
        parArraySize *= 2;
     }
-    
+
     setbit(par_aux,npar,OP);  // marks a new opening parenthesis
-    
+
     TagIdMapIT tag_id = tIdMap->find(tagname);
-   
+
     if (tag_id == tIdMap->end()){
       REGISTER_TAG(TagName,tIdMap,tagname);
       i = TagName->size() - 1;
@@ -117,14 +122,14 @@ int XMLTreeBuilder::NewOpenTag(string tagname)
     if (tagname.compare(PCDATA_OPEN_TAG) == 0 ||
 	tagname.compare(ATTRIBUTE_DATA_OPEN_TAG) == 0){
     };
-    
+
     tags_aux = (TagType *) urealloc(tags_aux, sizeof(TagType)*(npar + 1));
-    
+
     tags_aux[npar] = i; // inserts the new tag id within the preorder sequence of tags
-    
+
     npar++;
-    
-    return 1; // success    
+
+    return 1; // success
  }
 
 
@@ -134,18 +139,18 @@ int XMLTreeBuilder::NewOpenTag(string tagname)
 int XMLTreeBuilder::NewClosingTag(string tagname)
  {
     int i;
-    
+
     // inserts a new closing parentheses in the bit sequence
     if (sizeof(pb)*8*parArraySize == npar) { // no space left for the new parenthesis
        par_aux = (pb *)urealloc(par_aux, sizeof(pb)*2*parArraySize);
        parArraySize *= 2;
     }
-    
+
     setbit(par_aux,npar,CP);  // marks a new closing parenthesis
-    
+
     //tagname.insert(0,"/");
 
-    //TagIdMapIT tag_id = tIdMap->find(tagname);    
+    //TagIdMapIT tag_id = tIdMap->find(tagname);
 
     // if (tag_id == tIdMap->end()){
     //   REGISTER_TAG(TagName,tIdMap,tagname);
@@ -157,7 +162,7 @@ int XMLTreeBuilder::NewClosingTag(string tagname)
     tags_aux = (TagType *)urealloc(tags_aux, sizeof(TagType)*(npar + 1));
 
     tags_aux[npar] = CLOSING_TAG_ID; // inserts the new tag id within the preorder sequence of tags
-    
+
     npar++;
 
     return 1; // success
@@ -178,7 +183,7 @@ int XMLTreeBuilder::NewText(string text)
 
    int n_eta_size = sizeof(uint)*(1+(npar-1)/(8*sizeof(uint)));
    //see basics.h, recalloc resizes and sets the new area to 0.
-   
+
    empty_texts_aux = (uint *)urecalloc(empty_texts_aux,eta_size,n_eta_size);
    eta_size = n_eta_size;
    bitset(empty_texts_aux, npar-1);  // marks the non-empty text with a 1 in the bit vector