X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=cecf5535f23cc628e1dc6b288675305e30000106;hp=4ae57bbb732e746ddc883348b95e36bebcc18432;hb=172a6108e1edcf63a23309999ac938c69f4c1bb0;hpb=7adfe1c2e69ddf39a4f26c015171168a1a8f0ee4 diff --git a/src/solr.c b/src/solr.c index 4ae57bb..cecf553 100644 --- a/src/solr.c +++ b/src/solr.c @@ -22,13 +22,12 @@ #include "sru-p.h" -#define SOLR_MAX_PARAMETERS 100 - #if YAZ_HAVE_XML2 #include #include -static void extract_text_node(xmlNodePtr node, WRBUF wrbuf) { +static void extract_text_node(xmlNodePtr node, WRBUF wrbuf) +{ xmlNodePtr child; for (child = node->children; child ; child = child->next) { @@ -154,7 +153,7 @@ Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, xmlNodePtr node; // USE attribute const char* name = yaz_element_attribute_value_get(ptr, "lst", "name"); - list = yaz_use_attribute_create(o, name); + list = zget_AttributeList_use_string(o, name); for (node = ptr->children; node; node = node->next) num_terms++; facet_field = facet_field_create(o, list, num_terms); @@ -204,28 +203,28 @@ static int yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root, static void yaz_solr_decode_suggestion_values(xmlNodePtr listPptr, WRBUF wrbuf) { xmlNodePtr node; - for (node = listPptr; node; node= node->next) { - if (!strcmp((char*) node->name, "lst")) { + for (node = listPptr; node; node= node->next) + if (!strcmp((char*) node->name, "lst")) + { xmlNodePtr child; - for (child = node->children; child; child= child->next) { - if (match_xml_node_attribute(child, "str", "name", "word")) { + for (child = node->children; child; child= child->next) + { + if (match_xml_node_attribute(child, "str", "name", "word")) + { wrbuf_puts(wrbuf, ""); extract_text_node(child, wrbuf); wrbuf_puts(wrbuf, "\n"); } } } - } } static void yaz_solr_decode_suggestion_lst(xmlNodePtr lstPtr, WRBUF wrbuf) { xmlNodePtr node; - for (node = lstPtr; node; node= node->next) { - if (match_xml_node_attribute(node, "arr", "name", "suggestion")) { + for (node = lstPtr; node; node= node->next) + if (match_xml_node_attribute(node, "arr", "name", "suggestion")) yaz_solr_decode_suggestion_values(node->children, wrbuf); - } - } } static void yaz_solr_decode_misspelled(xmlNodePtr lstPtr, WRBUF wrbuf) @@ -233,9 +232,12 @@ static void yaz_solr_decode_misspelled(xmlNodePtr lstPtr, WRBUF wrbuf) xmlNodePtr node; for (node = lstPtr; node; node= node->next) { - if (!strcmp((const char*) node->name, "lst")) { - const char *misspelled = yaz_element_attribute_value_get(node, "lst", "name"); - if (misspelled) { + if (!strcmp((const char*) node->name, "lst")) + { + const char *misspelled = + yaz_element_attribute_value_get(node, "lst", "name"); + if (misspelled) + { wrbuf_printf(wrbuf, "\n", misspelled); yaz_solr_decode_suggestion_lst(node->children, wrbuf); wrbuf_puts(wrbuf, "\n"); @@ -269,14 +271,16 @@ static int yaz_solr_decode_scan_result(ODR o, xmlNodePtr ptr, /* find the actual list */ for (node = ptr->children; node; node = node->next) - if (node->type == XML_ELEMENT_NODE) { + if (node->type == XML_ELEMENT_NODE) + { ptr = node; break; } scr->num_terms = 0; for (node = ptr->children; node; node = node->next) - if (node->type == XML_ELEMENT_NODE && !strcmp((const char *) node->name, "int")) + if (node->type == XML_ELEMENT_NODE && + !strcmp((const char *) node->name, "int")) scr->num_terms++; if (scr->num_terms) @@ -284,7 +288,8 @@ static int yaz_solr_decode_scan_result(ODR o, xmlNodePtr ptr, for (node = ptr->children; node; node = node->next) { - if (node->type == XML_ELEMENT_NODE && !strcmp((const char *) node->name, "int")) + if (node->type == XML_ELEMENT_NODE && + !strcmp((const char *) node->name, "int")) { Z_SRW_scanTerm *term = scr->terms + i; @@ -297,17 +302,19 @@ static int yaz_solr_decode_scan_result(ODR o, xmlNodePtr ptr, * SOLR not being able to encode them into 2 separate attributes. */ pos = strchr(val, '^'); - if (pos != NULL) { + if (pos != NULL) + { term->displayTerm = odr_strdup(o, pos + 1); *pos = '\0'; term->value = odr_strdup(o, val); *pos = '^'; - } else { + } + else + { term->value = odr_strdup(o, val); term->displayTerm = NULL; } term->whereInList = NULL; - i++; } } @@ -476,8 +483,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 +491,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 +514,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) { @@ -525,7 +545,8 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, return -1; } } - else if (srw_pdu->which == Z_SRW_scan_request) { + else if (srw_pdu->which == Z_SRW_scan_request) + { Z_SRW_scanRequest *request = srw_pdu->u.scan_request; solr_op = "terms"; if (!srw_pdu->u.scan_request->scanClause) @@ -541,17 +562,18 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, { q = request->scanClause; pos = strchr(q, ':'); - if (pos != NULL) { + if (pos != NULL) + { yaz_add_name_value_str(encode, name, value, &i, "terms.lower", odr_strdup(encode, pos + 1)); *pos = '\0'; yaz_add_name_value_str(encode, name, value, &i, "terms.fl", odr_strdup(encode, q)); *pos = ':'; - } else { + } + else yaz_add_name_value_str(encode, name, value, &i, "terms.lower", odr_strdup(encode, q)); - } } else return -1; @@ -563,17 +585,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);