Update ASN.1 for UserInfoFormat-multipleSearchTerms-2.

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

diff --git a/client/client.c b/client/client.c
index b6e3616..d0f9ad5 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.235 2004-03-10 19:42:45 adam Exp $
+ * $Id: client.c,v 1.238 2004-04-07 13:51:50 adam Exp $
  */
 
 #include <stdio.h>
@@ -308,15 +308,15 @@ static void send_initRequest(const char* type_and_host)
        yaz_oi_APDU(apdu, &p);
        
        if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
-               ODR_MASK_SET(req->options, Z_Options_negotiationModel);
-               
-               p0->which = Z_OtherInfo_externallyDefinedInfo;
-               p0->information.externallyDefinedInfo =
-                       yaz_set_proposal_charneg(
-                            out,
-                            (const char**)&negotiationCharset, 
-                            negotiationCharset ? 1 : 0,
-                            (const char**)&yazLang, yazLang ? 1 : 0, 1);
+           ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+           
+           p0->which = Z_OtherInfo_externallyDefinedInfo;
+           p0->information.externallyDefinedInfo =
+               yaz_set_proposal_charneg(
+                   out,
+                   (const char**)&negotiationCharset, 
+                   negotiationCharset ? 1 : 0,
+                   (const char**)&yazLang, yazLang ? 1 : 0, 1);
        }
     }
     
@@ -741,16 +741,16 @@ static void display_record(Z_External *r)
             }
         }
     }
-    if (ent && ent->oclass != CLASS_RECSYN) 
-        return;
     if (ent && ent->value == VAL_SOIF)
         print_record((const unsigned char *) r->u.octet_aligned->buf,
                      r->u.octet_aligned->len);
     else if (r->which == Z_External_octet)
     {
         const char *octet_buf = (char*)r->u.octet_aligned->buf;
-        if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
-            ent->value == VAL_HTML)
+        if (ent->oclass == CLASS_RECSYN && 
+               (ent->value == VAL_TEXT_XML || 
+                ent->value == VAL_APPLICATION_XML ||
+                ent->value == VAL_HTML))
         {
             print_record((const unsigned char *) octet_buf,
                          r->u.octet_aligned->len);