X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frpnscan.c;h=242ab454eae83aa16db30e714f0938ff426a94ed;hb=951a16f58a1372353a1c85ef9e162ddbe84bbff6;hp=be4e765fe04a561af8520112512665f46a532bf7;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;p=idzebra-moved-to-github.git

diff --git a/index/rpnscan.c b/index/rpnscan.c
index be4e765..242ab45 100644
--- a/index/rpnscan.c
+++ b/index/rpnscan.c
@@ -1,4 +1,4 @@
-/* $Id: rpnscan.c,v 1.7 2007-04-16 08:44:32 adam Exp $
+/* $Id: rpnscan.c,v 1.10 2007-05-08 14:49:38 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -243,7 +243,11 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
         
         if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) == 
             ZEBRA_FAIL)
+        {
+            for (i = 0; i < ord_no; i++)
+                wrbuf_destroy(ar[i].term);
             return ZEBRA_FAIL;
+        }
         wrbuf_rewind(ar[i].term);
         wrbuf_puts(ar[i].term, termz + prefix_len);
         ar[i].isam_p = 0;
@@ -361,6 +365,9 @@ static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
 
     *list = glist;
 
+    for (i = 0; i < ord_no; i++)
+	wrbuf_destroy(ar[i].term);
+
     return ZEBRA_OK;
 }
 
@@ -377,7 +384,7 @@ struct scan_info {
 };
 
 ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
-		   const int *attributeset,
+		   const Odr_oid *attributeset,
 		   int num_bases, char **basenames,
 		   int *position, int *num_entries, ZebraScanEntry **list,
 		   int *is_partial, RSET limit_set)
@@ -398,7 +405,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     *is_partial = 0;
 
     if (!attributeset)
-        attributeset = yaz_oid_attset_bib1();
+        attributeset = yaz_oid_attset_bib_1;
 
     if (!limit_set) /* no limit set given already */
     {
@@ -416,7 +423,6 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
             
             if (termset_value_numeric != -2)
             {
-                
                 sprintf(resname, "%d", termset_value_numeric);
                 termset_name = resname;
             }
@@ -424,6 +430,14 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
                 termset_name = termset_value_string;
             
             limit_set = resultSetRef (zh, termset_name);
+
+            if (!limit_set)
+            {
+                zebra_setError(zh, 
+                               YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+                               termset_name);
+                return ZEBRA_FAIL;
+            }
         }
     }