X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnormalize_record.c;h=fa39da2aba316ebba218e5a1b0fb2b5667f8ea55;hb=2ebf0b250fd141b7a3e186e7e99bfc76e29e39d7;hp=c7706e5640292e327c00832edbf514e31c1fed06;hpb=3e47667de1ebfaf4f42d2c0b71d4da2650ce7eb8;p=pazpar2-moved-to-github.git

diff --git a/src/normalize_record.c b/src/normalize_record.c
index c7706e5..fa39da2 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
@@ -42,36 +42,25 @@ struct normalize_step {
 
 struct normalize_record_s {
     struct normalize_step *steps;
-    char *spec;
     NMEM nmem;
 };
 
-const char *normalize_record_get_spec(normalize_record_t nt)
-{
-    if (nt)
-        return nt->spec;
-    return 0;
-}
-
-normalize_record_t normalize_record_create(struct conf_service *service,
+normalize_record_t normalize_record_create(struct conf_config *conf,
                                            const char *spec)
 {
-    normalize_record_t nt = xmalloc(sizeof(*nt));
-    struct normalize_step **m;
+    NMEM nmem = nmem_create();
+    normalize_record_t nt = nmem_malloc(nmem, sizeof(*nt));
+    struct normalize_step **m = &nt->steps;
     int i, num;
     int no_errors = 0;
     char **stylesheets;
 
-    nt->nmem = nmem_create();
-
-    nt->spec = nmem_strdup(nt->nmem, spec);
-
-    m = &nt->steps;
+    nt->nmem = nmem;
 
     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;
@@ -128,8 +117,6 @@ void normalize_record_destroy(normalize_record_t nt)
                 xsltFreeStylesheet(m->stylesheet);
         }
         nmem_destroy(nt->nmem);
-
-        xfree(nt);
     }
 }
 
@@ -137,30 +124,32 @@ int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
     const char **parms)
 {
     struct normalize_step *m;
-    for (m = nt->steps; m; m = m->next)
-    {
-        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;
+    if (nt) {
+	for (m = nt->steps; m; m = m->next)
+	{
+	    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);
+	    
+	    xmlFreeDoc(*doc);
+	    if (!new || !root || !root->children)
+	    {
+		if (new)
+		    xmlFreeDoc(new);
+                *doc = 0;
+		return -1;
+	    }
+	    *doc = new;
+	}
     }
     return 0;
 }