Fix bug #814: pazpar2 does not compile on Debian woody. Use xmlParseFile

instead of xmlReadFile. Use xmlDocDump instead of xmlDocFormatDump
on Libxml2 version < 2.6.0.

diff --git a/src/config.c b/src/config.c
index de47152..1f1052c 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.10 2007-01-12 15:08:44 quinn Exp $ */
+/* $Id: config.c,v 1.11 2007-01-14 17:34:31 adam Exp $ */
 
 #include <string.h>
 
@@ -418,7 +418,7 @@ static struct conf_config *parse_config(xmlNode *root)
 
 int read_config(const char *fname)
 {
-    xmlDoc *doc = xmlReadFile(fname, NULL, 0);
+    xmlDoc *doc = xmlParseFile(fname);
     const char *p;
 
     if (!nmem)  // Initialize

diff --git a/src/pazpar2.c b/src/pazpar2.c
index fc5ee38..31d5891 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.28 2007-01-12 23:37:15 adam Exp $ */
+/* $Id: pazpar2.c,v 1.29 2007-01-14 17:34:31 adam Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -423,7 +423,11 @@ static xmlDoc *normalize_record(struct client *cl, Z_External *rec)
     if (global_parameters.dump_records)
     {
         fprintf(stderr, "Record:\n----------------\n");
+#if LIBXML_VERSION >= 20600
         xmlDocFormatDump(stderr, rdoc, 1);
+#else
+        xmlDocDump(stderr, rdoc);
+#endif
     }
     return rdoc;
 }