Update for YAZ 3s new OID system

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

diff --git a/index/rpnscan.c b/index/rpnscan.c
index 38a9aee..be4e765 100644 (file)
--- a/index/rpnscan.c
+++ b/index/rpnscan.c
@@ -1,4 +1,4 @@
-/* $Id: rpnscan.c,v 1.5 2007-01-15 15:10:17 adam Exp $
+/* $Id: rpnscan.c,v 1.7 2007-04-16 08:44:32 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <attrfind.h>
 #include <charmap.h>
 #include <rset.h>
+#include <yaz/oid_db.h>
 
 #define RPN_MAX_ORDS 32
 
@@ -150,7 +151,7 @@ static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
     RSET rset = 0;
     for (i = 0; i < ord_no; i++)
     {
-        if (ar[i].isam_p && strcmp(wrbuf_buf(ar[i].term), term) == 0)
+        if (ar[i].isam_p && strcmp(wrbuf_cstr(ar[i].term), term) == 0)
         {
             RSET rset_t = rset_trunc(
                     zh, &ar[i].isam_p, 1,
@@ -265,7 +266,7 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
                 ar[i].pos_to_save = -1;
 
                 strcpy(termz, ar[i].prefix);
-                strcat(termz, wrbuf_buf(ar[i].term));
+                strcat(termz, wrbuf_cstr(ar[i].term));
                 dict_scan(zh->reg->dict, termz, &before, &after,
                           ar+i, scan_handle2);
             }
@@ -274,8 +275,8 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
         for (i = 0; i < ord_no; i++)
         {
             if (ar[i].isam_p 
-                && (hi == 0 || strcmp(wrbuf_buf(ar[i].term), hi) > 0))
-                hi = wrbuf_buf(ar[i].term);
+                && (hi == 0 || strcmp(wrbuf_cstr(ar[i].term), hi) > 0))
+                hi = wrbuf_cstr(ar[i].term);
         }
         if (!hi)
             break;
@@ -329,7 +330,7 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
                 ar[i].pos_to_save = 1;
 
                 strcpy(termz, ar[i].prefix);
-                strcat(termz, wrbuf_buf(ar[i].term));
+                strcat(termz, wrbuf_cstr(ar[i].term));
                 dict_scan(zh->reg->dict, termz, &before, &after,
                           ar+i, scan_handle2);
             }
@@ -338,8 +339,8 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
         for (i = 0; i < ord_no; i++)
         {
             if (ar[i].isam_p 
-                && (lo == 0 || strcmp(wrbuf_buf(ar[i].term), lo) < 0))
-                lo = wrbuf_buf(ar[i].term);
+                && (lo == 0 || strcmp(wrbuf_cstr(ar[i].term), lo) < 0))
+                lo = wrbuf_cstr(ar[i].term);
         }
         if (!lo)
             break;
@@ -376,7 +377,7 @@ struct scan_info {
 };
 
 ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
-                  oid_value attributeset,
+                  const int *attributeset,
                   int num_bases, char **basenames,
                   int *position, int *num_entries, ZebraScanEntry **list,
                   int *is_partial, RSET limit_set)
@@ -396,8 +397,8 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     *list = 0;
     *is_partial = 0;
 
-    if (attributeset == VAL_NONE)
-        attributeset = VAL_BIB1;
+    if (!attributeset)
+        attributeset = yaz_oid_attset_bib1();
 
     if (!limit_set) /* no limit set given already */
     {
@@ -426,8 +427,8 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
         }
     }
         
-    yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d",
-           *position, *num_entries, attributeset);
+    yaz_log(YLOG_DEBUG, "position = %d, num = %d",
+           *position, *num_entries);
         
     if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type,
                        rank_type, &complete_flag, &sort_flag))