From 74c32327950450b02892297f350eaff41212fc18 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 25 Mar 2003 09:55:11 +0000
Subject: [PATCH] Fix non-XML compile

---
 server/seshigh.c |    4 +++-
 zutil/soap.c     |   24 ++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/seshigh.c b/server/seshigh.c
index ffed67f..64a3121 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.151 2003-03-24 22:26:50 adam Exp $
+ * $Id: seshigh.c,v 1.152 2003-03-25 09:55:11 adam Exp $
  */
 
 /*
@@ -840,6 +840,7 @@ static void process_http_request(association *assoc, request *req)
             memcpy (db, p0, p1 - p0);
             db[p1 - p0] = '\0';
         }
+#if HAVE_XML2
         if (p1 && *p1 == '?' && p1[1])
         {
             Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_searchRetrieve_response);
@@ -943,6 +944,7 @@ static void process_http_request(association *assoc, request *req)
                 }
             }
         }
+#endif
 #ifdef DOCDIR
 	if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 &&
 			 !memcmp(hreq->path, "/doc/", 5))
diff --git a/zutil/soap.c b/zutil/soap.c
index 0b34cdb..26a3c88 100644
--- a/zutil/soap.c
+++ b/zutil/soap.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: soap.c,v 1.7 2003-03-18 13:34:37 adam Exp $
+ * $Id: soap.c,v 1.8 2003-03-25 09:55:12 adam Exp $
  */
 
 #include <yaz/soap.h>
@@ -30,13 +30,6 @@ int z_soap_error(ODR o, Z_SOAP *p,
     return -1;
 }
 
-int z_soap_codec(ODR o, Z_SOAP **pp, 
-                 char **content_buf, int *content_len,
-                 Z_SOAP_Handler *handlers)
-{
-	return z_soap_codec_enc(o, pp, content_buf, content_len, handlers, 0);
-}
-
 int z_soap_codec_enc(ODR o, Z_SOAP **pp, 
                  char **content_buf, int *content_len,
                  Z_SOAP_Handler *handlers,
@@ -236,11 +229,11 @@ int z_soap_codec_enc(ODR o, Z_SOAP **pp,
     return 0;
 }
 #else
-int z_soap_codec(ODR o, Z_SOAP **pp, 
-                 char **content_buf, int *content_len,
-                 Z_SOAP_Handler *handlers)
+int z_soap_codec_enc(ODR o, Z_SOAP **pp, 
+                     char **content_buf, int *content_len,
+                     Z_SOAP_Handler *handlers, const char *encoding)
 {
-    const char *err_xml =
+    static char *err_xml =
         "<?xml version=\"1.0\"?>\n"
         "<SOAP-ENV:Envelope"
         " xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
@@ -260,3 +253,10 @@ int z_soap_codec(ODR o, Z_SOAP **pp,
     return -1;
 }
 #endif
+int z_soap_codec(ODR o, Z_SOAP **pp, 
+                 char **content_buf, int *content_len,
+                 Z_SOAP_Handler *handlers)
+{
+	return z_soap_codec_enc(o, pp, content_buf, content_len, handlers, 0);
+}
+
-- 
1.7.10.4