X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbetween.c;h=fc3d22cd8d55a06b6171979a3bfa4256d2c6e17f;hp=8d0ffe678843dab0f7c21e8c744799157f64b917;hb=2c2827a0071c5a5511e1489c456ce64fdd42364a;hpb=27742a4ea82e9b3494c166203b06d1d7c48da923

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 8d0ffe6..fc3d22c 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,8 +1,5 @@
-/* $Id: rsbetween.c,v 1.44 2006-06-06 21:01:30 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
@@ -84,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;
@@ -111,7 +110,7 @@ RSET rset_create_between(NMEM nmem, struct rset_key_control *kcontrol,
         (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");
@@ -137,11 +136,11 @@ RSET rset_create_between(NMEM nmem, struct rset_key_control *kcontrol,
     else
     {
         info->attrterm = NULL;
-        n = 3; 
+        n = 3;
     }
     rnew->no_children = 1;
     rnew->children = nmem_malloc(rnew->nmem, sizeof(RSET *));
-    rnew->children[0] = rset_create_and(nmem, kcontrol, 
+    rnew->children[0] = rset_create_and(nmem, kcontrol,
                                         scope, n, rsetarray);
     rnew->priv = info;
     yaz_log(log_level, "create rset at %p", rnew);
@@ -164,14 +163,14 @@ 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(ct->children[0], RSETF_READ);
     p->hits = -1;
@@ -190,7 +189,7 @@ static void r_close(RSFD rfd)
     rset_close(p->andrfd);
 }
 
-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;
@@ -209,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;
@@ -240,7 +239,7 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
     {
         yaz_log(log_level,"read loop term=%p d=%d ad=%d",
                 *term, p->depth, p->attrdepth);
-        if (p->hits<0) 
+        if (p->hits<0)
         {/* first time? */
             memcpy(p->recbuf, buf, kctrl->key_size);
             p->hits = 0;
@@ -252,7 +251,7 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
         }
 
         if (cmp>=rfd->rset->scope)
-        { 
+        {
             yaz_log(log_level, "new record");
             p->depth = 0;
             p->attrdepth = 0;
@@ -284,12 +283,12 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
             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", 
+                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
@@ -302,14 +301,6 @@ 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;
@@ -322,10 +313,11 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *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