X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=e161888d164b0111897ab80efe10ed554ffb2886;hp=cb3dbdb30d835a6b4e42db53892402b445a6871f;hb=163abf332e441c2d39cf6ee4e83bad169fa1c59c;hpb=4fb9818b0657f561397b29e55d87cc8d4f194436

diff --git a/src/zoom-c.c b/src/zoom-c.c
index cb3dbdb..e161888 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.19 2004-01-16 10:04:54 adam Exp $
+ * $Id: zoom-c.c,v 1.21 2004-01-27 12:15:12 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -922,7 +922,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
 	ZOOM_options_get(c->options, "implementationName"),
 	odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
 
-    version = odr_strdup(c->odr_out, "$Revision: 1.19 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.21 $");
     if (strlen(version) > 10)	/* check for unexpanded CVS strings */
 	version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
@@ -2453,7 +2453,8 @@ static Z_APDU *create_update_package(ZOOM_package p)
     int num_db;
     char **db = set_DatabaseNames(p->connection, p->options, &num_db);
     const char *action = ZOOM_options_get(p->options, "action");
-    const char *recordId = ZOOM_options_get(p->options, "recordId");
+    const char *recordIdOpaque = ZOOM_options_get(p->options, "recordIdOpaque");
+    const char *recordIdNumber = ZOOM_options_get(p->options, "recordIdNumber");
     const char *record_buf = ZOOM_options_get(p->options, "record");
     const char *syntax_str = ZOOM_options_get(p->options, "syntax");
     int syntax_oid = VAL_NONE;
@@ -2529,14 +2530,21 @@ static Z_APDU *create_update_package(ZOOM_package p)
 	notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
 	    odr_malloc(p->odr_out, sizeof(**notToKeep->elements));
 	notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
-	if (recordId)
+	if (recordIdOpaque)
 	{
 	    notToKeep->elements[0]->u.opaque = (Odr_oct *)
 		odr_malloc (p->odr_out, sizeof(Odr_oct));
-	    notToKeep->elements[0]->u.opaque->size = strlen(recordId);
-	    notToKeep->elements[0]->u.opaque->len = strlen(recordId);
+	    notToKeep->elements[0]->u.opaque->size =
+		notToKeep->elements[0]->u.opaque->len = strlen(recordIdOpaque);
 	    notToKeep->elements[0]->u.opaque->buf =
-		odr_strdup(p->odr_out, recordId);
+		odr_strdup(p->odr_out, recordIdOpaque);
+	}
+	else if (recordIdNumber)
+	{
+	    notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_number;
+	    
+	    notToKeep->elements[0]->u.number =
+		odr_intdup(p->odr_out, atoi(recordIdNumber));
 	}
 	else
 	    notToKeep->elements[0]->u.opaque = 0;
@@ -2941,8 +2949,20 @@ static void handle_srw_response(ZOOM_connection c,
     }
     if (res->num_diagnostics > 0)
     {
-        set_dset_error(c, *res->diagnostics[0].code, "SRW",
-                       res->diagnostics[0].details, 0);
+	const char *std_diag = "info:srw/diagnostic/1/1/";
+	const char *code = res->diagnostics[0].code;
+	const char *cp;
+	const char *category = code;
+	int code_int = 0;
+
+	if (code && (cp = strrchr(code, '/')))
+	    code_int = atoi(cp+1);
+	if (code && !strncmp(code, std_diag, strlen(std_diag)))
+	    category = "SRW";
+
+	if (category)
+	    set_dset_error(c, code_int, category,
+			   res->diagnostics[0].details, 0);
     }
     nmem = odr_extract_mem(c->odr_in);
     nmem_transfer(resultset->odr->mem, nmem);