From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 25 Jun 2012 11:12:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.16~3^2~5
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=a989048e5451df8a25201757ba09a4ae50fa6568;hp=-c;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

a989048e5451df8a25201757ba09a4ae50fa6568
diff --combined src/client.c
index 25b75d3,c2187a9..2b270ae
--- a/src/client.c
+++ b/src/client.c
@@@ -412,16 -412,12 +412,12 @@@ static int nativesyntax_to_type(const c
              const char *cp = strchr(s, ';');
              yaz_snprintf(type, 80, "xml; charset=%s", cp ? cp+1 : "marc-8s");
          }
-         else if (!strncmp(s, "xml", 3))
-         {
-             strcpy(type, "xml");
-         }
          else if (!strncmp(s, "txml", 4))
          {
              const char *cp = strchr(s, ';');
              yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s");
          }
-         else
+         else /* pass verbatim to ZOOM - including "xml" */
              strcpy(type, s);
          return 0;
      }
@@@ -695,7 -691,7 +691,7 @@@ static void client_set_facets_request(s
                  wrbuf_puts(w, ",");
          }
      }
 -    yaz_log(YLOG_LOG, "using facets str: %s", wrbuf_cstr(w));
 +    yaz_log(YLOG_DEBUG, "using facets str: %s", wrbuf_cstr(w));
      ZOOM_connection_option_set(link, "facets",
                                 wrbuf_len(w) ? wrbuf_cstr(w) : 0);
      wrbuf_destroy(w);
@@@ -1290,8 -1286,7 +1286,7 @@@ int client_parse_query(struct client *c
      if (!se->relevance)
      {
          // Initialize relevance structure with query terms
-         se->relevance = relevance_create_ccl(
-             se->service->charsets, se->nmem, cn);
+         se->relevance = relevance_create_ccl(se->service->charsets, cn);
      }
      ccl_rpn_delete(cn);
      return ret_value;