From a49b6f2fc9cc5208800f0195647f61eb24997812 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sat, 19 May 2007 19:44:14 +0000
Subject: [PATCH] Fixed bug #1131: Missing value-of data in DOM filter. The
 problem was that the internally generated MARCXML did not
 have the namespace "http://www.loc.gov/MARC21/slim"
 declared.

---
 index/mod_dom.c                 |   28 ++++++++++++++++++++--------
 test/xslt/dom-index-element.xsl |    6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/index/mod_dom.c b/index/mod_dom.c
index 0670ab4..60cf180 100644
--- a/index/mod_dom.c
+++ b/index/mod_dom.c
@@ -1,4 +1,4 @@
-/* $Id: mod_dom.c,v 1.36 2007-04-16 21:54:37 adam Exp $
+/* $Id: mod_dom.c,v 1.37 2007-05-19 19:44:14 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -727,7 +727,7 @@ static void index_value_of(struct filter_info *tinfo,
     {
         xmlChar *text = xmlNodeGetContent(node);
         size_t text_len = strlen((const char *)text);
-        
+       
         /* if there is no text, we do not need to proceed */
         if (text_len)
         {            
@@ -777,11 +777,6 @@ static void index_value_of(struct filter_info *tinfo,
                 }
 
                 /* actually indexing the text given */
-                dom_log(YLOG_DEBUG, tinfo, 0, 
-                        "INDEX '%s:%s' '%s'", 
-                        index ? (const char *) index : "null",
-                        type ? (const char *) type : "null", 
-                        text ? (const char *) text : "null");
 
                 recword->index_name = (const char *)index;
                 if (type && *type)
@@ -1090,9 +1085,25 @@ static int convert_extract_doc(struct filter_info *tinfo,
     params[0] = 0;
     set_param_str(params, "schema", zebra_dom_ns, tinfo->odr_record);
 
+    if (p && p->flagShowRecords)
+    {
+        xmlChar *buf_out;
+        int len_out;
+#if 0 
+        FILE *outf = fopen("extract.xml", "w");
+        xmlDocDumpMemory(doc, &buf_out, &len_out);
+        fwrite(buf_out, 1, len_out, outf);
+#endif
+        yaz_log(YLOG_LOG, "Extract Doc: %.*s", len_out, buf_out);
+#if 0
+        fclose(outf);
+#endif
+    }
+
     /* input conversion */
     perform_convert(tinfo, p, input->convert, params, &doc, 0);
 
+
     if (tinfo->store)
     {
         /* store conversion */
@@ -1276,7 +1287,8 @@ static int extract_iso2709(struct filter_info *tinfo,
     {
         xmlDocPtr rdoc;
         xmlNode *root_ptr;
-        yaz_marc_write_xml(input->u.marc.handle, &root_ptr, 0, 0, 0);
+        yaz_marc_write_xml(input->u.marc.handle, &root_ptr, 
+                           "http://www.loc.gov/MARC21/slim", 0, 0);
         rdoc = xmlNewDoc((const xmlChar*) "1.0");
         xmlDocSetRootElement(rdoc, root_ptr);
         return convert_extract_doc(tinfo, input, p, rdoc);        
diff --git a/test/xslt/dom-index-element.xsl b/test/xslt/dom-index-element.xsl
index 222b626..8bff79b 100644
--- a/test/xslt/dom-index-element.xsl
+++ b/test/xslt/dom-index-element.xsl
@@ -3,7 +3,7 @@
   xmlns:z="http://indexdata.com/zebra-2.0"
   exclude-result-prefixes="m z"
   version="1.0">
-  <!-- $Id: dom-index-element.xsl,v 1.2 2007-02-15 15:41:16 marc Exp $ -->
+  <!-- $Id: dom-index-element.xsl,v 1.3 2007-05-19 19:44:14 adam Exp $ -->
   <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
   
 
@@ -23,9 +23,9 @@
     </z:index>
   </xsl:template>
   
-  <xsl:template match="m:datafield[@tag='245']/m:subfield[@code='a']">
+  <xsl:template match="m:datafield[@tag='245']">
     <z:index name="title:w title:p title:s any:w">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="m:subfield[@code='a']"/>
     </z:index>
   </xsl:template>
 
-- 
1.7.10.4