X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.h;h=1f8df578940a6b48dcce2e82ccc70a35c41344bf;hb=a01a06472c8dcf1c58a8d87e6b93eb709b921d0e;hp=2e9e222ae53f26baa631dbf4ab77dff885173fc8;hpb=82b89c86269e04916a4aef964977ee738d8f2927;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.h b/XMLTree.h
index 2e9e222..1f8df57 100644
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -207,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 
@@ -220,6 +232,7 @@ 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);
@@ -250,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 
@@ -371,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) {