X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frpnsearch.c;h=ed114a3aa9a02e8e7f51f6a52d4c43c9123b8843;hb=d58c970cc76247dc3f7f263bf235daf6177695af;hp=d07bf3ffe7a74f9350cf00a55f3fdf174fc54a4d;hpb=99dfd244ebcc60d73eb50500f67207ae1aa591d8;p=idzebra-moved-to-github.git

diff --git a/index/rpnsearch.c b/index/rpnsearch.c
index d07bf3f..ed114a3 100644
--- a/index/rpnsearch.c
+++ b/index/rpnsearch.c
@@ -1,4 +1,4 @@
-/* $Id: rpnsearch.c,v 1.21 2007-11-08 21:21:58 adam Exp $
+/* $Id: rpnsearch.c,v 1.26 2007-12-03 14:33:22 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -987,7 +987,7 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     int relation_error;
     char ord_buf[32];
     int ord_len, i;
-    zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+    zebra_map_t zm = zebra_map_get_or_add(zh->reg->zebra_maps, index_type);
 
     *ol = ord_list_create(stream);
 
@@ -1137,7 +1137,7 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     {
         WRBUF pr_wr = wrbuf_alloc();
 
-        wrbuf_verbose_str(pr_wr, wrbuf_buf(term_dict), wrbuf_len(term_dict));
+        wrbuf_write_escaped(pr_wr, wrbuf_buf(term_dict), wrbuf_len(term_dict));
         yaz_log(YLOG_LOG, "dict_lookup_grep: %s", wrbuf_cstr(pr_wr));
         wrbuf_destroy(pr_wr);
     }
@@ -1319,7 +1319,7 @@ static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
     int ord_len;
     char *val;
     ISAM_P isam_p;
-    zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+    zebra_map_t zm = zebra_map_get_or_add(zh->reg->zebra_maps, index_type);
     
     attr_init_APT(&position, zapt, 3);
     position_value = attr_find(&position, NULL);
@@ -1345,13 +1345,6 @@ static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
         return ZEBRA_FAIL;
     }
 
-    if (!zh->reg->isamb && !zh->reg->isamc)
-    {
-        zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE,
-                            position_value);
-        return ZEBRA_FAIL;
-    }
-
     if (zebra_apt_get_ord(zh, zapt, index_type, 0,
                           attributeSet, &ord) != ZEBRA_OK)
     {
@@ -1365,13 +1358,9 @@ static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
     {
         assert(*val == sizeof(ISAM_P));
         memcpy(&isam_p, val+1, sizeof(isam_p));
-        
-        if (zh->reg->isamb)
-            *rset = rsisamb_create(rset_nmem, kc, kc->scope,
-                                   zh->reg->isamb, isam_p, 0);
-        else if (zh->reg->isamc)
-            *rset = rsisamc_create(rset_nmem, kc, kc->scope,
-                                   zh->reg->isamc, isam_p, 0);
+
+        *rset = zebra_create_rset_isam(zh, rset_nmem, kc, kc->scope, 
+                                       isam_p, 0);
     }
     return ZEBRA_OK;
 }
@@ -1408,7 +1397,12 @@ static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh,
                                       rset_nmem, &first_set,
                                       kc);
         if (res != ZEBRA_OK)
+        {
+            int i;
+            for (i = 0; i<num_result_sets; i++)
+                rset_delete(result_sets[i]);
             return res;
+        }
         if (first_set)
         {
             RSET *nsets = nmem_malloc(stream,
@@ -1678,7 +1672,7 @@ static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     int relation_error = 0;
     int ord, ord_len, i;
     char ord_buf[32];
-    zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+    zebra_map_t zm = zebra_map_get_or_add(zh->reg->zebra_maps, index_type);
     
     *ol = ord_list_create(stream);
 
@@ -2143,7 +2137,7 @@ static ZEBRA_RES rpn_search_database(ZebraHandle zh,
 static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 				const Odr_oid *attributeSet, NMEM stream,
 				Z_SortKeySpecList *sort_sequence,
-				int num_bases, char **basenames, 
+				int num_bases, const char **basenames, 
 				NMEM rset_nmem,
 				RSET *rset,
 				struct rset_key_control *kc)
@@ -2313,7 +2307,7 @@ static ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
 				      const Odr_oid *attributeSet, 
 				      NMEM stream, NMEM rset_nmem,
 				      Z_SortKeySpecList *sort_sequence,
-				      int num_bases, char **basenames,
+				      int num_bases, const char **basenames,
 				      RSET **result_sets, int *num_result_sets,
 				      Z_Operator *parent_op,
 				      struct rset_key_control *kc);
@@ -2353,7 +2347,7 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
 			 const Odr_oid *attributeSet, 
 			 NMEM stream, NMEM rset_nmem,
 			 Z_SortKeySpecList *sort_sequence,
-			 int num_bases, char **basenames,
+			 int num_bases, const char **basenames,
 			 RSET *result_set)
 {
     RSET *result_sets = 0;
@@ -2390,7 +2384,7 @@ ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
 			       const Odr_oid *attributeSet, 
 			       NMEM stream, NMEM rset_nmem,
 			       Z_SortKeySpecList *sort_sequence,
-			       int num_bases, char **basenames,
+			       int num_bases, const char **basenames,
 			       RSET **result_sets, int *num_result_sets,
 			       Z_Operator *parent_op,
 			       struct rset_key_control *kc)