X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Fzebraapi.c;h=8b393ec0a83a70c1df3868056eb143d952f48c3c;hb=fe11c4b55fa92d5c3c768218580841e69665ed72;hp=1fbb956babc80b282c928eaaf81ababf0f87c447;hpb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 1fbb956..8b393ec 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.178 2005-06-14 20:28:54 adam Exp $
+/* $Id: zebraapi.c,v 1.181 2005-08-17 21:29:44 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -172,9 +172,9 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
         log_level = yaz_log_module_level("zebraapi");
         log_level_initialized = 1;
     }
-
-    yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
-    assert(configName);
+    
+    yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+	    configName ? configName : "");
 
     if ((res = res_open (configName, def_res, over_res)))
     {
@@ -182,10 +182,7 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 	const char *passwd_encrypt = 0;
         ZebraService zh = xmalloc(sizeof(*zh));
 
-	yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
-        
         zh->global_res = res;
-        zh->configName = xstrdup(configName);
         zh->sessions = 0;
         
         zebra_chdir (zh);
@@ -316,6 +313,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
+#if NATTR
+    reg->sortKeys.codec_handle = iscz1_start();
+#endif
 
     reg->records = 0;
     reg->dict = 0;
@@ -480,6 +480,10 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     xfree(reg->keys.buf);
     if (reg->keys.codec_handle)
 	iscz1_stop(reg->keys.codec_handle);
+#if NATTR
+    if (reg->sortKeys.codec_handle)
+	iscz1_stop(reg->sortKeys.codec_handle);
+#endif
     xfree(reg->key_buf);
     xfree(reg->name);
     xfree(reg);
@@ -504,7 +508,6 @@ ZEBRA_RES zebra_stop(ZebraService zs)
     recTypeClass_destroy(zs->record_classes);
     nmem_destroy(zs->nmem);
     res_close (zs->global_res);
-    xfree(zs->configName);
     xfree(zs);
     return ZEBRA_OK;
 }
@@ -1008,7 +1011,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
 			 int *position,
 			 int *num_entries, ZebraScanEntry **entries,
-			 int *is_partial)
+			 int *is_partial,
+			 const char *setname)
 {
     YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
     Z_AttributesPlusTerm *zapt;
@@ -1022,7 +1026,8 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
     }
     else
 	res = zebra_scan(zh, stream, zapt, VAL_BIB1,
-			 position, num_entries, entries, is_partial);
+			 position, num_entries, entries, is_partial,
+			 setname);
     yaz_pqf_destroy (pqf_parser);
     return res;
 }
@@ -1031,9 +1036,11 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		     oid_value attributeset,
 		     int *position,
 		     int *num_entries, ZebraScanEntry **entries,
-		     int *is_partial)
+		     int *is_partial,
+		     const char *setname)
 {
     ZEBRA_RES res;
+    RSET limit_rset = 0;
     ASSERTZH;
     assert(stream);
     assert(zapt);
@@ -1049,9 +1056,21 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	*num_entries = 0;
 	return ZEBRA_FAIL;
     }
+    if (setname)
+    {
+	limit_rset = resultSetRef(zh, setname);
+	if (!limit_rset)
+	{
+	    zebra_setError(zh, 
+			   YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+			   setname);
+	    zebra_end_read (zh);
+	    return ZEBRA_FAIL;
+	}
+    }
     res = rpn_scan (zh, stream, zapt, attributeset,
 		    zh->num_basenames, zh->basenames, position,
-		    num_entries, entries, is_partial, 0, 0);
+		    num_entries, entries, is_partial, limit_rset, 0);
     zebra_end_read (zh);
     return res;
 }
@@ -2013,7 +2032,6 @@ const char *zebra_get_resource(ZebraHandle zh,
     const char *v;
     ASSERTZH;
     assert(name);
-    assert(defaultvalue);
     v = res_get_def (zh->res, name, (char *)defaultvalue);
     zebra_clearError(zh);
     yaz_log(log_level, "zebra_get_resource %s:%s", name, v);