Handle undefined rank handler

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

diff --git a/index/zsets.c b/index/zsets.c
index 17c7de6..d543abd 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,5 +1,5 @@
-/* $Id: zsets.c,v 1.40 2003-01-13 22:37:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zsets.c,v 1.49 2004-06-13 18:45:25 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -70,7 +70,7 @@ struct zset_sort_info {
     struct zset_sort_entry **entries;
 };
 
-ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
+ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,
                          Z_RPNQuery *rpn, int num_bases,
                           char **basenames, 
                          const char *setname)
@@ -87,7 +87,7 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
        return 0;
     zebraSet->locked = 1;
     zebraSet->rpn = 0;
-    zebraSet->nmem = nmem_create ();
+    zebraSet->nmem = m;
 
     zebraSet->num_bases = num_bases;
     zebraSet->basenames = 
@@ -96,7 +96,7 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
         zebraSet->basenames[i] = nmem_strdup (zebraSet->nmem, basenames[i]);
 
 
-    zebraSet->rset = rpn_search (zh, output->mem, rpn,
+    zebraSet->rset = rpn_search (zh, zebraSet->nmem, rpn,
                                  zebraSet->num_bases,
                                 zebraSet->basenames, zebraSet->name,
                                 zebraSet);
@@ -197,7 +197,7 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
            break;
     if (s)
     {
-       logf (LOG_DEBUG, "updating result set %s", name);
+       yaz_log (LOG_DEBUG, "updating result set %s", name);
        if (!ov || s->locked)
            return NULL;
        if (s->rset)
@@ -207,7 +207,9 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
     }
     else
     {
-       logf (LOG_DEBUG, "adding result set %s", name);
+       const char *sort_max_str = zebra_get_resource(zh, "sortmax", "1000");
+
+       yaz_log (LOG_DEBUG, "adding result set %s", name);
        s = (ZebraSet) xmalloc (sizeof(*s));
        s->next = zh->sets;
        zh->sets = s;
@@ -216,7 +218,10 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
 
        s->sort_info = (struct zset_sort_info *)
            xmalloc (sizeof(*s->sort_info));
-       s->sort_info->max_entries = 1000;
+       s->sort_info->max_entries = atoi(sort_max_str);
+       if (s->sort_info->max_entries < 2)
+           s->sort_info->max_entries = 2;
+
        s->sort_info->entries = (struct zset_sort_entry **)
            xmalloc (sizeof(*s->sort_info->entries) *
                     s->sort_info->max_entries);
@@ -363,7 +368,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
                position = positions[i];
                if (position > 0 && position <= sort_info->num_entries)
                {
-                   logf (LOG_DEBUG, "got pos=%d (sorted)", position);
+                   yaz_log (LOG_DEBUG, "got pos=%d (sorted)", position);
                    sr[i].sysno = sort_info->entries[position-1]->sysno;
                    sr[i].score = sort_info->entries[position-1]->score;
                }
@@ -408,7 +413,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
                    if (position == positions[num_i])
                    {
                        sr[num_i].sysno = psysno;
-                       logf (LOG_DEBUG, "got pos=%d (unsorted)", position);
+                       yaz_log (LOG_DEBUG, "got pos=%d (unsorted)", position);
                        sr[num_i].score = -1;
                        num_i++;
                    }
@@ -570,7 +575,7 @@ void resultSetSort (ZebraHandle zh, NMEM nmem,
        zh->errCode = 230;
        return;
     }
-    logf (LOG_DEBUG, "result set sort input=%s output=%s",
+    yaz_log (LOG_DEBUG, "result set sort input=%s output=%s",
          *input_setnames, output_setname);
     sset = resultSetGet (zh, input_setnames[0]);
     if (!sset)
@@ -605,7 +610,7 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
     int term_index;
     RSFD rfd;
 
-    logf (LOG_LOG, "resultSetSortSingle start");
+    yaz_log (LOG_LOG, "resultSetSortSingle start");
     sset->sort_info->num_entries = 0;
 
     sset->hits = 0;
@@ -617,9 +622,9 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
        Z_SortKeySpec *sks = sort_sequence->specs[i];
        Z_SortKey *sk;
 
-       if (*sks->sortRelation == Z_SortRelation_ascending)
+       if (*sks->sortRelation == Z_SortKeySpec_ascending)
            sort_criteria[i].relation = 'A';
-       else if (*sks->sortRelation == Z_SortRelation_descending)
+       else if (*sks->sortRelation == Z_SortKeySpec_descending)
            sort_criteria[i].relation = 'D';
        else
        {
@@ -640,20 +645,20 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
        switch (sk->which)
        {
        case Z_SortKey_sortField:
-           logf (LOG_DEBUG, "Sort: key %d is of type sortField", i+1);
+           yaz_log (LOG_DEBUG, "Sort: key %d is of type sortField", i+1);
            zh->errCode = 207;
            return;
        case Z_SortKey_elementSpec:
-           logf (LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
+           yaz_log (LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
            zh->errCode = 207;
            return;
        case Z_SortKey_sortAttributes:
-           logf (LOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
+           yaz_log (LOG_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);
-           logf (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
+           yaz_log (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
            if (sort_criteria[i].attrUse == -1)
            {
                zh->errCode = 116;
@@ -687,11 +692,11 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
                  rset->rset_terms[i]->flags,
                  rset->rset_terms[i]->count);
 
-    *sort_status = Z_SortStatus_success;
-    logf (LOG_LOG, "resultSetSortSingle end");
+    *sort_status = Z_SortResponse_success;
+    yaz_log (LOG_LOG, "resultSetSortSingle end");
 }
 
-RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId)
+RSET resultSetRef (ZebraHandle zh, const char *resultSetId)
 {
     ZebraSet s;
 
@@ -709,6 +714,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     ZebraRankClass rank_class;
     struct rank_control *rc;
     struct zset_sort_info *sort_info;
+    const char *rank_handler_name = res_get_def(zh->res, "rank", "rank-1");
 
     sort_info = zebraSet->sort_info;
     sort_info->num_entries = 0;
@@ -717,7 +723,12 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
 
     yaz_log (LOG_LOG, "resultSetRank");
 
-    rank_class = zebraRankLookup (zh, "rank-1");
+    rank_class = zebraRankLookup (zh, rank_handler_name);
+    if (!rank_class)
+    {
+        yaz_log (LOG_WARN, "No such rank handler: %s", rank_handler_name);
+        return;
+    }
     rc = rank_class->control;
 
     if (rset_read (rset, rfd, &key, &term_index))
@@ -730,8 +741,6 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
        do
        {
            kno++;
-           yaz_log(LOG_LOG, "sysno=%d seqno=%d idx=%d", key.sysno, key.seqno,
-                               term_index);
            if (key.sysno != psysno)
            {
                score = (*rc->calc) (handle, psysno);
@@ -767,7 +776,7 @@ ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name)
     if (p && !p->init_flag)
     {
        if (p->control->create)
-           p->class_handle = (*p->control->create)(zh->reg);
+           p->class_handle = (*p->control->create)(zh);
        p->init_flag = 1;
     }
     return p;