From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 7 Oct 2003 09:18:43 +0000 (+0000)
Subject: On -V, display Expat version
X-Git-Tag: ZEBRA.1.3.14~23
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=b3890b03023cb9904ac1b10e2eee86669246d1dd;p=idzebra-moved-to-github.git

On -V, display Expat version
---

diff --git a/index/extract.c b/index/extract.c
index 5a179b8..557c2f2 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.145 2003-06-30 19:37:12 adam Exp $
+/* $Id: extract.c,v 1.146 2003-10-07 09:18:43 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -1751,9 +1751,9 @@ static void extract_add_complete_field (RecWord *p)
 void extract_token_add (RecWord *p)
 {
     WRBUF wrbuf;
-
 #if 0
-    yaz_log (LOG_LOG, "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s",
+    yaz_log (LOG_LOG, "token_add "
+	     "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s",
              p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length,
              p->string);
 #endif
diff --git a/index/main.c b/index/main.c
index f14aaec..3def792 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.106 2003-09-16 13:58:25 adam Exp $
+/* $Id: main.c,v 1.107 2003-10-07 09:18:43 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -39,6 +39,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <tcl.h>
 #endif
 
+#if HAVE_EXPAT_H
+#include <expat.h>
+#endif
+
 #include <data1.h>
 #include "zebraapi.h"
 
@@ -264,6 +268,14 @@ int main (int argc, char **argv)
 #if HAVE_TCL_H
 	    printf("Using: Tcl %s\n", TCL_VERSION);
 #endif
+#if HAVE_EXPAT_H
+	    if (1)
+	    {
+		XML_Expat_Version v = XML_ExpatVersionInfo();
+		printf ("Using: Expat %d.%d.%d\n",
+			v.major, v.minor, v.micro);
+	    }
+#endif
         }
         else if (ret == 'v')
             yaz_log_init_level (yaz_log_mask_str(arg));