Fixed bug #944: Allow extraction of multiple records per ES update.

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

diff --git a/index/zebrasrv.c b/index/zebrasrv.c
index 613febb..0980f8e 100644 (file)
--- a/index/zebrasrv.c
+++ b/index/zebrasrv.c
@@ -1,5 +1,5 @@
-/* $Id: zebrasrv.c,v 1.3 2006-12-05 09:26:37 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zebrasrv.c,v 1.11 2007-03-13 13:46:11 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -261,6 +261,15 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r)
     }
 }
 
+
+static int break_handler(void *client_data)
+{
+    bend_association assoc =(bend_association) client_data;    
+    if (!bend_assoc_is_alive(assoc))
+        return 1;
+    return 0;
+}
+
 int bend_search(void *handle, bend_search_rr *r)
 {
     ZebraHandle zh = (ZebraHandle) handle;
@@ -274,12 +283,15 @@ int bend_search(void *handle, bend_search_rr *r)
         zebra_result (zh, &r->errcode, &r->errstring);
         return 0;
     }
+    zebra_set_break_handler(zh, break_handler, r->association);
     yaz_log (YLOG_DEBUG, "ResultSet '%s'", r->setname);
     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
@@ -297,6 +309,7 @@ int bend_search(void *handle, bend_search_rr *r)
     default:
         r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP;
     }
+    zebra_set_break_handler(zh, 0, 0);
     return 0;
 }
 
@@ -630,7 +643,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";
@@ -698,7 +712,6 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                }
                                break;
                            case 2:
-                           case 4:
                                r = zebra_update_record(
                                    zh,
                                    0, /* recordType */
@@ -707,7 +720,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                    0, /* fname */
                                    (const char *) rec->u.octet_aligned->buf,
                                    rec->u.octet_aligned->len,
-                                   1);
+                                   0  /* force_update=0: action is a replace, so abort update if no corresponding record exists */
+                                   );
                                if (r == ZEBRA_FAIL)
                                {
                                    rr->errcode =
@@ -732,6 +746,24 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                    rr->errstring = "delete_record failed";
                                }
                                break;
+                           case 4:
+                               r = zebra_update_record(
+                                   zh,
+                                   0, /* recordType */
+                                   sysno,
+                                   0, /* match */
+                                   0, /* fname */
+                                   (const char *) rec->u.octet_aligned->buf,
+                                   rec->u.octet_aligned->len,
+                                   1  /* force_update=1: action is a specialUpdate, so allow replace or insert */
+                                   );
+                               if (r == ZEBRA_FAIL)
+                               {
+                                   rr->errcode =
+                                       YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED;
+                                   rr->errstring = "update_record failed";
+                               }
+                               break;
                            }                           
                        }
                     }
@@ -762,7 +794,7 @@ static void bend_start (struct statserv_options_block *sob)
        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);
+    sob->handle = zebra_start_res(sob->configname, default_res, 0);
     res_close(default_res);
     if (!sob->handle)
     {