*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));
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)
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);
}
}
int len_out;
const char *params[10];
xsltStylesheetPtr last_xsp = 0;
- xmlDocPtr store_doc = 0;
/* per default do not ingest record */
tinfo->record_info_invoked = 0;
#endif
}
- /* input conversion */
- perform_convert(tinfo, p, 0, input->convert, params, &doc, 0);
-
- if (tinfo->store)
+ if (p->setStoreData)
{
- /* store conversion */
- store_doc = xmlCopyDoc(doc, 1);
- perform_convert(tinfo, p, 0, tinfo->store->convert,
- params, &store_doc, &last_xsp);
- }
-
- /* saving either store doc or original doc in case no store doc exists */
- if (last_xsp)
- xsltSaveResultToString(&buf_out, &len_out,
- store_doc ? store_doc : doc, last_xsp);
- else
- xmlDocDumpMemory(store_doc ? store_doc : doc, &buf_out, &len_out);
+ xmlDocPtr store_doc = 0;
- if (p->setStoreData)
- (*p->setStoreData)(p, buf_out, len_out);
- xmlFree(buf_out);
+ /* input conversion */
+ perform_convert(tinfo, p, 0, input->convert, params, &doc, 0);
+
+ if (tinfo->store)
+ {
+ /* store conversion */
+ store_doc = xmlCopyDoc(doc, 1);
+ perform_convert(tinfo, p, 0, tinfo->store->convert,
+ params, &store_doc, &last_xsp);
+ }
+
+ /* saving either store doc or original doc in case no store doc exists */
+ if (last_xsp)
+ xsltSaveResultToString(&buf_out, &len_out,
+ store_doc ? store_doc : doc, last_xsp);
+ else
+ xmlDocDumpMemory(store_doc ? store_doc : doc, &buf_out, &len_out);
+
+ if (p->setStoreData)
+ (*p->setStoreData)(p, buf_out, len_out);
+ xmlFree(buf_out);
+ if (store_doc)
+ xmlFreeDoc(store_doc);
+ }
- if (store_doc)
- xmlFreeDoc(store_doc);
/* extract conversion */
perform_convert(tinfo, p, 0, tinfo->extract->convert, params, &doc, 0);
ptr = xmlTextReaderExpand(input->u.xmlreader.reader);
if (ptr)
- {
+ {
/* we have a new document */
xmlNodePtr ptr2 = xmlCopyNode(ptr, 1);