Use socket pipe (spipe)

[pazpar2-moved-to-github.git] / src / normalize_record.c

diff --git a/src/normalize_record.c b/src/normalize_record.c
index 322566e..5623c33 100644 (file)
--- a/src/normalize_record.c
+++ b/src/normalize_record.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -45,7 +45,7 @@ struct normalize_record_s {
     NMEM nmem;
 };
 
-normalize_record_t normalize_record_create(struct conf_service *service,
+normalize_record_t normalize_record_create(struct conf_config *conf,
                                            const char *spec)
 {
     NMEM nmem = nmem_create();
@@ -60,7 +60,7 @@ normalize_record_t normalize_record_create(struct conf_service *service,
     nmem_strsplit(nt->nmem, ",", spec, &stylesheets, &num);
     for (i = 0; i < num; i++)
     {
-        WRBUF fname = conf_get_fname(service, stylesheets[i]);
+        WRBUF fname = conf_get_fname(conf, stylesheets[i]);
         
         *m = nmem_malloc(nt->nmem, sizeof(**m));
         (*m)->marcmap = NULL;
@@ -121,34 +121,35 @@ void normalize_record_destroy(normalize_record_t nt)
 }
 
 int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
-    const char **parms)
+                               const char **parms)
 {
-    struct normalize_step *m;
-    if (nt) {
+    if (nt)
+    {
+        struct normalize_step *m;
        for (m = nt->steps; m; m = m->next)
        {
            xmlNodePtr root = 0;
-           xmlDoc *new;
+           xmlDoc *ndoc;
            if (m->stylesheet)
-           {
-               new = xsltApplyStylesheet(m->stylesheet, *doc, parms);
-           }
+               ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms);
            else if (m->marcmap)
+               ndoc = marcmap_apply(m->marcmap, *doc);
+            else
+                ndoc = 0;
+           xmlFreeDoc(*doc);
+            *doc = 0;
+            
+            if (ndoc)
+                root = xmlDocGetRootElement(ndoc);
+
+            if (ndoc && root && root->children)
+                *doc = ndoc;
+            else
            {
-               new = marcmap_apply(m->marcmap, *doc);
-           }
-           
-           root = xmlDocGetRootElement(new);
-           
-           if (!new || !root || !root->children)
-           {
-               if (new)
-                   xmlFreeDoc(new);
-               xmlFreeDoc(*doc);
+               if (ndoc)
+                   xmlFreeDoc(ndoc);
                return -1;
            }
-           xmlFreeDoc(*doc);
-           *doc = new;
        }
     }
     return 0;