X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbetween.c;h=fc3d22cd8d55a06b6171979a3bfa4256d2c6e17f;hb=739e721ee59f645cb821c8d3035a12aefae423f6;hp=9078c2f58cc6af857ecc9450fc00135249903909;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb;p=idzebra-moved-to-github.git

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 9078c2f..fc3d22c 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,8 +1,5 @@
-/* $Id: rsbetween.c,v 1.38 2005-05-03 09:11:35 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,22 +12,25 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
 /* rsbetween is (mostly) used for xml searches. It returns the hits of the
  * "middle" rset, that are in between the "left" and "right" rsets. For
- * example "Shakespeare" in between "<author>" and </author>. The thing is 
+ * example "Shakespeare" in between "<author>" and </author>. The thing is
  * complicated by the inclusion of attributes (from their own rset). If attrs
  * specified, they must match the "left" rset (start tag). "Hamlet" between
  * "<title lang = eng>" and "</title>". (This assumes that the attributes are
  * indexed to the same seqno as the tags).
  *
-*/ 
+*/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,24 +43,23 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 static RSFD r_open(RSET ct, int flag);
 static void r_close(RSFD rfd);
 static void r_delete(RSET ct);
-static int r_forward(RSFD rfd, void *buf, 
+static int r_forward(RSFD rfd, void *buf,
                     TERMID *term, const void *untilbuf);
 static int r_read(RSFD rfd, void *buf, TERMID *term );
-static int r_write(RSFD rfd, const void *buf);
 static void r_pos(RSFD rfd, double *current, double *total);
 static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm);
 
-static const struct rset_control control = 
+static const struct rset_control control =
 {
     "between",
     r_delete,
     r_get_terms,
     r_open,
     r_close,
-    r_forward, 
+    r_forward,
     r_pos,
     r_read,
-    r_write,
+    rset_no_write,
 };
 
 #define STARTTAG 0
@@ -69,7 +68,6 @@ static const struct rset_control control =
 #define ATTRTAG 3
 
 struct rset_between_info {
-    RSET andset; /* the multi-and of the above */
     TERMID startterm; /* pseudo terms for detecting which one we read from */
     TERMID stopterm;
     TERMID attrterm;
@@ -85,7 +83,7 @@ struct rset_between_rfd {
     int depth; /* number of start-tags without end-tags */
     int attrdepth; /* on what depth the attr matched */
     zint hits;
-};    
+};
 
 static int log_level = 0;
 static int log_level_initialized = 0;
@@ -93,26 +91,26 @@ static int log_level_initialized = 0;
 
 /* make sure that the rset has a term attached. If not, create one */
 /* we need these terms for the tags, to distinguish what we read */
-static void checkterm( RSET rs, char *tag, NMEM nmem)
+static void checkterm(RSET rs, char *tag, NMEM nmem)
 {
     if (!rs->term)
     {
-        rs->term = rset_term_create(tag, strlen(tag), "", 0, nmem);
+        rs->term = rset_term_create(tag, -1, "", 0, nmem, 0, 0, 0, 0);
         rs->term->rset = rs;
     }
 }
 
 
-RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol,
-		      int scope,
-		      RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
+RSET rset_create_between(NMEM nmem, struct rset_key_control *kcontrol,
+                         int scope,
+                         RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
 {
-    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,0);
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, 0, 0, 0);
     struct rset_between_info *info=
         (struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
     RSET rsetarray[4];
     int n = 4;
-    
+
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("rsbetween");
@@ -124,40 +122,38 @@ RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol,
     rsetarray[ATTRTAG] = rset_attr;
 
     /* make sure we have decent terms for all rsets. Create dummies if needed*/
-    checkterm( rsetarray[STARTTAG], "(start)",nmem);
-    checkterm( rsetarray[STOPTAG], "(start)",nmem);
+    checkterm(rsetarray[STARTTAG], "(start)", nmem);
+    checkterm(rsetarray[STOPTAG], "(start)", nmem);
     info->startterm = rsetarray[STARTTAG]->term;
     info->stopterm = rsetarray[STOPTAG]->term;
 
     if (rset_attr)
     {
-        checkterm( rsetarray[ATTRTAG], "(start)",nmem);
+        checkterm(rsetarray[ATTRTAG], "(start)", nmem);
         info->attrterm = rsetarray[ATTRTAG]->term;
         n = 4;
     }
     else
     {
         info->attrterm = NULL;
-        n = 3; 
+        n = 3;
     }
-    info->andset = rsmulti_and_create( nmem, kcontrol, scope, n, rsetarray);
+    rnew->no_children = 1;
+    rnew->children = nmem_malloc(rnew->nmem, sizeof(RSET *));
+    rnew->children[0] = rset_create_and(nmem, kcontrol,
+                                        scope, n, rsetarray);
     rnew->priv = info;
-    yaz_log(log_level,"create rset at %p",rnew);
+    yaz_log(log_level, "create rset at %p", rnew);
     return rnew;
 }
 
-
 static void r_delete(RSET ct)
 {
-    struct rset_between_info *info = (struct rset_between_info *) ct->priv;
-    yaz_log(log_level,"delete rset at %p",ct);
-    rset_delete(info->andset);
 }
 
 
 static RSFD r_open(RSET ct, int flag)
 {
-    struct rset_between_info *info = (struct rset_between_info *) ct->priv;
     RSFD rfd;
     struct rset_between_rfd *p;
 
@@ -167,22 +163,22 @@ static RSFD r_open(RSET ct, int flag)
         return NULL;
     }
     rfd = rfd_create_base(ct);
-    if (rfd->priv)  
+    if (rfd->priv)
         p=(struct rset_between_rfd *)rfd->priv;
     else {
         p = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*p)));
         rfd->priv = p;
-        p->recbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size)); 
-        p->startbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size)); 
-        p->attrbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size)); 
+        p->recbuf = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
+        p->startbuf = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
+        p->attrbuf = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
     }
-    p->andrfd = rset_open(info->andset, RSETF_READ);
-    p->hits=-1;
+    p->andrfd = rset_open(ct->children[0], RSETF_READ);
+    p->hits = -1;
     p->depth = 0;
     p->attrdepth = 0;
     p->attrbufok = 0;
     p->startbufok = 0;
-    yaz_log(log_level,"open rset=%p rfd=%p", ct, rfd);
+    yaz_log(log_level, "open rset=%p rfd=%p", ct, rfd);
     return rfd;
 }
 
@@ -191,12 +187,9 @@ static void r_close(RSFD rfd)
     struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
     yaz_log(log_level,"close rfd=%p", rfd);
     rset_close(p->andrfd);
-    rfd_delete_base(rfd);
 }
 
-
-
-static int r_forward(RSFD rfd, void *buf, 
+static int r_forward(RSFD rfd, void *buf,
                      TERMID *term, const void *untilbuf)
 {
     struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
@@ -206,8 +199,6 @@ static int r_forward(RSFD rfd, void *buf,
     return rc;
 }
 
-
-
 static void checkattr(RSFD rfd)
 {
     struct rset_between_info *info =(struct rset_between_info *)
@@ -217,7 +208,7 @@ static void checkattr(RSFD rfd)
     int cmp;
     if (p->attrdepth)
         return; /* already found one */
-    if (!info->attrterm) 
+    if (!info->attrterm)
     {
         p->attrdepth=-1; /* matches always */
         return;
@@ -233,7 +224,6 @@ static void checkattr(RSFD rfd)
     }
 }
 
-
 static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_between_info *info =
@@ -242,39 +232,39 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
     const struct rset_key_control *kctrl = rfd->rset->keycontrol;
     int cmp;
     TERMID dummyterm = 0;
-    yaz_log(log_level,"== read: term=%p",term);
+    yaz_log(log_level, "== read: term=%p",term);
     if (!term)
-        term=&dummyterm;
-    while ( rset_read(p->andrfd,buf,term) )
+        term = &dummyterm;
+    while (rset_read(p->andrfd, buf, term))
     {
         yaz_log(log_level,"read loop term=%p d=%d ad=%d",
-                *term,p->depth, p->attrdepth);
-        if (p->hits<0) 
+                *term, p->depth, p->attrdepth);
+        if (p->hits<0)
         {/* first time? */
-            memcpy(p->recbuf,buf,kctrl->key_size);
+            memcpy(p->recbuf, buf, kctrl->key_size);
             p->hits = 0;
             cmp = rfd->rset->scope; /* force newrecord */
         }
         else {
-            cmp=(kctrl->cmp)(buf,p->recbuf);
-            yaz_log(log_level, "cmp=%d",cmp);
+            cmp = (kctrl->cmp)(buf, p->recbuf);
+            yaz_log(log_level, "cmp=%d", cmp);
         }
 
         if (cmp>=rfd->rset->scope)
-        { 
-            yaz_log(log_level,"new record");
+        {
+            yaz_log(log_level, "new record");
             p->depth = 0;
             p->attrdepth = 0;
-            memcpy(p->recbuf,buf,kctrl->key_size);
+            memcpy(p->recbuf, buf, kctrl->key_size);
         }
 
         if (*term)
-            yaz_log(log_level,"  term: '%s'", (*term)->name);
+            yaz_log(log_level, "  term: '%s'", (*term)->name);
         if (*term==info->startterm)
         {
             p->depth++;
-            yaz_log(log_level,"read start tag. d=%d",p->depth);
-            memcpy(p->startbuf,buf,kctrl->key_size);
+            yaz_log(log_level, "read start tag. d=%d", p->depth);
+            memcpy(p->startbuf, buf, kctrl->key_size);
             p->startbufok = 1;
             checkattr(rfd); /* in case we already saw the attr here */
         }
@@ -283,26 +273,27 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
             if (p->depth == p->attrdepth)
                 p->attrdepth = 0; /* ending the tag with attr match */
             p->depth--;
-            yaz_log(log_level,"read end tag. d=%d ad=%d",p->depth, p->attrdepth);
+            yaz_log(log_level,"read end tag. d=%d ad=%d", p->depth,
+		    p->attrdepth);
         }
         else if (*term==info->attrterm)
         {
             yaz_log(log_level,"read attr");
-            memcpy(p->attrbuf,buf,kctrl->key_size);
+            memcpy(p->attrbuf, buf, kctrl->key_size);
             p->attrbufok = 1;
             checkattr(rfd); /* in case the start tag came first */
         }
-        else 
+        else
         { /* mut be a real hit */
             if (p->depth && p->attrdepth)
             {
                 p->hits++;
-                yaz_log(log_level,"got a hit h="ZINT_FORMAT" d=%d ad=%d", 
-                        p->hits,p->depth,p->attrdepth);
+                yaz_log(log_level,"got a hit h="ZINT_FORMAT" d=%d ad=%d",
+                        p->hits, p->depth, p->attrdepth);
                 return 1; /* we have everything in place already! */
             } else
                 yaz_log(log_level, "Ignoring hit. h="ZINT_FORMAT" d=%d ad=%d",
-                        p->hits,p->depth,p->attrdepth);
+                        p->hits, p->depth, p->attrdepth);
         }
     } /* while read */
 
@@ -310,25 +301,25 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
 
 }  /* r_read */
 
-
-static int r_write(RSFD rfd, const void *buf)
-{
-    yaz_log(YLOG_FATAL, "between set type is read-only");
-    return -1;
-}
-
-
 static void r_pos(RSFD rfd, double *current, double *total)
 {
     struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
-    rset_pos(p->andrfd,current, total);
-    yaz_log(log_level,"pos: %0.1f/%0.1f ", *current, *total);
+    rset_pos(p->andrfd, current, total);
+    yaz_log(log_level, "pos: %0.1f/%0.1f ", *current, *total);
 }
 
 static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
 {
-    struct rset_between_info *info = (struct rset_between_info *) ct->priv;
-    rset_getterms(info->andset, terms, maxterms, curterm);
+    rset_getterms(ct->children[0], terms, maxterms, curterm);
 }
 
- 
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+