X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=server%2Fseshigh.c;h=ba966981a26dbefdb42ac591fdd2a332b58f2d2c;hb=df869b93d7eb00d07ffcd27556af94b00c518ad9;hp=f9b59233424c2b5f3f267cf4e5f521ad7660f6a6;hpb=c76cdd28e9040ef40ae81a991a826d03b556e22c;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index f9b5923..ba96698 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.138 2003-02-17 22:34:39 adam Exp $
+ * $Id: seshigh.c,v 1.142 2003-02-18 14:47:23 adam Exp $
  */
 
 /*
@@ -287,7 +287,7 @@ void ir_session(IOCHAN h, int event)
 	    /* We aren't speaking to this fellow */
 	    if (assoc->state == ASSOC_DEAD)
 	    {
-		yaz_log(LOG_LOG, "Closed connection after reject");
+		yaz_log(LOG_LOG, "Connection closed - end of session");
 		cs_close(conn);
 		destroy_association(assoc);
 		iochan_destroy(h);
@@ -516,6 +516,8 @@ static void srw_bend_search(association *assoc, request *req,
     char *base = "Default";
     bend_search_rr rr;
     Z_External *ext;
+    
+    yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest");
 
     if (!assoc->init)
         srw_bend_init(assoc);
@@ -592,7 +594,6 @@ static void srw_bend_search(association *assoc, request *req,
                 srw_res->num_records = j;
                 if (!j)
                     srw_res->records = 0;
-                yaz_log(LOG_LOG, "got %d records", j);
             }
         }
     }
@@ -654,7 +655,6 @@ static void process_http_request(association *assoc, request *req)
 			    ctype = "text/html";
 		    }
                     z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
-		    yaz_log(LOG_LOG, "OK send page %s size=%ld", fpath, sz);
 		}
 		fclose(f);
 	    }
@@ -695,7 +695,6 @@ static void process_http_request(association *assoc, request *req)
     }
     else if (!strcmp(hreq->method, "POST"))
     {
-#if HAVE_XSLT
         const char *content_type = z_HTTP_header_lookup(hreq->headers,
                                                         "Content-Type");
         const char *soap_action = z_HTTP_header_lookup(hreq->headers,
@@ -704,19 +703,21 @@ static void process_http_request(association *assoc, request *req)
             !yaz_strcmp_del("text/xml", content_type, "; "))
         {
             Z_SOAP *soap_package = 0;
-            int ret;
+            int ret = -1;
             int http_code = 500;
 
             static Z_SOAP_Handler soap_handlers[2] = {
+#if HAVE_XML2
                 {"http://www.loc.gov/zing/srw/v1.0/", 0,
 			                 (Z_SOAP_fun) yaz_srw_codec},
+#endif
                 {0, 0, 0}
             };
-
             ret = z_soap_codec(assoc->decode, &soap_package, 
                                &hreq->content_buf, &hreq->content_len,
                                soap_handlers);
             
+#if HAVE_XML2
             if (!ret && soap_package->which == Z_SOAP_generic &&
                 soap_package->u.generic->no == 0)
             {
@@ -754,7 +755,7 @@ static void process_http_request(association *assoc, request *req)
                     http_code = 200;
                 }
             }
-
+#endif
             p = z_get_HTTP_Response(o, 200);
             hres = p->u.HTTP_Response;
             ret = z_soap_codec(assoc->encode, &soap_package,
@@ -763,7 +764,6 @@ static void process_http_request(association *assoc, request *req)
             hres->code = http_code;
             z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml");
         }
-#endif
         if (!p) /* still no response ? */
             p = z_get_HTTP_Response(o, 500);
     }