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

diff --git a/XMLTree.h b/XMLTree.h
index 67ffd6e..1f8df57 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;}; 
@@ -204,9 +207,21 @@ public:
     * is none. */
    treeNode TaggedDesc(treeNode x, TagType tag);
 
-   /** TaggedNext(x,tag): returns the first node tagged tag with larger 
-    * preorder than x. Returns NULT if there is none. */
-   treeNode TaggedNext(treeNode x, TagType tag);
+
+   treeNode TaggedBelow(treeNode x, TagType *childtags, unsigned int ctlen,
+				 TagType *desctags, unsigned int dtlen);
+   
+   treeNode TaggedNext(treeNode x, TagType *childtags, unsigned int ctlen,
+				TagType *folltags, unsigned int flen,treeNode root);
+
+   treeNode TaggedDescOnly(treeNode x, TagType *desctags, unsigned int dtlen);
+   
+   treeNode TaggedDescOrFollOnly(treeNode x, TagType *folltags, unsigned int flen,
+			   treeNode root);
+
+   treeNode TaggedFollOnly(treeNode x, TagType *folltags, unsigned int flen,
+			   treeNode root);
+   
 
    /** TaggedPrec(x,tag): returns the first node tagged tag with smaller 
     * preorder than x and not an ancestor of x. Returns NULLT if there 
@@ -217,7 +232,15 @@ 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);
@@ -240,6 +263,7 @@ public:
    
    /** ParentNode(d): returns the parent node of document identifier d. */
    treeNode ParentNode(DocID d);
+   treeNode PrevNode(DocID d);
 
    /** OpenDocument(empty_texts,sample_rate_text,dtc): initilizes the construction
     * of the data structure for the XML document. Parameter empty_texts 
@@ -361,6 +385,11 @@ public:
    bool IsLessThan(uchar const *s) {
       return Text->IsLessThan(s);
    }
+   
+   /** Count(s): Global counting  */
+   unsigned Count(uchar const *s) {
+      return Text->Count(s);
+   }
 
    /** CountPrefix(s): counting version of Prefix(s). */
    unsigned CountPrefix(uchar const *s) {
@@ -394,7 +423,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() {