X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=e2ae5462f065945722b4eba0a1e607c9af2574da;hb=6693b35490291a774e7ca952bf7f6197dbdb94af;hp=768e22a93cc55b4cfe09c85e6ceb30a731fb8fb5;hpb=e87b70ae77aed9a47ee29f69ce2c531fddf394ce;p=yaz-moved-to-github.git

diff --git a/src/seshigh.c b/src/seshigh.c
index 768e22a..e2ae546 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.87 2006-06-20 21:20:51 adam Exp $
+ * $Id: seshigh.c,v 1.91 2006-07-06 15:06:12 marc Exp $
  */
 /**
  * \file seshigh.c
@@ -50,7 +50,7 @@
 #include <unistd.h>
 #endif
 
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #endif
@@ -496,7 +496,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S
         Z_External *ce;
         bend_initresult *binitres;
 
-        yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname);
+        yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname);
         assoc_init_reset(assoc);
         
         assoc->maximumRecordSize = 3000000;
@@ -577,7 +577,7 @@ static void set_esn(Z_RecordComposition **comp_p, const char *esn, NMEM nmem)
 
 static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
 {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
     yaz_record_conv_t rc = 0;
     const char *match_schema = 0;
     int *match_syntax = 0;
@@ -1119,6 +1119,8 @@ static void srw_bend_search(association *assoc, request *req,
             break;
         }
         wrbuf_printf(wr, "SRWSearch ");
+        wrbuf_printf(wr, srw_req->database);
+        wrbuf_printf(wr, " ");
         if (srw_res->num_diagnostics)
             wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri);
         else if (*http_code != 200)
@@ -1141,7 +1143,7 @@ static void srw_bend_search(association *assoc, request *req,
 
 static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
 {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
     xmlNodePtr ptr = rr->server_node_ptr;
     if (!ptr)
         return 0;
@@ -1393,17 +1395,24 @@ static void srw_bend_scan(association *assoc, request *req,
             querytype = "Unknown";
             querystr = "";
         }
-        wrbuf_printf(wr, "SRWScan %d+%d",
+
+        wrbuf_printf(wr, "SRWScan ");
+        wrbuf_printf(wr, srw_req->database);
+        wrbuf_printf(wr, " ");
+
+        if (srw_res->num_diagnostics)
+            wrbuf_printf(wr, "ERROR %s ", srw_res->diagnostics[0].uri);
+        else
+            wrbuf_printf(wr, "OK - ");
+
+        wrbuf_printf(wr, "%d+%d 1 ",
                      (srw_req->responsePosition ? 
                       *srw_req->responsePosition : 1),
                      (srw_req->maximumTerms ?
                       *srw_req->maximumTerms : 1));
-        if (srw_res->num_diagnostics)
-            wrbuf_printf(wr, " ERROR %s", srw_res->diagnostics[0].uri);
-        else
-            wrbuf_printf(wr, " OK -");
-        wrbuf_printf(wr, " %s: %s", querytype, querystr);
-        yaz_log(log_request, "%s", wrbuf_buf(wr) );
+        /* there is no step size in SRU/W ??? */
+        wrbuf_printf(wr, "%s: %s ", querytype, querystr);
+        yaz_log(log_request, "%s ", wrbuf_buf(wr) );
         wrbuf_free(wr, 1);
     }
 
@@ -1791,7 +1800,7 @@ static void process_http_request(association *assoc, request *req)
         if (http_code == 200 || http_code == 500)
         {
             static Z_SOAP_Handler soap_handlers[4] = {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
                 {"http://www.loc.gov/zing/srw/", 0,
                  (Z_SOAP_fun) yaz_srw_codec},
                 {"http://www.loc.gov/zing/srw/v1.0/", 0,
@@ -2288,7 +2297,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.87 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.91 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -2761,7 +2770,16 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
 
     if (log_request)
     {
+        int i;
         WRBUF wr = wrbuf_alloc();
+
+        for (i = 0 ; i < req->num_databaseNames; i++){
+            if (i)
+                wrbuf_printf(wr, ",");
+            wrbuf_printf(wr, req->databaseNames[i]);
+        }
+        wrbuf_printf(wr, " ");
+        
         if (bsrt->errcode)
             wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
         else
@@ -3059,19 +3077,31 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     }
     if (log_request)
     {
+        int i;
         WRBUF wr = wrbuf_alloc();
+
+        for (i = 0 ; i < req->num_databaseNames; i++){
+            if (i)
+                wrbuf_printf(wr, ",");
+            wrbuf_printf(wr, req->databaseNames[i]);
+        }
+        wrbuf_printf(wr, " ");
+        
         if (bsrr->errcode)
             wr_diag(wr, bsrr->errcode, bsrr->errstring);
         else if (*res->scanStatus == Z_Scan_success)
-            wrbuf_printf(wr, "OK");
+            wrbuf_printf(wr, "OK - ");
         else
-            wrbuf_printf(wr, "Partial");
+            wrbuf_printf(wr, "Partial - ");
 
-        wrbuf_printf(wr, " %d+%d %d ",
+        wrbuf_printf(wr, "%d+%d %d ",
                      (req->preferredPositionInResponse ?
                       *req->preferredPositionInResponse : 1),
                      *req->numberOfTermsRequested,
-                     (res->stepSize ? *res->stepSize : 0));
+                     (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, "Scan %s", wrbuf_buf(wr) );