Fix dbaccesslist not being initialized (when no auth is used)

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

diff --git a/index/zrpn.c b/index/zrpn.c
index 4b451c4..66e6990 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.202 2005-06-23 06:45:46 adam Exp $
+/* $Id: zrpn.c,v 1.205 2005-08-26 10:13:31 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -235,13 +235,13 @@ static void add_isam_p(const char *name, const char *info,
         const char *db;
         int set, use;
         char term_tmp[IT_MAX_WORD];
-        int su_code = 0;
-        int len = key_SU_decode (&su_code, name);
+        int ord = 0;
+        int len = key_SU_decode (&ord, (const unsigned char *) name);
         
         zebra_term_untrans  (p->zh, p->reg_type, term_tmp, name+len+1);
-        yaz_log(log_level_rpn, "grep: %d %c %s", su_code, name[len], term_tmp);
+        yaz_log(log_level_rpn, "grep: %d %c %s", ord, name[len], term_tmp);
         zebraExplain_lookup_ord (p->zh->reg->zei,
-                                 su_code, &db, &set, &use);
+                                 ord, 0 /* index_type */, &db, &set, &use);
         yaz_log(log_level_rpn, "grep:  set=%d use=%d db=%s", set, use, db);
         
         resultSetAddTerm(p->zh, p->termset, name[len], db,
@@ -1021,7 +1021,7 @@ static ZEBRA_RES term_limits_APT(ZebraHandle zh,
        /* 0 is the same as global limit */
        *hits_limit_value = zh->approx_limit;
     }
-    yaz_log(YLOG_LOG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT,
+    yaz_log(YLOG_DEBUG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT,
            *term_ref_id_str ? *term_ref_id_str : "none",
            *hits_limit_value);
     return ZEBRA_OK;
@@ -1390,7 +1390,7 @@ static ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     case Z_Term_general:
         if (zh->iconv_to_utf8 != 0)
         {
-            char *inbuf = term->u.general->buf;
+            char *inbuf = (char *) term->u.general->buf;
             size_t inleft = term->u.general->len;
             char *outbuf = termz;
             size_t outleft = IT_MAX_WORD-1;