Remove the obsolete rset public control variables. WS updates.

diff --git a/include/rset.h b/include/rset.h
index 5e8df1a..ff86cd9 100644 (file)
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.49 2005-04-15 10:47:48 adam Exp $
+/* $Id: rset.h,v 1.50 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -55,9 +55,7 @@ struct rset_term {
 
 typedef struct rset_term *TERMID; 
 TERMID rset_term_create (const char *name, int length, const char *flags,
-                                    int type, NMEM nmem);
-
-
+                        int type, NMEM nmem);
 
 /** rsfd is a "file descriptor" for reading from a rset */
 struct rsfd {  /* the stuff common to all rsfd's. */
@@ -212,8 +210,7 @@ RSET rset_dup (RSET rs);
 zint rset_count(RSET rs);
 
 RSET rstemp_create(NMEM nmem, const struct key_control *kcontrol,
-                    int scope, 
-                    const char *temp_path, TERMID term);
+                    int scope, const char *temp_path, TERMID term);
 
 RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol);
 

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 56cc894..28c2554 100644 (file)
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $Id: rsbetween.c,v 1.36 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsbetween.c,v 1.37 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -40,9 +40,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <rset.h>
 
 
-static RSFD r_open (RSET ct, int flag);
-static void r_close (RSFD rfd);
-static void r_delete (RSET ct);
+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, 
                     TERMID *term, const void *untilbuf);
 static int r_read(RSFD rfd, void *buf, TERMID *term );
@@ -63,9 +63,6 @@ static const struct rset_control control =
     r_write,
 };
 
-
-const struct rset_control *rset_kind_between = &control;
-
 #define STARTTAG 0
 #define HIT 1
 #define STOPTAG 2
@@ -100,16 +97,15 @@ 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, strlen(tag), "", 0, nmem);
         rs->term->rset = rs;
     }
 }
 
 
 RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
-            int scope,
-            RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
+                      int scope,
+                      RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
 {
     RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,0);
     struct rset_between_info *info=
@@ -151,7 +147,7 @@ RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
 }
 
 
-static void r_delete (RSET ct)
+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);
@@ -159,7 +155,7 @@ static void r_delete (RSET ct)
 }
 
 
-static RSFD r_open (RSET ct, int flag)
+static RSFD r_open(RSET ct, int flag)
 {
     struct rset_between_info *info = (struct rset_between_info *) ct->priv;
     RSFD rfd;
@@ -167,7 +163,7 @@ static RSFD r_open (RSET ct, int flag)
 
     if (flag & RSETF_WRITE)
     {
-        yaz_log (YLOG_FATAL, "between set type is read-only");
+        yaz_log(YLOG_FATAL, "between set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
@@ -180,7 +176,7 @@ static RSFD r_open (RSET ct, int flag)
         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->andrfd = rset_open(info->andset, RSETF_READ);
     p->hits=-1;
     p->depth = 0;
     p->attrdepth = 0;
@@ -190,11 +186,11 @@ static RSFD r_open (RSET ct, int flag)
     return rfd;
 }
 
-static void r_close (RSFD rfd)
+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);
+    rset_close(p->andrfd);
     rfd_delete_base(rfd);
 }
 
@@ -237,7 +233,7 @@ static void checkattr(RSFD rfd)
 }
 
 
-static int r_read (RSFD rfd, void *buf, TERMID *term)
+static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
     struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
@@ -313,14 +309,14 @@ static int r_read (RSFD rfd, void *buf, TERMID *term)
 }  /* r_read */
 
 
-static int r_write (RSFD rfd, const void *buf)
+static int r_write(RSFD rfd, const void *buf)
 {
-    yaz_log (YLOG_FATAL, "between set type is read-only");
+    yaz_log(YLOG_FATAL, "between set type is read-only");
     return -1;
 }
 
 
-static void r_pos (RSFD rfd, double *current, double *total)
+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);

diff --git a/rset/rsbool.c b/rset/rsbool.c
index 04afa12..318ac45 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.53 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsbool.c,v 1.54 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -32,15 +32,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define RSET_DEBUG 0
 #endif
 
-static RSFD r_open (RSET ct, int flag);
-static void r_close (RSFD rfd);
-static void r_delete (RSET ct);
+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, TERMID *term, const void *untilbuf);
-static void r_pos (RSFD rfd, double *current, double *total); 
-static int r_read_and (RSFD rfd, void *buf, TERMID *term);
-static int r_read_or (RSFD rfd, void *buf, TERMID *term);
-static int r_read_not (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 int r_read_and(RSFD rfd, void *buf, TERMID *term);
+static int r_read_or(RSFD rfd, void *buf, TERMID *term);
+static int r_read_not(RSFD rfd, void *buf, TERMID *term);
+static int r_write(RSFD rfd, const void *buf);
 static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm);
 
 
@@ -83,11 +83,6 @@ static const struct rset_control control_not =
     r_write,
 };
 
-
-const struct rset_control *rset_kind_and = &control_and;
-const struct rset_control *rset_kind_or  = &control_or;
-const struct rset_control *rset_kind_not = &control_not;
-
 struct rset_bool_info {
     RSET rset_l;
     RSET rset_r;
@@ -106,46 +101,39 @@ struct rset_bool_rfd {
     int tail;
 };    
 
-static RSET rsbool_create_base( const struct rset_control *ctrl,
-            NMEM nmem, const struct key_control *kcontrol,
-            int scope, 
-            RSET rset_l, RSET rset_r)
+static RSET rsbool_create_base(const struct rset_control *ctrl,
+                              NMEM nmem, const struct key_control *kcontrol,
+                              int scope, RSET rset_l, RSET rset_r)
 {
-    RSET rnew=rset_create_base(ctrl, nmem, kcontrol, scope,0);
+    RSET rnew = rset_create_base(ctrl, nmem, kcontrol, scope,0);
     struct rset_bool_info *info;
     info = (struct rset_bool_info *) nmem_malloc(rnew->nmem,sizeof(*info));
     info->rset_l = rset_l;
     info->rset_r = rset_r;
-    rnew->priv=info;
+    rnew->priv = info;
     return rnew;
 }
 
-
 RSET rsbool_create_and( NMEM nmem, const struct key_control *kcontrol,
-                        int scope, 
-                        RSET rset_l, RSET rset_r)
+                        int scope, RSET rset_l, RSET rset_r)
 {
-    return rsbool_create_base(rset_kind_and, nmem, kcontrol,
+    return rsbool_create_base(&control_and, nmem, kcontrol,
                               scope,
                               rset_l, rset_r);
 }
 
 RSET rsbool_create_or( NMEM nmem, const struct key_control *kcontrol,
-                        int scope, 
-                       RSET rset_l, RSET rset_r)
+                        int scope, RSET rset_l, RSET rset_r)
 {
-    return rsbool_create_base(rset_kind_or, nmem, kcontrol,
-                              scope,
-                              rset_l, rset_r);
+    return rsbool_create_base(&control_or, nmem, kcontrol,
+                              scope, rset_l, rset_r);
 }
 
 RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol,
-                        int scope, 
-                        RSET rset_l, RSET rset_r)
+                        int scope, RSET rset_l, RSET rset_r)
 {
-    return rsbool_create_base(rset_kind_not, nmem, kcontrol,
-                              scope, 
-                              rset_l, rset_r);
+    return rsbool_create_base(&control_not, nmem, kcontrol,
+                              scope, rset_l, rset_r);
 }
 
 static void r_delete (RSET ct)
@@ -165,15 +153,15 @@ static RSFD r_open (RSET ct, int flag)
 
     if (flag & RSETF_WRITE)
     {
-        yaz_log (YLOG_FATAL, "bool set type is read-only");
+        yaz_log(YLOG_FATAL, "bool set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
     if (rfd->priv)
-        p=(struct rset_bool_rfd *)rfd->priv;
+        p = (struct rset_bool_rfd *)rfd->priv;
     else {
-        p=nmem_malloc(ct->nmem,sizeof(*p));
-        rfd->priv=p;
+        p = nmem_malloc(ct->nmem,sizeof(*p));
+        rfd->priv = p;
         p->buf_l = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
         p->buf_r = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
     }
@@ -183,8 +171,8 @@ static RSFD r_open (RSET ct, int flag)
 
     p->rfd_l = rset_open (info->rset_l, RSETF_READ);
     p->rfd_r = rset_open (info->rset_r, RSETF_READ);
-    p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
-    p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+    p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
+    p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
     p->tail = 0;
     return rfd;
 }
@@ -201,17 +189,17 @@ static void r_close (RSFD rfd)
 
 
 
-static int r_forward (RSFD rfd, void *buf, TERMID *term,
+static int r_forward(RSFD rfd, void *buf, TERMID *term,
                      const void *untilbuf)
 {
-    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
 
     if ( p->more_l && ((kctrl->cmp)(untilbuf,p->buf_l)>=rfd->rset->scope) )
         p->more_l = rset_forward(p->rfd_l, p->buf_l, &p->term_l, untilbuf);
     if ( p->more_r && ((kctrl->cmp)(untilbuf,p->buf_r)>=rfd->rset->scope))
         p->more_r = rset_forward(p->rfd_r, p->buf_r, &p->term_r, untilbuf);
-    p->tail=0; 
+    p->tail = 0; 
     return rset_read(rfd,buf,term); 
 }
 
@@ -231,7 +219,7 @@ static int r_forward (RSFD rfd, void *buf, TERMID *term,
           3,1
 */
 
-static int r_read_and (RSFD rfd, void *buf, TERMID *term)
+static int r_read_and(RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
@@ -247,7 +235,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
         else
             cmp = rfd->rset->scope;
 #if RSET_DEBUG
-        yaz_log (YLOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
+        yaz_log(YLOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
                         rfd, p->more_l, p->more_r, cmp, p->tail);
         (*kctrl->log_item)(YLOG_DEBUG, p->buf_l, "left ");
         (*kctrl->log_item)(YLOG_DEBUG, p->buf_r, "right ");
@@ -257,7 +245,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
                 *term=p->term_l;
-            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+            p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
             p->tail = 1;
         }
         else if ( (cmp>0) && (cmp<rfd->rset->scope))
@@ -265,10 +253,10 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             memcpy (buf, p->buf_r, kctrl->key_size);
             if (term)
                 *term=p->term_r;
-            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+            p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
             p->tail = 1;
 #if RSET_DEBUG
-            yaz_log (YLOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
+            yaz_log(YLOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
                     rfd, p->more_l, p->more_r, cmp);
             key_logdump(YLOG_DEBUG,buf);
             (*kctrl->log_item)(YLOG_DEBUG, buf, "");
@@ -281,10 +269,10 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
                 *term=p->term_l;
-            p->more_l = rset_read (p->rfd_l, p->buf_l,&p->term_l);
+            p->more_l = rset_read(p->rfd_l, p->buf_l,&p->term_l);
             p->tail = 1;
 #if RSET_DEBUG
-            yaz_log (YLOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
+            yaz_log(YLOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
                     rfd, p->more_l, p->more_r, cmp);
             (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -298,11 +286,11 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
                 memcpy (buf, p->buf_r, kctrl->key_size);
                 if (term)
                     *term=p->term_r;
-                p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+                p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
                 if (!p->more_r || (*kctrl->cmp)(p->buf_r, buf) > 1)
                     p->tail = 0;
 #if RSET_DEBUG
-                yaz_log (YLOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
+                yaz_log(YLOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
                         rfd, p->more_l, p->more_r, cmp);
                 (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -312,7 +300,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             else
             {
 #if RSET_DEBUG
-                yaz_log (YLOG_DEBUG, "r_read_and [%p] about to forward R "
+                yaz_log(YLOG_DEBUG, "r_read_and [%p] about to forward R "
                                  "m=%d/%d c=%d",
                         rfd, p->more_l, p->more_r, cmp);
 #endif
@@ -329,12 +317,12 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             {
                 memcpy (buf, p->buf_l, kctrl->key_size);
                 if (term)
-                    *term=p->term_l;
-                p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+                    *term = p->term_l;
+                p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
                 if (!p->more_l || (*kctrl->cmp)(p->buf_l, buf) > 1)
                     p->tail = 0;
 #if RSET_DEBUG
-                yaz_log (YLOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
+                yaz_log(YLOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
                         rfd, p->more_l, p->more_r, cmp);
                 (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -344,7 +332,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
             else
             {
 #if RSET_DEBUG
-                yaz_log (YLOG_DEBUG, "r_read_and [%p] about to forward L "
+                yaz_log(YLOG_DEBUG, "r_read_and [%p] about to forward L "
                                  "m=%d/%d c=%d",
                         rfd, p->more_l, p->more_r, cmp);
 #endif
@@ -357,15 +345,15 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term)
         }
     }
 #if RSET_DEBUG
-    yaz_log (YLOG_DEBUG, "r_read_and [%p] reached its end",rfd);
+    yaz_log(YLOG_DEBUG, "r_read_and [%p] reached its end",rfd);
 #endif
     return 0;
 }
 
 static int r_read_or (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
-    const struct key_control *kctrl=rfd->rset->keycontrol;
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl = rfd->rset->keycontrol;
 
     while (p->more_l || p->more_r)
     {
@@ -381,14 +369,14 @@ static int r_read_or (RSFD rfd, void *buf, TERMID *term)
         { /* cmp==0 */
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
-                *term=p->term_l;
-            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+                *term = p->term_l;
+            p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
             /* FIXME - is this right, should we not leave _r as it is */
             /* and return that in the next read, so that ranking etc */
             /* get to see both? */
-            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+            p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
 #if RSET_DEBUG
-            yaz_log (YLOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
+            yaz_log(YLOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
             (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -399,10 +387,10 @@ static int r_read_or (RSFD rfd, void *buf, TERMID *term)
         {
             memcpy (buf, p->buf_r, kctrl->key_size);
             if (term)
-                *term=p->term_r;
-            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+                *term = p->term_r;
+            p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
 #if RSET_DEBUG
-            yaz_log (YLOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
+            yaz_log(YLOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
             (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -413,10 +401,10 @@ static int r_read_or (RSFD rfd, void *buf, TERMID *term)
         {
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
-                *term=p->term_l;
-            p->more_l = rset_read ( p->rfd_l, p->buf_l, &p->term_l);
+                *term = p->term_l;
+            p->more_l = rset_read( p->rfd_l, p->buf_l, &p->term_l);
 #if RSET_DEBUG
-            yaz_log (YLOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
+            yaz_log(YLOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
             (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
@@ -427,10 +415,10 @@ static int r_read_or (RSFD rfd, void *buf, TERMID *term)
     return 0;
 }
 
-static int r_read_not (RSFD rfd, void *buf, TERMID *term)
+static int r_read_not(RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
-    const struct key_control *kctrl=rfd->rset->keycontrol;
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl = rfd->rset->keycontrol;
 
     while (p->more_l || p->more_r)
     {
@@ -448,7 +436,7 @@ static int r_read_not (RSFD rfd, void *buf, TERMID *term)
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
                 *term=p->term_l;
-            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+            p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
             p->hits++;
             return 1;
         }
@@ -459,10 +447,10 @@ static int r_read_not (RSFD rfd, void *buf, TERMID *term)
         { /* cmp== -1, 0, or 1 */
             memcpy (buf, p->buf_l, kctrl->key_size);
             if (term)
-                *term=p->term_l;
+                *term = p->term_l;
             do
             { 
-                p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+                p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
                 if (!p->more_l)
                     break;
                 cmp = (*kctrl->cmp)(p->buf_l, buf);
@@ -470,7 +458,7 @@ static int r_read_not (RSFD rfd, void *buf, TERMID *term)
                 /*  (cmp >= -1 && cmp <= 1) */
             do
             {
-                p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+                p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
                 if (!p->more_r)
                     break;
                 cmp = (*kctrl->cmp)(p->buf_r, buf);
@@ -482,35 +470,38 @@ static int r_read_not (RSFD rfd, void *buf, TERMID *term)
 }
 
 
-static int r_write (RSFD rfd, const void *buf)
+static int r_write(RSFD rfd, const void *buf)
 {
-    yaz_log (YLOG_FATAL, "bool set type is read-only");
+    yaz_log(YLOG_FATAL, "bool set type is read-only");
     return -1;
 }
 
-static void r_pos (RSFD rfd, double *current, double *total)
+static void r_pos(RSFD rfd, double *current, double *total)
 {
-    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
-    double lcur,ltot;
-    double rcur,rtot;
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *)rfd->priv;
+    double lcur, ltot;
+    double rcur, rtot;
     double r;
-    ltot=-1; rtot=-1;
-    rset_pos(p->rfd_l,  &lcur, &ltot);
-    rset_pos(p->rfd_r,  &rcur, &rtot);
+    ltot = -1;
+    rtot = -1;
+    rset_pos(p->rfd_l, &lcur, &ltot);
+    rset_pos(p->rfd_r, &rcur, &rtot);
     if ( (rtot<0) && (ltot<0)) { /*no position */
-        *current=rcur;  /* return same as you got */
-        *total=rtot;    /* probably -1 for not available */
+        *current = rcur;  /* return same as you got */
+        *total = rtot;    /* probably -1 for not available */
     }
-    if ( rtot<0) { rtot=0; rcur=0;} /* if only one useful, use it */
-    if ( ltot<0) { ltot=0; lcur=0;}
-    if ( rtot+ltot < 1 ) { /* empty rset */
-        *current=0;
-        *total=0;
+    if (rtot < 0) 
+       rtot = rcur = 0; /* if only one useful, use it */ 
+    if (ltot < 0) 
+       ltot = lcur = 0;
+    if (rtot+ltot < 1) 
+    {   /* empty rset */
+        *current = *total = 0;
         return;
     }
-    r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
-    *current=(double) (p->hits);
-    *total=*current/r ; 
+    r = 1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
+    *current = (double) (p->hits);
+    *total = *current/r ; 
 #if RSET_DEBUG
     yaz_log(YLOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
                     info->rset_l->control->desc, info->rset_r->control->desc,

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index fed2c49..872536f 100644 (file)
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamb.c,v 1.31 2005-04-13 13:03:48 adam Exp $
+/* $Id: rsisamb.c,v 1.32 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -48,8 +48,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_isamb = &control;
-
 struct rset_pp_info {
     ISAMB_PP pt;
     void *buf;

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 6dc3983..b60f939 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.37 2005-04-13 13:03:49 adam Exp $
+/* $Id: rsisamc.c,v 1.38 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -20,9 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -49,8 +46,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_isamc = &control;
-
 struct rset_pp_info {
     ISAMC_PP pt;
     void *buf;

diff --git a/rset/rsisams.c b/rset/rsisams.c
index b30df9c..95617f4 100644 (file)
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,4 +1,4 @@
-/* $Id: rsisams.c,v 1.20 2005-04-13 13:03:50 adam Exp $
+/* $Id: rsisams.c,v 1.21 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <idzebra/util.h>
@@ -47,8 +45,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_isams = &control;
-
 struct rset_pp_info {
     ISAMS_PP pt;
 };

diff --git a/rset/rsmultiandor.c b/rset/rsmultiandor.c
index aeaffc0..06005bd 100644 (file)
--- a/rset/rsmultiandor.c
+++ b/rset/rsmultiandor.c
@@ -1,4 +1,4 @@
-/* $Id: rsmultiandor.c,v 1.15 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsmultiandor.c,v 1.16 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -69,6 +69,7 @@ static const struct rset_control control_or =
     r_read_or,
     r_write,
 };
+
 static const struct rset_control control_and = 
 {
     "multi-and",
@@ -82,9 +83,6 @@ static const struct rset_control control_and =
     r_write,
 };
 
-const struct rset_control *rset_kind_multior = &control_or;
-const struct rset_control *rset_kind_multiand = &control_and;
-
 /* The heap structure: 
  * The rset contains a list or rsets we are ORing together 
  * The rfd contains a heap of heap-items, which contain

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 754f771..ef0c49b 100644 (file)
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.32 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsnull.c,v 1.33 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -48,8 +48,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_null = &control;
-
 RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
     RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);

diff --git a/rset/rsprox.c b/rset/rsprox.c
index 129e521..9525eb9 100644 (file)
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -1,4 +1,4 @@
-/* $Id: rsprox.c,v 1.26 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsprox.c,v 1.27 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -54,8 +54,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_prox = &control;
-
 struct rset_prox_info {
     RSET *rset;   /* array of 'child' rsets */
     int rset_no;  /* how many of them */
@@ -94,7 +92,6 @@ RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope,
     return rnew;
 }
 
-
 static void r_delete (RSET ct)
 {
     struct rset_prox_info *info = (struct rset_prox_info *) ct->priv;
@@ -104,7 +101,6 @@ static void r_delete (RSET ct)
         rset_delete(info->rset[i]);
 }
 
-
 static RSFD r_open (RSET ct, int flag)
 {
     struct rset_prox_info *info = (struct rset_prox_info *) ct->priv;

diff --git a/rset/rstemp.c b/rset/rstemp.c
index fa239f3..32048c9 100644 (file)
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,4 +1,4 @@
-/* $Id: rstemp.c,v 1.61 2005-03-30 09:25:24 adam Exp $
+/* $Id: rstemp.c,v 1.62 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -44,7 +44,6 @@ static void r_pos(RSFD rfd, double *current, double  *total);
 static void r_flush(RSFD rfd, int mk);
 static void r_reread(RSFD rfd);
 
-
 static const struct rset_control control = 
 {
     "temp",
@@ -58,8 +57,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_temp = &control;
-
 struct rset_temp_info {
     int     fd;            /* file descriptor for temp file */
     char   *fname;         /* name of temp file */
@@ -69,7 +66,7 @@ struct rset_temp_info {
     size_t  pos_buf;       /* position of first byte in window */
     size_t  pos_border;    /* position of last byte+1 in window */
     int     dirty;         /* window is dirty */
-    zint     hits;          /* no of hits */
+    zint    hits;          /* no of hits */
     char   *temp_path;
 };
 
@@ -83,8 +80,8 @@ struct rset_temp_rfd {
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
-                    int scope, const char *temp_path, TERMID term)
+RSET rstemp_create(NMEM nmem, const struct key_control *kcontrol,
+                   int scope, const char *temp_path, TERMID term)
 {
     RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
     struct rset_temp_info *info;