X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Fmod_dom.c;h=ad97171e962cb31de0c7083dc27db95d4bd0dbf4;hb=00bacc2ba5811fbffb27d32541df068858a84d03;hp=4393ded4f4d7a885edd96db8a58ac9b5626a4f34;hpb=b3971ce2ed90ece7784b160cfa666c381f5c124a;p=idzebra-moved-to-github.git diff --git a/index/mod_dom.c b/index/mod_dom.c index 4393ded..ad97171 100644 --- a/index/mod_dom.c +++ b/index/mod_dom.c @@ -338,7 +338,7 @@ static ZEBRA_RES parse_convert(struct filter_info *tinfo, xmlNodePtr ptr, *l = p; l = &p->next; } - else if (!XML_STRCMP(ptr->name, "meta")) + else if (!XML_STRCMP(ptr->name, "process-meta")) { struct _xmlAttr *attr; struct convert_s *p = nmem_malloc(tinfo->nmem_config, sizeof(*p)); @@ -376,13 +376,12 @@ static int process_meta(struct filter_info *tinfo, xmlDocPtr doc, xmlNodePtr nod struct _xmlAttr *attr; for (attr = node->properties; attr; attr = attr->next) { - if (attr_content(attr, "element_set_name", &element_set_name)) + if (attr_content(attr, "name", &element_set_name)) ; else { dom_log(YLOG_WARN, tinfo, node, - "bad attribute @%s, expected @element_set_name", - attr->name); + "bad attribute @%s, expected @name", attr->name); } } if (element_set_name) @@ -400,11 +399,11 @@ static int process_meta(struct filter_info *tinfo, xmlDocPtr doc, xmlNodePtr nod if (ret == 0) { xmlDocPtr sub_doc = - xmlParseMemory( wrbuf_buf(result), wrbuf_len(result)); + xmlParseMemory(wrbuf_buf(result), wrbuf_len(result)); if (sub_doc) { xmlNodePtr t = xmlDocGetRootElement(sub_doc); - xmlAddChild(node, xmlCopyNode(t, 1)); + xmlReplaceNode(node, xmlCopyNode(t, 1)); xmlFreeDoc(sub_doc); } }