X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-z3950.c;h=69d6dbe525ad96346b9c1ed4ad5ae378c8ea2c2a;hp=bea312553f3db7d72aab717b09dbf8278a33fef5;hb=1932238af8876622f567da122fb52fb3791c9514;hpb=a85318e88468026d7704f527fbe45010c5e24e91 diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c index bea3125..69d6dbe 100644 --- a/src/zoom-z3950.c +++ b/src/zoom-z3950.c @@ -126,9 +126,7 @@ static Z_External *encode_ill_request(ZOOM_package p) r->which = Z_External_single; r->u.single_ASN1_type = - odr_create_Odr_oct(out, - (unsigned char *)illRequest_buf, - illRequest_size); + odr_create_Odr_oct(out, illRequest_buf, illRequest_size); } return r; } @@ -272,8 +270,7 @@ static Z_APDU *create_xmlupdate_package(ZOOM_package p) ext->indirect_reference = 0; ext->which = Z_External_octet; - ext->u.single_ASN1_type = - odr_create_Odr_oct(p->odr_out, (const unsigned char *) doc, len); + ext->u.single_ASN1_type = odr_create_Odr_oct(p->odr_out, doc, len); return apdu; } @@ -417,8 +414,7 @@ static Z_APDU *create_update_package(ZOOM_package p) if (recordIdOpaque) { notToKeep->elements[0]->u.opaque = - odr_create_Odr_oct(p->odr_out, - (const unsigned char *) recordIdOpaque, + odr_create_Odr_oct(p->odr_out, recordIdOpaque, recordIdOpaque_len); } else if (recordIdNumber) @@ -642,6 +638,7 @@ zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c) ZOOM_resultset r; int lslb, ssub, mspn; const char *syntax; + const char *schema; Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_searchRequest); Z_SearchRequest *search_req = apdu->u.searchRequest; const char *elementSetName; @@ -673,8 +670,7 @@ zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c) if (facets) { Z_FacetList *facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets); if (facet_list) { - Z_OtherInformation **oi; - yaz_oi_APDU(apdu, &oi); + Z_OtherInformation **oi = &search_req->additionalSearchInfo; yaz_oi_set_facetlist(oi, c->odr_out, facet_list); } else @@ -722,6 +718,8 @@ zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c) /* get syntax (no need to provide unless piggyback is in effect) */ syntax = c->tasks->u.search.syntax; + schema = c->tasks->u.search.schema; + lslb = ZOOM_options_get_int(r->options, "largeSetLowerBound", -1); ssub = ZOOM_options_get_int(r->options, "smallSetUpperBound", -1); mspn = ZOOM_options_get_int(r->options, "mediumSetPresentNumber", -1); @@ -733,7 +731,7 @@ zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c) *search_req->mediumSetPresentNumber = mspn; } else if (c->tasks->u.search.start == 0 && c->tasks->u.search.count > 0 - && r->piggyback && !r->r_sort_spec && !r->schema) + && r->piggyback && !r->r_sort_spec && !schema) { /* Regular piggyback - do it unless we're going to do sort */ *search_req->largeSetLowerBound = 2000000000; @@ -1327,7 +1325,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, { ZOOM_resultset resultset; int *start, *count; - const char *syntax = 0, *elementSetName = 0; + const char *syntax = 0, *elementSetName = 0, *schema = 0; if (!c->tasks) return ; @@ -1339,6 +1337,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, count = &c->tasks->u.search.count; syntax = c->tasks->u.search.syntax; elementSetName = c->tasks->u.search.elementSetName; + schema = c->tasks->u.search.schema; break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; @@ -1346,6 +1345,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, count = &c->tasks->u.retrieve.count; syntax = c->tasks->u.retrieve.syntax; elementSetName = c->tasks->u.retrieve.elementSetName; + schema = c->tasks->u.retrieve.schema; break; default: return; @@ -1374,8 +1374,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, for (i = 0; inum_records; i++) { ZOOM_record_cache_add(resultset, p->records[i], i + *start, - syntax, elementSetName, - elementSetName, 0); + syntax, elementSetName, schema, 0); } *count -= i; if (*count < 0) @@ -1397,7 +1396,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, "ZOOM C generated. Present phase and no records"); ZOOM_record_cache_add(resultset, myrec, *start, - syntax, elementSetName, 0, 0); + syntax, elementSetName, schema, 0); } } else if (present_phase) @@ -1409,7 +1408,7 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr, YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, "ZOOM C generated: Present response and no records"); ZOOM_record_cache_add(resultset, myrec, *start, - syntax, elementSetName, 0, 0); + syntax, elementSetName, schema, 0); } } } @@ -1459,7 +1458,8 @@ zoom_ret send_Z3950_present(ZOOM_connection c) int i = 0; const char *syntax = 0; const char *elementSetName = 0; - ZOOM_resultset resultset; + const char *schema = 0; + ZOOM_resultset resultset; int *start, *count; if (!c->tasks) @@ -1476,6 +1476,7 @@ zoom_ret send_Z3950_present(ZOOM_connection c) count = &c->tasks->u.search.count; syntax = c->tasks->u.search.syntax; elementSetName = c->tasks->u.search.elementSetName; + schema = c->tasks->u.search.schema; break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; @@ -1483,6 +1484,7 @@ zoom_ret send_Z3950_present(ZOOM_connection c) count = &c->tasks->u.retrieve.count; syntax = c->tasks->u.retrieve.syntax; elementSetName = c->tasks->u.retrieve.elementSetName; + schema = c->tasks->u.retrieve.schema; break; default: return zoom_complete; @@ -1504,7 +1506,7 @@ zoom_ret send_Z3950_present(ZOOM_connection c) { ZOOM_record rec = ZOOM_record_cache_lookup(resultset, i + *start, - syntax, elementSetName); + syntax, elementSetName, schema); if (!rec) break; else @@ -1543,7 +1545,7 @@ zoom_ret send_Z3950_present(ZOOM_connection c) req->preferredRecordSyntax = zoom_yaz_str_to_z3950oid(c, CLASS_RECSYN, syntax); - if (resultset->schema && *resultset->schema) + if (schema && *schema) { Z_RecordComposition *compo = (Z_RecordComposition *) odr_malloc(c->odr_out, sizeof(*compo)); @@ -1561,14 +1563,14 @@ zoom_ret send_Z3950_present(ZOOM_connection c) compo->u.complex->generic->which = Z_Schema_oid; compo->u.complex->generic->schema.oid = (Odr_oid *) - zoom_yaz_str_to_z3950oid (c, CLASS_SCHEMA, resultset->schema); + zoom_yaz_str_to_z3950oid(c, CLASS_SCHEMA, schema); if (!compo->u.complex->generic->schema.oid) { /* OID wasn't a schema! Try record syntax instead. */ compo->u.complex->generic->schema.oid = (Odr_oid *) - zoom_yaz_str_to_z3950oid (c, CLASS_RECSYN, resultset->schema); + zoom_yaz_str_to_z3950oid(c, CLASS_RECSYN, schema); } if (elementSetName && *elementSetName) {