X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.h;h=80173a4252cfb92b67ecf8fd18d156d80805ba2d;hb=6a9117a97674437c9fe00b099c40ccb61d45d704;hp=3bfb7a401db4e001ce2fa2cbb2de8a15c1f906a9;hpb=d6ecf291b7dd99ec191daa090a2ff3dac08f8150;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.h b/XMLTree.h
index 3bfb7a4..80173a4 100644
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -122,6 +122,7 @@ class XMLTree {
    bool disable_tc;
    
 public:
+	 void print_stats();
 
    /** Data structure constructor */
    XMLTree() {finished = false; initialized = false;}; 
@@ -206,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 
@@ -219,6 +232,8 @@ public:
     * preorder than x and not in the subtree of x. Returns NULLT if there 
     * is none. */
    treeNode TaggedFoll(treeNode x, TagType tag);
+
+   treeNode TaggedFollBelow(treeNode x, TagType tag,treeNode root);     
   
    /** TaggedFollowingSibling(x,tag) */
    treeNode TaggedFollowingSibling(treeNode x, TagType tag);
@@ -249,6 +264,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 
@@ -370,6 +386,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) {