From 642c4b23f3b55ba43c0ccd5b0e04edb4758d7921 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 17 May 2013 14:12:26 +0200
Subject: [PATCH] XML context for errors, no set element for service

It's not implemented.
---
 src/pazpar2_config.c                 |   32 ++++++++++++++++++++++----------
 test/test_limit_limitmap_service.xml |    2 --
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index d6053ae..698fb15 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -64,6 +64,25 @@ struct service_xslt
     struct service_xslt *next;
 };
 
+static char *xml_context(const xmlNode *ptr, char *res, size_t len)
+{
+    size_t off = len - 1;
+    res[off] = '\0';
+    while (ptr && ptr->type == XML_ELEMENT_NODE)
+    {
+        size_t l = strlen((const char *) ptr->name);
+        if (off <= l + 1)
+            break;
+
+        off = off - l;
+        memcpy(res + off, ptr->name, l);
+        res[--off] = '/';
+
+        ptr = ptr->parent;
+    }
+    return res + off;
+}
+
 struct conf_service *service_init(struct conf_server *server,
                                          int num_metadata, int num_sortkeys,
                                          const char *service_id)
@@ -597,15 +616,6 @@ static struct conf_service *service_create_static(struct conf_server *server,
             if (service_xslt_config(service, n))
                 return 0;
         }
-        else if (!strcmp((const char *) n->name, (const char *) "set"))
-        {
-            xmlChar *name= xmlGetProp(n, (xmlChar *) "name");
-            xmlChar *value = xmlGetProp(n, (xmlChar *) "value");
-            if (service->dictionary && name && value) {
-                yaz_log(YLOG_DEBUG, "service set: %s=%s (Not implemented)", (char *) name, (char *) value);
-                //service_aply_setting(service, name, value);
-            }
-        }
         else if (!strcmp((const char *) n->name, "rank"))
         {
             char *rank_cluster = (char *) xmlGetProp(n, (xmlChar *) "cluster");
@@ -683,7 +693,9 @@ static struct conf_service *service_create_static(struct conf_server *server,
         }
         else
         {
-            yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
+            char tmp[80];
+            yaz_log(YLOG_FATAL, "Bad element: %s . Context: %s", n->name,
+                    xml_context(n, tmp, sizeof tmp));
             return 0;
         }
     }
diff --git a/test/test_limit_limitmap_service.xml b/test/test_limit_limitmap_service.xml
index b9b45dd..5a715b1 100644
--- a/test/test_limit_limitmap_service.xml
+++ b/test/test_limit_limitmap_service.xml
@@ -7,8 +7,6 @@
     <set name="pz:limitmap:subject" value="rpn: @attr 1=21 @attr 6=3" />
   </settings>
 
-  <set name="service" value="from-service" />
-
   <metadata name="id"/>
   <metadata name="url" merge="unique"/>
   <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
-- 
1.7.10.4