X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnormalize_record.c;h=5623c339badca04acfaee8f132cd9b0f3f9fe51f;hb=e20b3a5698a749237de8a93fa4e707a3f6dc4f64;hp=c33cd2eb3847cb3127ed42a14800971aa957577e;hpb=ed45a02021c7c5b380aa74acb49b01bdeb974d6e;p=pazpar2-moved-to-github.git

diff --git a/src/normalize_record.c b/src/normalize_record.c
index c33cd2e..5623c33 100644
--- 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,33 +121,36 @@ 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;
-    for (m = nt->steps; m; m = m->next)
+    if (nt)
     {
-        xmlNodePtr root = 0;
-        xmlDoc *new;
-        if (m->stylesheet)
-        {
-            new = xsltApplyStylesheet(m->stylesheet, *doc, parms);
-        }
-        else if (m->marcmap)
-        {
-            new = marcmap_apply(m->marcmap, *doc);
-        }
-        
-        root = xmlDocGetRootElement(new);
-        
-        if (!new || !root || !root->children)
-        {
-            if (new)
-                xmlFreeDoc(new);
-            xmlFreeDoc(*doc);
-            return -1;
-        }
-        xmlFreeDoc(*doc);
-        *doc = new;
+        struct normalize_step *m;
+	for (m = nt->steps; m; m = m->next)
+	{
+	    xmlNodePtr root = 0;
+	    xmlDoc *ndoc;
+	    if (m->stylesheet)
+		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
+	    {
+		if (ndoc)
+		    xmlFreeDoc(ndoc);
+		return -1;
+	    }
+	}
     }
     return 0;
 }