Use schema in Z39.50 Update.

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 59c48a0..cbb4870 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.351 2007-08-24 13:25:14 adam Exp $
+ * $Id: client.c,v 1.353 2007-11-21 13:53:20 adam Exp $
  */
 /** \file client.c
  *  \brief yaz-client program
@@ -844,8 +844,8 @@ int cmd_authentication(const char *arg)
         au.which = Z_IdAuthentication_idPass;
         au.u.idPass = &idPass;
         idPass.groupId = NULL;
-        idPass.userId = user;
-        idPass.password = group;
+        idPass.userId = !strcmp(user, "-") ? 0 : user;
+        idPass.password = !strcmp(group, "-") ? 0 : group;
         printf("Authentication set to User (%s), Pass (%s)\n", user, group);
     }
     if (r == 3)
@@ -2302,6 +2302,12 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         
         toKeep->databaseName = databaseNames[0];
         toKeep->schema = 0;
+        if (record_schema)
+        {
+            toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+                                                   CLASS_SCHEMA,
+                                                   record_schema, out);
+        }
         toKeep->elementSetName = 0;
 
         toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
@@ -2344,6 +2350,12 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         
         toKeep->databaseName = databaseNames[0];
         toKeep->schema = 0;
+        if (record_schema)
+        {
+            toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+                                                   CLASS_SCHEMA,
+                                                   record_schema, out);
+        }
         toKeep->elementSetName = 0;
         toKeep->actionQualifier = 0;
         toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));