X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=99a9519737e47d8711eb198aaa2eec5be6e2888b;hp=4c77e6fb53920a39c2be216dcc7f34d713bc63dc;hb=7143bc8f77ac03fdb6f36f30b16cf64c2d6cc3e2;hpb=473824797f568578dc17d7242551cb2f7ccef46c

diff --git a/src/solr.c b/src/solr.c
index 4c77e6f..99a9519 100644
--- a/src/solr.c
+++ b/src/solr.c
@@ -482,6 +482,7 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     char *q;
     char *pos;
     char *cp;
+    const char *path_args = 0;
     int i = 0;
 
     z_HTTP_header_add_basic_auth(encode, &hreq->headers,
@@ -580,8 +581,17 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
 
     path = (char *)
         odr_malloc(encode, strlen(hreq->path) +
-                   strlen(uri_args) + strlen(solr_op) + 4);
+                   strlen(uri_args) + strlen(solr_op) + 5);
 
+    cp = strchr(hreq->path, '#');
+    if (cp)
+        *cp = '\0';
+    cp = strchr(hreq->path, '?');
+    if (cp)
+    {
+        *cp = '\0'; /* args in path */
+        path_args = cp + 1;
+    }
     strcpy(path, hreq->path);
     cp = strrchr(path, '/');
     if (cp)
@@ -592,6 +602,11 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     strcat(path, "/");
     strcat(path, solr_op);
     strcat(path, "?");
+    if (path_args)
+    {
+        strcat(path, path_args);
+        strcat(path, "&");
+    }
     strcat(path, uri_args);
     hreq->path = path;