X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=0327810d8fc67e19a2a440acf24431b4d0a28570;hb=aebe2207088a26a1d6a3f4dad6bd32b6a41109a8;hp=bb3b465a4c7cc69707165e6bb38f7c8f2401c7b7;hpb=650cc0539b6a484eba203949cb43a08b9084504d;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index bb3b465..0327810 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.179 2003-01-27 21:31:35 adam Exp $
+ * $Id: client.c,v 1.183 2003-02-23 20:40:17 adam Exp $
  */
 
 #include <stdio.h>
@@ -428,11 +428,11 @@ static int cmd_base(char *arg)
 
 void cmd_open_remember_last_open_command(char* arg, char* new_open_command)
 {
-	if(last_open_command != arg) 
-	{
-		if(last_open_command) xfree(last_open_command);
-		last_open_command = xstrdup(new_open_command);
-	}
+    if(last_open_command != arg) 
+    {
+        if(last_open_command) xfree(last_open_command);
+        last_open_command = xstrdup(new_open_command);
+    }
 }
 
 int cmd_open(char *arg)
@@ -457,7 +457,7 @@ int cmd_open(char *arg)
     {
         base[0] = '\0';
         conn = cs_create_host(arg, 1, &add);
-		cmd_open_remember_last_open_command(arg,arg);
+	cmd_open_remember_last_open_command(arg,arg);
     }
     else
     {
@@ -465,7 +465,7 @@ int cmd_open(char *arg)
         if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
             return 0;
 		
-		cmd_open_remember_last_open_command(arg,type_and_host);
+	cmd_open_remember_last_open_command(arg,type_and_host);
         if (yazProxy) 
             conn = cs_create_host(yazProxy, 1, &add);
         else 
@@ -503,19 +503,18 @@ int cmd_open(char *arg)
 
 void try_reconnect() 
 {
-
-	char* open_command;
+    char* open_command;
 	
-	if(!( auto_reconnect && last_open_command) ) return ;
+    if(!( auto_reconnect && last_open_command) ) return ;
 
-	open_command = (char *) xmalloc (strlen(last_open_command)+6);
-	strcpy (open_command, "open ");
+    open_command = (char *) xmalloc (strlen(last_open_command)+6);
+    strcpy (open_command, "open ");
 	
-	strcat (open_command, last_open_command);
+    strcat (open_command, last_open_command);
 
-	process_cmd_line(open_command);
+    process_cmd_line(open_command);
 	
-	xfree(open_command);				
+    xfree(open_command);				
 }
 
 int cmd_authentication(char *arg)
@@ -966,7 +965,7 @@ static int send_searchRequest(char *arg)
         break;
     case QueryType_CQL:
         query.which = Z_Query_type_104;
-        ext = odr_malloc(out, sizeof(*ext));
+        ext = (Z_External *) odr_malloc(out, sizeof(*ext));
         ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2");
         ext->indirect_reference = 0;
         ext->descriptor = 0;
@@ -1788,13 +1787,14 @@ static int send_presentRequest(char *arg)
 
         compo.u.complex->generic = (Z_Specification *)
             odr_malloc(out, sizeof(*compo.u.complex->generic));
-        compo.u.complex->generic->schema = (Odr_oid *)
+        compo.u.complex->generic->which = Z_Schema_oid;
+        compo.u.complex->generic->schema.oid = (Odr_oid *)
             odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
-        if (!compo.u.complex->generic->schema)
+        if (!compo.u.complex->generic->schema.oid)
         {
             /* OID wasn't a schema! Try record syntax instead. */
             prefschema.oclass = CLASS_RECSYN;
-            compo.u.complex->generic->schema = (Odr_oid *)
+            compo.u.complex->generic->schema.oid = (Odr_oid *)
                 odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
         }
         if (!elementSetNames)