More ZOOM logging

diff --git a/debian/changelog b/debian/changelog
index eafc201..2e1348b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+yaz (2.0.3-4) unstable; urgency=low
+
+  * More ZOOM logging.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 22 Jul 2003 15:04:04 +0200
+
 yaz (2.0.3-3) unstable; urgency=low
 
   * Fix CCL->RPN code for attribute strings.
 
- -- Adam Dickmeiss <adam@gamma.indexdata.dk>  Mon, 23 Jun 2003 14:41:49 +0200
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 23 Jun 2003 14:41:49 +0200
 
 yaz (2.0.3-2) unstable; urgency=low
 

diff --git a/zutil/zoom-c.c b/zutil/zoom-c.c
index 648fba2..392f36f 100644 (file)
--- a/zutil/zoom-c.c
+++ b/zutil/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.39 2003-07-14 12:59:23 adam Exp $
+ * $Id: zoom-c.c,v 1.40 2003-07-29 15:09:19 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -870,6 +870,7 @@ static zoom_ret send_APDU (ZOOM_connection c, Z_APDU *a)
     assert (a);
     if (encode_APDU(c, a, c->odr_out))
        return zoom_complete;
+    yaz_log(LOG_DEBUG, "send APDU type=%d", a->which);
     c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
     event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU);
     ZOOM_connection_put_event (c, event);
@@ -2505,7 +2506,7 @@ static void handle_apdu (ZOOM_connection c, Z_APDU *apdu)
     Z_InitResponse *initrs;
     
     c->mask = 0;
-    yaz_log (LOG_DEBUG, "handle_apdu type=%d", apdu->which);
+    yaz_log (LOG_DEBUG, "recv APDU type=%d", apdu->which);
     switch(apdu->which)
     {
     case Z_APDU_initResponse:
@@ -2748,15 +2749,16 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
 
 static int do_read (ZOOM_connection c)
 {
-    int r;
+    int r, more;
     ZOOM_Event event;
     
     event = ZOOM_Event_create (ZOOM_EVENT_RECV_DATA);
     ZOOM_connection_put_event (c, event);
     
-    yaz_log (LOG_DEBUG, "do_read len=%d", c->len_in);
 
     r = cs_get (c->cs, &c->buf_in, &c->len_in);
+    more = cs_more(c->cs);
+    yaz_log (LOG_DEBUG, "do_read len=%d more=%d", r, more);
     if (r == 1)
        return 0;
     if (r <= 0)