X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=8cdaa51b9da3d14ee1980d23b5e0b94aec4bb927;hb=ddcf0c647f3685b150885b547cd7d7cb71d5f722;hp=d419085e21b8e5653ab69d0650d12c8b90d78423;hpb=593927cb1897c1e3163c284448eff7fee6ddad51;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index d419085..8cdaa51 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.192 2005-10-28 07:25:30 adam Exp $
+/* $Id: zebraapi.c,v 1.195 2005-12-07 17:00:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -326,18 +326,13 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 
     reg->key_buf = 0;
 
-#if NEW_REC_KEYS
     reg->keys = zebra_rec_keys_open();
-#else
-    reg->keys.buf_max = 0;
-    reg->keys.buf = 0;
-    reg->keys.codec_handle = iscz1_start();
-#endif
 
+#if NATTR
+    reg->sortKeys = zebra_rec_keys_open();
+#else
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
-#if NATTR
-    reg->sortKeys.codec_handle = iscz1_start();
 #endif
 
     reg->records = 0;
@@ -500,17 +495,11 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     bfs_destroy (reg->bfs);
     data1_destroy (reg->dh);
 
-    xfree(reg->sortKeys.buf);
-#if NEW_REC_KEYS
     zebra_rec_keys_close(reg->keys);
-#else
-    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
+    zebra_rec_keys_close(reg->sortKeys);
+#else
+    xfree(reg->sortKeys.buf);
 #endif
 
     xfree(reg->key_buf);
@@ -1335,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;
@@ -1348,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));
@@ -1359,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).. */
@@ -1373,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);