X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=89890876c857ce88605872b3153c9ffdc3a4851d;hb=b26d8949b70912ac2e6852abe543890c5cb01c79;hp=62e3387e7e7f8a4ba591170320e60a9cdfb91dc1;hpb=c944571888712854653be0d2debf903b8651c8e2;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 62e3387..8989087 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.144 2005-12-09 11:33:32 adam Exp $
+/* $Id: zserver.c,v 1.146 2006-05-10 08:13:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -391,10 +391,11 @@ int bend_sort (void *handle, bend_sort_rr *rr)
 {
     ZebraHandle zh = (ZebraHandle) handle;
 
-    zebra_sort (zh, rr->stream,
-                rr->num_input_setnames, (const char **) rr->input_setnames,
-		rr->output_setname, rr->sort_sequence, &rr->sort_status);
-    zebra_result (zh, &rr->errcode, &rr->errstring);
+    if (zebra_sort (zh, rr->stream,
+		    rr->num_input_setnames, (const char **) rr->input_setnames,
+		    rr->output_setname, rr->sort_sequence, &rr->sort_status)
+	!= ZEBRA_OK)
+	zebra_result (zh, &rr->errcode, &rr->errstring);
     return 0;
 }
 
@@ -446,7 +447,12 @@ static void es_admin_request (bend_esrequest_rr *rr, ZebraHandle zh, Z_AdminEsRe
     case Z_ESAdminOriginPartToKeep_commit:
 	yaz_log(YLOG_LOG, "adm-commit");
 	if (r->toKeep->databaseName)
-	    zebra_select_database(zh, r->toKeep->databaseName);
+	{
+	    if (zebra_select_database(zh, r->toKeep->databaseName) !=
+		ZEBRA_OK)
+		yaz_log(YLOG_WARN, "zebra_select_database failed in "
+			"adm-commit");
+	}
 	zebra_commit(zh);
 	break;
     case Z_ESAdminOriginPartToKeep_shutdown:
@@ -728,7 +734,11 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
 			}
                     }
 		}
-                zebra_end_trans (zh);
+                if (zebra_end_trans (zh) != ZEBRA_OK)
+		{
+		    yaz_log(YLOG_WARN, "zebra_end_trans failed for"
+			    " extended service operation");
+		}
 	    }
 	}
     }
@@ -831,3 +841,11 @@ int main (int argc, char **argv)
 
     return statserv_main (argc, argv, bend_init, bend_close);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+