X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=e2b2afaffd5a0a3d603af9dfb0345954959f78c7;hb=d1ff65fe4a7472a58a182d922c4a9729f0e17f9f;hp=ae494dc4db01f9cfca5d2436cd011a880224e020;hpb=15e6706cde980cdf149151fa2ceb5630646fafa9;p=yaz-moved-to-github.git

diff --git a/src/seshigh.c b/src/seshigh.c
index ae494dc..e2b2afa 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.92 2006-07-07 10:31:26 marc Exp $
+ * $Id: seshigh.c,v 1.94 2006-07-07 13:02:21 marc Exp $
  */
 /**
  * \file seshigh.c
@@ -102,7 +102,8 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd);
 
 /* dynamic logging levels */
 static int logbits_set = 0;
-static int log_session = 0; 
+static int log_session = 0; /* one-line logs for session */
+static int log_sessiondetail = 0; /* more detailed stuff */
 static int log_request = 0; /* one-line logs for requests */
 static int log_requestdetail = 0;  /* more detailed stuff */
 
@@ -113,6 +114,7 @@ static void get_logbits()
     {
         logbits_set = 1;
         log_session = yaz_log_module_level("session"); 
+        log_sessiondetail = yaz_log_module_level("sessiondetail");
         log_request = yaz_log_module_level("request");
         log_requestdetail = yaz_log_module_level("requestdetail"); 
     }
@@ -291,7 +293,8 @@ void ir_session(IOCHAN h, int event)
         }
         else
         {
-            yaz_log(log_session, "Session idle too long. Sending close.");
+            yaz_log(log_sessiondetail, 
+                    "Session idle too long. Sending close.");
             do_close(assoc, Z_Close_lackOfActivity, 0);
         }
         return;
@@ -329,7 +332,7 @@ void ir_session(IOCHAN h, int event)
             /* We aren't speaking to this fellow */
             if (assoc->state == ASSOC_DEAD)
             {
-                yaz_log(log_session, "Connection closed - end of session");
+                yaz_log(log_sessiondetail, "Connection closed - end of session");
                 cs_close(conn);
                 destroy_association(assoc);
                 iochan_destroy(h);
@@ -339,7 +342,7 @@ void ir_session(IOCHAN h, int event)
             if ((res = cs_get(conn, &assoc->input_buffer,
                 &assoc->input_buffer_len)) <= 0)
             {
-                yaz_log(log_session, "Connection closed by client");
+                yaz_log(log_sessiondetail, "Connection closed by client");
                 cs_close(conn);
                 destroy_association(assoc);
                 iochan_destroy(h);
@@ -414,7 +417,7 @@ void ir_session(IOCHAN h, int event)
         switch (res = cs_put(conn, req->response, req->len_response))
         {
         case -1:
-            yaz_log(log_session, "Connection closed by client");
+            yaz_log(log_sessiondetail, "Connection closed by client");
             cs_close(conn);
             destroy_association(assoc);
             iochan_destroy(h);
@@ -1399,7 +1402,7 @@ static void srw_bend_scan(association *assoc, request *req,
             querystr = srw_req->scanClause.cql;
             break;
         default:
-            querytype = "Unknown";
+            querytype = "UNKNOWN";
             querystr = "";
         }
 
@@ -1409,6 +1412,8 @@ static void srw_bend_scan(association *assoc, request *req,
 
         if (srw_res->num_diagnostics)
             wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri);
+        else if (srw_res->num_terms)
+            wrbuf_printf(wr, "OK %d - ", srw_res->num_terms);
         else
             wrbuf_printf(wr, "OK - - ");
 
@@ -2304,7 +2309,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.92 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.94 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -3098,19 +3103,24 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
             wr_diag(wr, bsrr->errcode, bsrr->errstring);
             wrbuf_printf(wr, " ");
         }
-        else if (*res->scanStatus == Z_Scan_success)
-            wrbuf_printf(wr, "OK - - ");
         else
-            wrbuf_printf(wr, "Partial - - ");
+            wrbuf_printf(wr, "OK "); 
+        /* else if (*res->scanStatus == Z_Scan_success) */
+        /*    wrbuf_printf(wr, "OK "); */
+        /* else */
+        /* wrbuf_printf(wr, "Partial "); */
+
+        if (*res->numberOfEntriesReturned)
+            wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned);
+        else
+            wrbuf_printf(wr, "0 - ");
 
         wrbuf_printf(wr, "%d+%d+%d ",
                      (req->preferredPositionInResponse ?
                       *req->preferredPositionInResponse : 1),
                      *req->numberOfTermsRequested,
                      (res->stepSize ? *res->stepSize : 1));
-        /* TODO - make this print out RPN: or CQL: in the beginning!! */
-        /* maybe wrbuf_printf(wr, "%s: %s ", querytype, querystr); 
-           see line 1415 */
+
         yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, 
                           bsrr->attributeset);
         yaz_log(log_request, "%s", wrbuf_buf(wr) );