For estimated hit counts, Zebra returns resultSetStatus=estimtate as

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

diff --git a/index/zebrasrv.c b/index/zebrasrv.c
index 966c186..234fae0 100644 (file)
--- a/index/zebrasrv.c
+++ b/index/zebrasrv.c
@@ -1,5 +1,5 @@
-/* $Id: zebrasrv.c,v 1.2 2006-11-21 22:17:49 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zebrasrv.c,v 1.6 2007-01-16 15:01:15 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -278,8 +278,10 @@ int bend_search(void *handle, bend_search_rr *r)
     switch (r->query->which)
     {
     case Z_Query_type_1: case Z_Query_type_101:
-       res = zebra_search_RPN(zh, r->stream, r->query->u.type_1,
-                              r->setname, &zhits);
+       res = zebra_search_RPN_x(zh, r->stream, r->query->u.type_1,
+                                 r->setname, &zhits,
+                                 &r->estimated_hit_count,
+                                 &r->partial_resultset);
        if (res != ZEBRA_OK)
            zebra_result(zh, &r->errcode, &r->errstring);
        else
@@ -630,7 +632,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                     rec->u.octet_aligned->len,
                                     rec->u.octet_aligned->buf);
                    }
-                    if (oident && oident->value != VAL_TEXT_XML)
+                    if (oident && oident->value != VAL_TEXT_XML 
+                        && oident->value != VAL_SUTRS)
                     {
                         rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED;
                         rr->errstring = "only XML update supported";
@@ -756,9 +759,14 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
 
 static void bend_start (struct statserv_options_block *sob)
 {
+    Res default_res = res_open(0, 0);
+
     if (sob->handle)
        zebra_stop((ZebraService) sob->handle);
+    res_set(default_res, "profilePath", DEFAULT_PROFILE_PATH);
+    res_set(default_res, "modulePath", DEFAULT_MODULE_PATH);
     sob->handle = zebra_start(sob->configname);
+    res_close(default_res);
     if (!sob->handle)
     {
        yaz_log (YLOG_FATAL, "Failed to read config `%s'", sob->configname);