From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 7 Dec 2005 17:00:46 +0000 (+0000)
Subject: Somewhat improved diagnostics for update with opaque record ID
X-Git-Tag: before.bug.529~288
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=ddcf0c647f3685b150885b547cd7d7cb71d5f722;p=idzebra-moved-to-github.git

Somewhat improved diagnostics for update with opaque record ID
---

diff --git a/index/zebraapi.c b/index/zebraapi.c
index d23ea47..8cdaa51 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.194 2005-11-09 11:51:29 adam Exp $
+/* $Id: zebraapi.c,v 1.195 2005-12-07 17:00:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -1324,7 +1324,11 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     zebra_clearError(zh);
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
+    {
+	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+		       "no record ID or empty record ID");
         return ZEBRA_FAIL;
+    }
 
     memcpy (recid_z, recid_buf, recid_len);
     recid_z[recid_len] = 0;
@@ -1337,8 +1341,10 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     {
         if (action == 1)  /* fail if insert */
         {
-	     zebra_end_trans(zh);
-	     return ZEBRA_FAIL;
+	    zebra_end_trans(zh);
+	    zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+			   "Cannot insert record: already exist");
+	    return ZEBRA_FAIL;
 	}
 
         memcpy (&sysno, rinfo+1, sizeof(sysno));
@@ -1348,6 +1354,8 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
         if (action == 2 || action == 3) /* fail if delete or update */
         {
 	    zebra_end_trans(zh);
+	    zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+			   "Cannot delete/update record: does not exist");
             return ZEBRA_FAIL;
 	}
 	action = 1;  /* make it an insert (if it's an update).. */
@@ -1362,6 +1370,11 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
 			   0, /* force update */
 				 1  /* allow update */
 	);
+    if (res == ZEBRA_FAIL)
+    {
+	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+		       "Unable to parse record");
+    }
     if (action == 1)
     {
         dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
diff --git a/index/zserver.c b/index/zserver.c
index 4df48fe..cd8e8b7 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.141 2005-11-02 11:43:26 adam Exp $
+/* $Id: zserver.c,v 1.142 2005-12-07 17:00:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -656,9 +656,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                 action);
                             if (r)
                             {
-                                rr->errcode =
-				    YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED;
-                                rr->errstring = "record exchange failed";
+				zebra_result(zh, &rr->errcode,
+					     &rr->errstring);
                                 break;
                             }
 			}