X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.h;h=2e9e222ae53f26baa631dbf4ab77dff885173fc8;hb=317fdc10a3d537fd87b855c4b8714b2472cde608;hp=67ffd6e62488a323c38ff5520f5e1cb0ec3a4ea9;hpb=39ee9d4c866fd5e4ba478ef65dc7e714e80c0b91;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.h b/XMLTree.h
index 67ffd6e..2e9e222 100644
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -84,6 +84,8 @@ class XMLTree {
 		      
    /** Tag sequence represented with a data structure for rank and select */
    static_sequence *Tags;
+	 uint * tags_fix;
+	 uint tags_blen, tags_len;
 
    /** The texts in the XML document */
    TextCollection *Text;
@@ -120,6 +122,7 @@ class XMLTree {
    bool disable_tc;
    
 public:
+	 void print_stats();
 
    /** Data structure constructor */
    XMLTree() {finished = false; initialized = false;}; 
@@ -217,7 +220,14 @@ public:
     * preorder than x and not in the subtree of x. Returns NULLT if there 
     * is none. */
    treeNode TaggedFoll(treeNode x, TagType tag);
-   
+  
+   /** TaggedFollowingSibling(x,tag) */
+   treeNode TaggedFollowingSibling(treeNode x, TagType tag);
+
+   /** TaggedAncestor(x, tag): returns the closest ancestor of x tagged 
+     * tag. Return NULLT is there is none. */
+   treeNode TaggedAncestor(treeNode x, TagType tag);
+ 
    /** PrevText(x): returns the document identifier of the text to the left of 
     * node x, or NULLT if x is the root node. */
    DocID PrevText(treeNode x);
@@ -394,7 +404,9 @@ public:
    }
 
    uchar* GetCachedText(DocID d) {
-     return (uchar*) (CachedText.at(d).c_str());
+     uchar * str = (uchar*) calloc(sizeof(char),(CachedText.at(d).size() + 1));
+     strcpy((char*) str,(const char*) CachedText.at(d).c_str());
+     return (uchar*) (str);
    }
    
    TextCollection *getTextCollection() {