X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzoom-c.c;h=a37e14a925d39076ab471df54267b1543556cf86;hb=ccd8958b42e2d3d6aee55dd1201d56eb7a278b56;hp=674f314b77b3cdb2b56f0300ae0bdc5fed0d8708;hpb=81b54a15b8c4277b1e25338d21188ea1e209edda;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 674f314..a37e14a 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.18 2004-01-12 12:10:17 adam Exp $
+ * $Id: zoom-c.c,v 1.20 2004-01-22 11:20:54 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -895,9 +895,13 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
         odr_malloc(c->odr_out, sizeof(*auth));
     const char *auth_groupId = ZOOM_options_get (c->options, "group");
     const char *auth_userId = ZOOM_options_get (c->options, "user");
-    const char *auth_password = ZOOM_options_get (c->options, "pass");
+    const char *auth_password = ZOOM_options_get (c->options, "password");
     char *version;
 
+    /* support the pass for backwards compatibility */
+    if (!auth_password)
+	auth_password = ZOOM_options_get (c->options, "pass");
+	
     ODR_MASK_SET(ireq->options, Z_Options_search);
     ODR_MASK_SET(ireq->options, Z_Options_present);
     ODR_MASK_SET(ireq->options, Z_Options_scan);
@@ -918,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.18 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.20 $");
     if (strlen(version) > 10)	/* check for unexpanded CVS strings */
 	version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
@@ -2449,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;
@@ -2525,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;