zoom: insert generated-url before common XSLT

[metaproxy-moved-to-github.git] / src / filter_zoom.cpp

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 6ca6015..bbd8302 100644 (file)
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -1242,19 +1242,20 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
     const char *syntax_name = 0;
     
     if (preferredRecordSyntax &&
-        !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)
-        && element_set_name)
+        !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml))
     {
-        if (!strcmp(element_set_name, m_p->element_transform.c_str()))
+        if (element_set_name &&
+            !strcmp(element_set_name, m_p->element_transform.c_str()))
         {
             enable_pz2_retrieval = true;
             enable_pz2_transform = true;
         }
-        else if (!strcmp(element_set_name, m_p->element_raw.c_str()))
+        else if (element_set_name && 
+                 !strcmp(element_set_name, m_p->element_raw.c_str()))
         {
             enable_pz2_retrieval = true;
         }
-        else
+        else if (m_p->record_xsp)
         {
             enable_pz2_retrieval = true;
             enable_pz2_transform = true;
@@ -1505,9 +1506,30 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package,
                     }
                     else
                     { 
+                        // first stage XSLT - per target
                         xsltStylesheetPtr xsp = b->xsp;
                         xmlDoc *rec_res = xsltApplyStylesheet(xsp, rec_doc,
                                                               xsl_parms);
+                        // insert generated-url
+                        if (rec_res)
+                        {
+                            std::string res = 
+                                mp::xml::url_recipe_handle(rec_res,
+                                                           b->sptr->urlRecipe);
+                            if (res.length())
+                            {
+                                xmlNode *ptr = xmlDocGetRootElement(rec_res);
+                                while (ptr && ptr->type != XML_ELEMENT_NODE)
+                                    ptr = ptr->next;
+                                xmlNode *c = 
+                                    xmlNewChild(ptr, 0, BAD_CAST "metadata", 0);
+                                xmlNewProp(c, BAD_CAST "type", BAD_CAST
+                                           "generated-url");
+                                xmlNode * t = xmlNewText(BAD_CAST res.c_str());
+                                xmlAddChild(c, t);
+                            }
+                        }
+                        // second stage XSLT - common
                         if (rec_res && m_p->record_xsp &&
                             enable_record_transform)
                         {
@@ -1518,6 +1540,7 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package,
                                                           xsl_parms);
                             xmlFreeDoc(tmp_doc);
                         }
+                        // get result out of it
                         if (rec_res)
                         {
                             xsltSaveResultToString(&xmlrec_buf, &rec_len,
@@ -1544,37 +1567,6 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package,
                     }
                 }
 
-                if (rec_buf)
-                {
-                    xmlDoc *doc = xmlParseMemory(rec_buf, rec_len);
-                    std::string res = 
-                        mp::xml::url_recipe_handle(doc, b->sptr->urlRecipe);
-                    if (res.length() && *cproxy_host)
-                    {
-                        size_t off = res.find_first_of("://");
-                        if (off != std::string::npos)
-                            res.insert(off + 3, cproxy_host);
-                    }
-                    if (res.length())
-                    {
-                        xmlNode *ptr = xmlDocGetRootElement(doc);
-                        while (ptr && ptr->type != XML_ELEMENT_NODE)
-                            ptr = ptr->next;
-                        xmlNode *c = 
-                            xmlNewChild(ptr, 0, BAD_CAST "metadata", 0);
-                        xmlNewProp(c, BAD_CAST "type", BAD_CAST
-                                   "generated-url");
-                        xmlNode * t = xmlNewText(BAD_CAST res.c_str());
-                        xmlAddChild(c, t);
-
-                        if (xmlrec_buf)
-                            xmlFree(xmlrec_buf);
-
-                        xmlDocDumpMemory(doc, &xmlrec_buf, &rec_len);
-                        rec_buf = (const char *) xmlrec_buf;
-                    }
-                    xmlFreeDoc(doc);
-                }
                 if (!npr)
                 {
                     if (!rec_buf)