X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fnormalize_record.c;h=129be2b4f0b466783480591bf347b5ddff1a1534;hb=946cb4dbcb08fd17b6245acfc0da2b467b7449e6;hp=322566eb4e5f2c56efab062597f19b1f5e275322;hpb=cdf7e43aa085ccd9ee8d8c9129bc1cdb0cc0c547;p=pazpar2-moved-to-github.git

diff --git a/src/normalize_record.c b/src/normalize_record.c
index 322566e..129be2b 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-2012 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
@@ -29,14 +29,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "normalize_record.h"
 
 #include "pazpar2_config.h"
-
+#include "service_xslt.h"
 #include "marcmap.h"
 #include <libxslt/xslt.h>
 #include <libxslt/transform.h>
 
 struct normalize_step {
     struct normalize_step *next;
-    xsltStylesheet *stylesheet;
+    xsltStylesheet *stylesheet;  /* created by normalize_record */
+    xsltStylesheet *stylesheet2; /* external stylesheet (service) */
     struct marcmap *marcmap;
 };
 
@@ -54,20 +55,23 @@ normalize_record_t normalize_record_create(struct conf_service *service,
     int i, num;
     int no_errors = 0;
     char **stylesheets;
+    struct conf_config *conf = service->server->config;
 
     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;
         (*m)->stylesheet = NULL;
-        
-        // XSLT
-        if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl")) 
+
+        (*m)->stylesheet2 = service_xslt_get(service, stylesheets[i]);
+        if ((*m)->stylesheet2)
+            ;
+        else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl")) 
         {    
             if (!((*m)->stylesheet =
                   xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
@@ -77,7 +81,6 @@ normalize_record_t normalize_record_create(struct conf_service *service,
                 no_errors++;
             }
         }
-        // marcmap
         else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap"))
         {
             if (!((*m)->marcmap = marcmap_load(wrbuf_cstr(fname), nt->nmem)))
@@ -121,34 +124,37 @@ 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->stylesheet2)
+		ndoc = xsltApplyStylesheet(m->stylesheet2, *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;