Fix elements for which SRU facet NS is applied

[yaz-moved-to-github.git] / src / sru_facet.c

diff --git a/src/sru_facet.c b/src/sru_facet.c
index 87eb9ed..7703f37 100644 (file)
--- a/src/sru_facet.c
+++ b/src/sru_facet.c
@@ -86,7 +86,8 @@ void yaz_sru_facet_request(ODR o, Z_FacetList **facetList, const char **limit,
                     }
                     if (av.start || av.useattr)
                     {
                     }
                     if (av.start || av.useattr)
                     {

-                        wrbuf_printf(w_start, "%d", av.start);
+                        wrbuf_printf(w_start, "%d",
+                                     av.start == 0 ? 1 : av.start);

                         if (av.useattr)
                             wrbuf_printf(w_start, ":%s", av.useattr);
                         wrbuf_puts(w_start, ",");
                         if (av.useattr)
                             wrbuf_printf(w_start, ":%s", av.useattr);
                         wrbuf_puts(w_start, ",");

@@ -218,11 +219,10 @@ void yaz_sru_facet_response(ODR o, Z_FacetList **facetList, xmlNodePtr n)
                 "http://docs.oasis-open.org/ns/search-ws/facetedResults";
             xmlNode *p1 = xmlNewChild(n, 0, BAD_CAST "facetedResults", 0);
             xmlNsPtr ns_fr = xmlNewNs(p1, BAD_CAST ns, BAD_CAST "fr");
                 "http://docs.oasis-open.org/ns/search-ws/facetedResults";
             xmlNode *p1 = xmlNewChild(n, 0, BAD_CAST "facetedResults", 0);
             xmlNsPtr ns_fr = xmlNewNs(p1, BAD_CAST ns, BAD_CAST "fr");

-            xmlSetNs(p1, ns_fr);

             for (i = 0; i < fl->num; i++)
             {
                 Z_FacetField *ff = fl->elements[i];
             for (i = 0; i < fl->num; i++)
             {
                 Z_FacetField *ff = fl->elements[i];

-                xmlNode *p2 = xmlNewChild(p1, 0, BAD_CAST "facet", 0);
+                xmlNode *p2 = xmlNewChild(p1, ns_fr, BAD_CAST "facet", 0);

                 int j;
                 xmlNode *p3;
                 struct yaz_facet_attr av;
                 int j;
                 xmlNode *p3;
                 struct yaz_facet_attr av;