X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=3a760f419d615d0590f7f80077cebabd84e25039;hp=c1c1bbadfee72b2f869070d66f5e332cb0169b96;hb=fe70a30cf56d64d794e5ccd83396c717cba88a9d;hpb=01e36a11adc97a240cc595f89280c8a619770251 diff --git a/src/solr.c b/src/solr.c index c1c1bba..3a760f4 100644 --- a/src/solr.c +++ b/src/solr.c @@ -22,8 +22,6 @@ #include "sru-p.h" -#define SOLR_MAX_PARAMETERS 100 - #if YAZ_HAVE_XML2 #include #include @@ -476,8 +474,7 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, ODR encode, const char *charset) { const char *solr_op = 0; - //TODO Change. not a nice hard coded, unchecked limit. - char *name[SOLR_MAX_PARAMETERS], *value[SOLR_MAX_PARAMETERS]; + char **name, **value; char *uri_args; char *path; char *q; @@ -485,6 +482,20 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, char *cp; const char *path_args = 0; int i = 0; + int no_parms = 20; /* safe upper limit of args without extra_args */ + Z_SRW_extra_arg *ea; + + for (ea = srw_pdu->extra_args; ea; ea = ea->next) + no_parms++; + name = (char **) odr_malloc(encode, sizeof(*name) * no_parms); + value = (char **) odr_malloc(encode, sizeof(*value) * no_parms); + + for (ea = srw_pdu->extra_args; ea; ea = ea->next) + { + name[i] = ea->name; + value[i] = ea->value; + i++; + } z_HTTP_header_add_basic_auth(encode, &hreq->headers, srw_pdu->username, srw_pdu->password); @@ -494,7 +505,7 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, solr_op = "select"; if (!srw_pdu->u.request->query) return -1; - /* not considering query type here ! */ + yaz_add_name_value_str(encode, name, value, &i, "defType", "lucene"); yaz_add_name_value_str(encode, name, value, &i, "q", request->query); if (srw_pdu->u.request->startRecord) { @@ -563,17 +574,6 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, else return -1; - if (srw_pdu->extra_args) - { - Z_SRW_extra_arg *ea = srw_pdu->extra_args; - for (; ea && i < SOLR_MAX_PARAMETERS; ea = ea->next) - { - name[i] = ea->name; - value[i] = ea->value; - i++; - } - } - name[i++] = 0; yaz_array_to_uri(&uri_args, encode, name, value);