Fixed scan continuation line not being set for displayTerm being ste

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

diff --git a/client/client.c b/client/client.c
index 261ff70..c158b00 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.346 2007-07-04 09:20:06 adam Exp $
+ * $Id: client.c,v 1.350 2007-08-21 13:19:44 adam Exp $
  */
 /** \file client.c
  *  \brief yaz-client program
@@ -56,7 +56,6 @@
 
 #include <yaz/comstack.h>
 
-#include <yaz/tcpip.h>
 #include <yaz/oid_db.h>
 #define NO_OID 1
 #include <yaz/proto.h>
@@ -172,9 +171,6 @@ static cql_transform_t cqltrans = 0; /* CQL context-set handle */
 int rl_attempted_completion_over = 0;
 #endif
 
-/* set this one to 1, to avoid decode of unknown MARCs  */
-#define AVOID_MARC_DECODE 1
-
 #define maxOtherInfosSupported 10
 struct eoi {
     Odr_oid oid[OID_SIZE];
@@ -718,21 +714,11 @@ int session_connect(const char *arg)
         conn = cs_create_host(yazProxy, 1, &add);
     else
         conn = cs_create_host(arg, 1, &add);
-
     if (!conn)
     {
         printf ("Could not resolve address %s\n", arg);
         return 0;
     }
-    if (1)
-    {
-        COMSTACK tmp_cs = cs_create (tcpip_type, 0, PROTO_Z3950);
-
-        void *addr = cs_straddr(tmp_cs, arg);
-        printf ("cs_straddr of %s %s\n", arg, addr ? "OK" : "Failed");
-
-        cs_close(tmp_cs);
-    }
 #if YAZ_HAVE_XML2
     if (conn->protocol == PROTO_HTTP)
         queryType = QueryType_CQL;
@@ -1929,6 +1915,20 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
                 }
             }
         }
+        if (ext->which == Z_External_itemOrder)
+        {
+            Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage;
+            if (otp && otp->targetPart && otp->targetPart->itemRequest)
+            {
+                Z_External *ext = otp->targetPart->itemRequest;
+                if (ext->which == Z_External_octet)
+                {
+                    Odr_oct *doc = ext->u.octet_aligned;
+                    printf("Got itemRequest doc %.*s\n",
+                           doc->len, doc->buf);
+                }
+            }
+        }
     }
     if (res->taskPackage && res->taskPackage->which == Z_External_octet)
     {
@@ -3032,13 +3032,13 @@ void display_term(Z_TermInfo *t)
     if (t->displayTerm)
         printf("%s", t->displayTerm);
     else if (t->term->which == Z_Term_general)
-    {
         printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
-        sprintf(last_scan_line, "%.*s", t->term->u.general->len,
-            t->term->u.general->buf);
-    }
     else
         printf("Term (not general)");
+    if (t->term->which == Z_Term_general)
+        sprintf(last_scan_line, "%.*s", t->term->u.general->len,
+            t->term->u.general->buf);
+
     if (t->globalOccurrences)
         printf (" (%d)\n", *t->globalOccurrences);
     else