Oops Still need HAVE_XML2 in seshigh.c.

[yaz-moved-to-github.git] / server / seshigh.c

diff --git a/server/seshigh.c b/server/seshigh.c
index b97a9c1..ba96698 100644 (file)
--- 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.140 2003-02-18 11:59:14 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);
@@ -695,7 +695,6 @@ static void process_http_request(association *assoc, request *req)
     }
     else if (!strcmp(hreq->method, "POST"))
     {
-#if HAVE_XML2
         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);
     }