Add support for section/chapter indexing. Add safari filter.

[idzebra-moved-to-github.git] / index / zsets.c

diff --git a/index/zsets.c b/index/zsets.c
index 78b69d6..6fe00c4 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.70 2004-11-15 22:44:33 adam Exp $
+/* $Id: zsets.c,v 1.72 2004-11-29 21:55:28 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -137,60 +137,6 @@ void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
     (s->hits)++;
 }
 
-#if 0 /* FIXME - Delete this, we don't count terms no more */
-int zebra_resultSetTerms (ZebraHandle zh, const char *setname, 
-                          int no, zint *count, 
-                          int *type, char *out, size_t *len)
-{
-    ZebraSet s = resultSetGet (zh, setname);
-    int no_max = 0;
-
-    if (count)
-        *count = 0;
-    if (!s || !s->rset)
-        return 0;
-    no_max = s->rset->no_rset_terms;
-    if (no < 0 || no >= no_max)
-        return 0;
-    if (count)
-        *count = s->rset->rset_terms[no]->count;
-    if (type)
-        *type = s->rset->rset_terms[no]->type;
-    
-    if (out)
-    {
-        char *inbuf = s->rset->rset_terms[no]->name;
-        size_t inleft = strlen(inbuf);
-        size_t outleft = *len - 1;
-        int converted = 0;
-
-        if (zh->iconv_from_utf8 != 0)
-        {
-            char *outbuf = out;
-            size_t ret;
-            
-            ret = yaz_iconv(zh->iconv_from_utf8, &inbuf, &inleft,
-                        &outbuf, &outleft);
-            if (ret == (size_t)(-1))
-                *len = 0;
-            else
-                *len = outbuf - out;
-            converted = 1;
-        }
-        if (!converted)
-        {
-            if (inleft > outleft)
-                inleft = outleft;
-            *len = inleft;
-            memcpy (out, inbuf, *len);
-        }
-        out[*len] = 0;
-    }
-    return no_max;
-}
-
-#endif
-
 ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
 {
     ZebraSet s;
@@ -201,7 +147,7 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
             break;
     if (s)
     {
-        yaz_log(LOG_DEBUG, "updating result set %s", name);
+        yaz_log(YLOG_DEBUG, "updating result set %s", name);
         if (!ov || s->locked)
             return NULL;
         if (s->rset)
@@ -215,7 +161,7 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
     {
         const char *sort_max_str = zebra_get_resource(zh, "sortmax", "1000");
 
-        yaz_log(LOG_DEBUG, "adding result set %s", name);
+        yaz_log(YLOG_DEBUG, "adding result set %s", name);
         s = (ZebraSet) xmalloc (sizeof(*s));
         s->next = zh->sets;
         zh->sets = s;
@@ -257,7 +203,7 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name)
             if (!s->term_entries && !s->rset && s->rpn)
             {
                 NMEM nmem = nmem_create ();
-                yaz_log(LOG_LOG, "research %s", name);
+                yaz_log(YLOG_LOG, "research %s", name);
                 if (!s->rset_nmem)
                     s->rset_nmem=nmem_create();
                 s->rset =
@@ -332,11 +278,11 @@ void resultSetDestroy (ZebraHandle zh, int num, char **names,int *statuses)
     }
 }
 
-ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, 
-                               int num, int *positions)
+ZebraMetaRecord *zebra_meta_records_create (ZebraHandle zh, const char *name, 
+                                           int num, zint *positions)
 {
     ZebraSet sset;
-    ZebraPosSet sr = 0;
+    ZebraMetaRecord *sr = 0;
     RSET rset;
     int i;
     struct zset_sort_info *sort_info;
@@ -347,7 +293,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
     {
         if (!sset->term_entries)
             return 0;
-        sr = (ZebraPosSet) xmalloc (sizeof(*sr) * num);
+        sr = (ZebraMetaRecord *) xmalloc (sizeof(*sr) * num);
         for (i = 0; i<num; i++)
         {
             sr[i].sysno = 0;
@@ -364,7 +310,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
     }
     else
     {
-        sr = (ZebraPosSet) xmalloc (sizeof(*sr) * num);
+        sr = (ZebraMetaRecord *) xmalloc (sizeof(*sr) * num);
         for (i = 0; i<num; i++)
         {
             sr[i].sysno = 0;
@@ -382,7 +328,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
                 position = positions[i];
                 if (position > 0 && position <= sort_info->num_entries)
                 {
-                    yaz_log(LOG_DEBUG, "got pos=%d (sorted)", position);
+                    yaz_log(YLOG_DEBUG, "got pos=%d (sorted)", position);
                     sr[i].sysno = sort_info->entries[position-1]->sysno;
                     sr[i].score = sort_info->entries[position-1]->score;
                 }
@@ -410,6 +356,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
             while (num_i < num && rset_read (rfd, &key, 0))
             {
                 zint this_sys = key.mem[0];
+               yaz_log(YLOG_LOG, "RSET READ " ZINT_FORMAT, this_sys);
                 if (this_sys != psysno)
                 {
                     psysno = this_sys;
@@ -427,7 +374,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
                     if (position == positions[num_i])
                     {
                         sr[num_i].sysno = psysno;
-                        yaz_log(LOG_DEBUG, "got pos=%d (unsorted)", position);
+                        yaz_log(YLOG_DEBUG, "got pos=%d (unsorted)", position);
                         sr[num_i].score = -1;
                         num_i++;
                     }
@@ -439,7 +386,8 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
     return sr;
 }
 
-void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num)
+void zebra_meta_records_destroy (ZebraHandle zh, ZebraMetaRecord *records,
+                                int num)
 {
     assert(zh); /* compiler shut up about unused arg */
     xfree (records);
@@ -591,7 +539,7 @@ void resultSetSort (ZebraHandle zh, NMEM nmem,
         zh->errCode = 230;
         return;
     }
-    yaz_log(LOG_DEBUG, "result set sort input=%s output=%s",
+    yaz_log(YLOG_DEBUG, "result set sort input=%s output=%s",
           *input_setnames, output_setname);
     sset = resultSetGet (zh, input_setnames[0]);
     if (!sset)
@@ -670,20 +618,20 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
         switch (sk->which)
         {
         case Z_SortKey_sortField:
-            yaz_log(LOG_DEBUG, "Sort: key %d is of type sortField", i+1);
+            yaz_log(YLOG_DEBUG, "Sort: key %d is of type sortField", i+1);
             zh->errCode = 207;
             return;
         case Z_SortKey_elementSpec:
-            yaz_log(LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
+            yaz_log(YLOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
             zh->errCode = 207;
             return;
         case Z_SortKey_sortAttributes:
-            yaz_log(LOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
+            yaz_log(YLOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
             sort_criteria[i].attrUse =
                 zebra_maps_sort (zh->reg->zebra_maps,
                                  sk->u.sortAttributes,
                                  &sort_criteria[i].numerical);
-            yaz_log(LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
+            yaz_log(YLOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
             if (sort_criteria[i].attrUse == -1)
             {
                 zh->errCode = 116;
@@ -712,10 +660,10 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
         }
     }
     rset_close (rfd);
-    yaz_log(LOG_DEBUG, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, sort",
+    yaz_log(YLOG_DEBUG, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, sort",
                    kno, sset->hits);   
     for (i = 0; i < numTerms; i++)
-        yaz_log(LOG_LOG, "term=\"%s\" type=%s count=" ZINT_FORMAT,
+        yaz_log(YLOG_LOG, "term=\"%s\" type=%s count=" ZINT_FORMAT,
                  terms[i]->name, terms[i]->flags, rset_count(terms[i]->rset));
     *sort_status = Z_SortResponse_success;
 }
@@ -760,7 +708,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem)
     rank_class = zebraRankLookup (zh, rank_handler_name);
     if (!rank_class)
     {
-        yaz_log(LOG_WARN, "No such rank handler: %s", rank_handler_name);
+        yaz_log(YLOG_WARN, "No such rank handler: %s", rank_handler_name);
         return;
     }
     rc = rank_class->control;
@@ -779,8 +727,9 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem)
         do
         {
             zint this_sys = key.mem[0]; /* FIXME - assumes scope==2 */
-            zint seqno = key.mem[1]; /* FIXME - assumes scope==2 */
+            zint seqno = key.mem[key.len-1]; /* FIXME - assumes scope==2 */
             kno++;
+           yaz_log(YLOG_LOG, "got sysno=%lld", this_sys);
             if (this_sys != psysno)
             {
                 score = (*rc->calc) (handle, psysno);
@@ -797,7 +746,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem)
                 if (tot>0) {
                     ratio = cur/tot;
                     est = (zint)(0.5+zebraSet->hits/ratio);
-                    logf(LOG_LOG, "Estimating hits (%s) "
+                    yaz_log(YLOG_LOG, "Estimating hits (%s) "
                                   "%0.1f->" ZINT_FORMAT
                                   "; %0.1f->" ZINT_FORMAT,
                                   rset->control->desc,
@@ -821,11 +770,11 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem)
     }
     rset_close (rfd);
 
-    yaz_log(LOG_DEBUG, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, rank",
+    yaz_log(YLOG_DEBUG, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, rank",
            kno, zebraSet->hits);
     for (i = 0; i < numTerms; i++)
     {
-        yaz_log(LOG_LOG, "term=\"%s\" type=%s count=" ZINT_FORMAT,
+        yaz_log(YLOG_LOG, "term=\"%s\" type=%s count=" ZINT_FORMAT,
                  terms[i]->name, terms[i]->flags, rset_count(terms[i]->rset));
     }
 }
@@ -863,9 +812,9 @@ void zebraRankDestroy (struct zebra_register *reg)
         ZebraRankClass p_next = p->next;
         if (p->init_flag && p->control->destroy)
             (*p->control->destroy)(reg, p->class_handle);
-        xfree (p->control->name);
-        xfree (p->control);
-        xfree (p);
+        xfree(p->control->name);
+        xfree(p->control);
+        xfree(p);
         p = p_next;
     }
     reg->rank_classes = NULL;