Cleaned debug logs away

diff --git a/include/rset.h b/include/rset.h
index 2fa67a3..4f28919 100644 (file)
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.39 2004-10-22 10:12:51 heikki Exp $
+/* $Id: rset.h,v 1.40 2004-10-22 10:58:28 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -49,9 +49,9 @@ typedef struct rset *RSET; /* Result set */
 
 struct rset_term {
     char *name;
-    int  nn;
+    zint  nn; /* FIXME - what is this used for */
     char *flags;
-    int  count;
+    zint  count;
     int  type;
 };
 

diff --git a/index/zsets.c b/index/zsets.c
index cabefa6..3fd85a0 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.66 2004-10-22 10:12:51 heikki Exp $
+/* $Id: zsets.c,v 1.67 2004-10-22 10:58:28 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -812,33 +812,26 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     }
     rset_close (rfd);
     n=0;
-    logf(LOG_LOG,"FIXME: Counting terms"); 
     rset_getterms(rset,0,0,&n);
-    logf(LOG_LOG,"FIXME: Got %d terms", n);
     terms=xmalloc( sizeof(*terms)*n);
     i=n;
     n=0;
     rset_getterms(rset,terms,i,&n);
-    logf(LOG_LOG,"FIXME: Collected %d terms", n);
-    for (i=0;i<n;i++)
-        logf(LOG_LOG,"FIXME: term[%d]='%s'",i,terms[i]->name);
-    xfree(terms);
 
 
-/*
-    for (i = 0; i < rset->no_rset_terms; i++)
+    for (i = 0; i < n; i++)
     {
         if (est>0)
-            rset->rset_terms[i]->count = 
-                est=(zint)(rset->rset_terms[i]->count/ratio);
+            terms[i]->count = 
+                est=(zint)(terms[i]->count/ratio);
         yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT 
                     " type=%s count=" ZINT_FORMAT,
-                 rset->rset_terms[i]->name,
-                 rset->rset_terms[i]->nn,
-                 rset->rset_terms[i]->flags,
-                 rset->rset_terms[i]->count);
+                 terms[i]->name,
+                 terms[i]->nn,
+                 terms[i]->flags,
+                 terms[i]->count);
     }
-*/
+    xfree(terms);
     yaz_log (LOG_DEBUG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos", 
                     kno, zebraSet->hits);
 }

diff --git a/rset/rset.c b/rset/rset.c
index 42c20f8..bbc3fab 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.36 2004-10-22 10:12:51 heikki Exp $
+/* $Id: rset.c,v 1.37 2004-10-22 10:58:29 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -157,10 +157,8 @@ void rset_get_no_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
 /* rset_get_one_term gets that one term from an rset. Used by rsisamX */
 void rset_get_one_term(RSET ct,TERMID *terms,int maxterms,int *curterm)
 {
-    yaz_log(LOG_LOG,"FIXME: get_one_term: max=%d cur=%d", maxterms, *curterm);
     if (ct->term)
     {
-        yaz_log(LOG_LOG,"FIXME: get_one_term: '%s'", ct->term->name);
         if (*curterm < maxterms)
             terms[*curterm]=ct->term;
         (*curterm)++;