X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_sru_to_z3950.cpp;h=2d7bcb9faf32ba41e1d644d4b0076c85d629bc9c;hb=c4dfc2f256766cba3340d36a6048bb1f5f3fb895;hp=d3f2bdb85aaa084af716ab33a80fc59a999714b6;hpb=ef427d6fec231e98a5babda2436dad7968df7b46;p=metaproxy-moved-to-github.git diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index d3f2bdb..2d7bcb9 100644 --- a/src/filter_sru_to_z3950.cpp +++ b/src/filter_sru_to_z3950.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_sru_to_z3950.cpp,v 1.8 2006-09-19 13:50:17 marc Exp $ +/* $Id: filter_sru_to_z3950.cpp,v 1.14 2006-09-26 13:15:33 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details @@ -9,6 +9,7 @@ #include "package.hpp" #include "util.hpp" #include "gduutil.hpp" +#include "sru_util.hpp" #include "filter_sru_to_z3950.hpp" #include @@ -60,7 +61,6 @@ namespace metaproxy_1 namespace metaproxy_1 { namespace filter { class SRUtoZ3950::Rep { - //friend class SRUtoZ3950; private: union SRW_query {char * cql; char * xcql; char * pqf;}; typedef const int& SRW_query_type; @@ -74,8 +74,29 @@ namespace metaproxy_1 { const std::string &content, int http_code = 200) const; bool build_sru_debug_package(mp::Package &package) const; + bool build_simple_explain(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_explainRequest const *er_req) + const; + bool build_sru_response(mp::Package &package, + mp::odr &odr_en, + Z_SOAP *soap, + const Z_SRW_PDU *sru_pdu_res, + char *charset, + const char *stylesheet) const; Z_SRW_PDU * decode_sru_request(mp::Package &package, - mp::odr &odr_de) const; + mp::odr &odr_de, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SOAP *&soap, + char *charset, + char *stylesheet) const; + bool check_sru_query_exists(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_searchRetrieveRequest + const *sr_req) const; bool z3950_build_query(mp::odr &odr_en, Z_Query *z_query, const SRW_query &query, SRW_query_type query_type) const; @@ -84,25 +105,23 @@ namespace metaproxy_1 { &database = "Default") const; bool z3950_close_request(mp::Package &package) const; bool z3950_search_request(mp::Package &package, - unsigned int &hits, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest const *sr_req) const; - //const std::string &database, - //const std::string &query, - //int query_type) const; bool z3950_present_request(mp::Package &package, - unsigned int &records_returned, - unsigned int &next_position, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest const *sr_req) const; - //unsigned int start_position, - //unsigned int records_requested) const; bool z3950_scan_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_scanRequest const *sr_req) const; - //const std::string &database, - //const std::string &query, - //int query_type) const; + Z_ElementSetNames * build_esn_from_schema(mp::odr &odr_en, const char *schema) const; + int z3950_to_srw_diag(mp::odr &odr_en, Z_SRW_searchRetrieveResponse *srw_res, + Z_DefaultDiagFormat *ddf) const; }; } } @@ -143,17 +162,26 @@ void yf::SRUtoZ3950::Rep::process(mp::Package &package) const // TODO: Z3950 response parsing and translation to SRU package - bool ok; + bool ok = true; - Z_SRW_PDU *sru_pdu_req = 0; mp::odr odr_de(ODR_DECODE); + Z_SRW_PDU *sru_pdu_req = 0; + mp::odr odr_en(ODR_ENCODE); + //Z_SRW_PDU *sru_pdu_res = 0; + Z_SRW_PDU *sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); + Z_SOAP *soap = 0; + char *charset = 0; + char *stylesheet = 0; - if (! (sru_pdu_req = decode_sru_request(package, odr_de))) + if (! (sru_pdu_req = decode_sru_request(package, odr_de, odr_en, + sru_pdu_res, soap, + charset, stylesheet))) { - std::cout << "TODO: correct error when SRW package could not be" - " parsed\n"; + build_sru_response(package, odr_en, soap, + sru_pdu_res, charset, stylesheet); + package.session().close(); return; } @@ -165,37 +193,41 @@ void yf::SRUtoZ3950::Rep::process(mp::Package &package) const std::cout << "SRU empty\n"; + // explain + if (sru_pdu_req && sru_pdu_req->which == Z_SRW_explain_request) + { + Z_SRW_explainRequest *er_req = sru_pdu_req->u.explain_request; + //sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); + + build_simple_explain(package, odr_en, sru_pdu_res, er_req); + } + // searchRetrieve - if (sru_pdu_req && sru_pdu_req->which == Z_SRW_searchRetrieve_request) + else if (sru_pdu_req + && sru_pdu_req->which == Z_SRW_searchRetrieve_request + && sru_pdu_req->u.request) { Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request; - // TODO: checking of unsupported operations and proper diagnostic setup - - // recordXPath unsupported. - //if (sr_req->recordXPath) - // yaz_add_srw_diagnostic(odr_decode(), - // &diag, &num_diags, 72, 0); - // sort unsupported - // if (sr_req->sort_type != Z_SRW_sort_type_none) - // yaz_add_srw_diagnostic(odr_decode(), - // &diag, &num_diags, 80, 0); + sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_searchRetrieve_response); + // checking that we have a query + ok = check_sru_query_exists(package, odr_en, sru_pdu_res, sr_req); - if (z3950_init_request(package)) + if (ok && z3950_init_request(package)) { - unsigned int search_hits = 0; - unsigned int records_returned = 0; - unsigned int next_position = 0; { - ok = z3950_search_request(package, search_hits, sr_req); - //"Default", - //"dc.title=bacillus", - //Z_SRW_query_type_cql); - if (ok && search_hits) - ok = z3950_present_request(package, - records_returned, - next_position, + ok = z3950_search_request(package, odr_en, + sru_pdu_res, sr_req); + + if (ok + && sru_pdu_res->u.response->numberOfRecords + && *(sru_pdu_res->u.response->numberOfRecords) + && sr_req->maximumRecords + && *(sr_req->maximumRecords)) + + ok = z3950_present_request(package, odr_en, + sru_pdu_res, sr_req); z3950_close_request(package); } @@ -203,24 +235,33 @@ void yf::SRUtoZ3950::Rep::process(mp::Package &package) const } // scan - else if (sru_pdu_req && sru_pdu_req->which == Z_SRW_scan_request) + else if (sru_pdu_req + && sru_pdu_req->which == Z_SRW_scan_request + && sru_pdu_req->u.scan_request) { - Z_SRW_scanRequest *sr_req = sru_pdu_req->u.scan_request; + Z_SRW_scanRequest *sr_req = sru_pdu_req->u.scan_request; + + sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_scan_response); + if (z3950_init_request(package)) { - z3950_scan_request(package, sr_req); + z3950_scan_request(package, odr_en, sru_pdu_res, sr_req); z3950_close_request(package); } } else { std::cout << "SRU OPERATION NOT SUPPORTED \n"; + sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); + // TODO: make nice diagnostic return package package.session().close(); return; } - build_sru_debug_package(package); + //build_sru_debug_package(package); + build_sru_response(package, odr_en, soap, + sru_pdu_res, charset, stylesheet); return; @@ -231,6 +272,61 @@ void yf::SRUtoZ3950::Rep::process(mp::Package &package) const } + +bool yf::SRUtoZ3950::Rep::build_simple_explain(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_explainRequest + const *er_req) const +{ + + // z3950'fy recordPacking + int record_packing = Z_SRW_recordPacking_XML; + if (er_req->recordPacking && 's' == *(er_req->recordPacking)) + record_packing = Z_SRW_recordPacking_string; + + // getting database info + std::string database("Default"); + if (er_req->database) + database = er_req->database; + + // building SRU explain record + std::string explain_xml + = mp::to_string( + "\n" + " \n" + " ") + + package.origin().server_host() + + mp::to_string("\n" + " ") + + mp::to_string(package.origin().server_port()) + + mp::to_string("\n" + " ") + + database + + mp::to_string("\n" + " \n" + "\n"); + + + // preparing explain record insert + Z_SRW_explainResponse *sru_res = sru_pdu_res->u.explain_response; + //sru_res->record + // = (Z_SRW_record *) odr_malloc(odr_en, sizeof(Z_SRW_record)); + + // inserting one and only explain record + + sru_res->record.recordPosition = odr_intdup(odr_en, 1); + sru_res->record.recordPacking = record_packing; + sru_res->record.recordSchema = "http://explain.z3950.org/dtd/2.0/"; + sru_res->record.recordData_len = 1 + explain_xml.size(); + sru_res->record.recordData_buf + = odr_strdupn(odr_en, (const char *)explain_xml.c_str(), + 1 + explain_xml.size()); + + return true; +}; + + bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const { Z_GDU *zgdu_req = package.request().get(); @@ -242,58 +338,126 @@ bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const http_response(package, content, http_code); return true; } + package.session().close(); + return false; +} + + +bool yf::SRUtoZ3950::Rep::build_sru_response(mp::Package &package, + mp::odr &odr_en, + Z_SOAP *soap, + const Z_SRW_PDU *sru_pdu_res, + char *charset, + const char *stylesheet) + const +{ + + // SRU request package translation to Z3950 package + if (sru_pdu_res) + std::cout << *(const_cast(sru_pdu_res)) << "\n"; + else + std::cout << "SRU empty\n"; + + + Z_GDU *zgdu_req = package.request().get(); + if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request) + { + Z_GDU *zgdu_res //= z_get_HTTP_Response(odr_en, 200); + = odr_en.create_HTTP_Response(package.session(), + zgdu_req->u.HTTP_Request, + 200); + + // adding HTTP response code and headers + Z_HTTP_Response * http_res = zgdu_res->u.HTTP_Response; + //http_res->code = http_code; + + std::string ctype("text/xml"); + if (charset){ + ctype += "; charset="; + ctype += charset; + } + + z_HTTP_header_add(odr_en, + &http_res->headers, "Content-Type", ctype.c_str()); + + // packaging Z_SOAP into HTML response + static Z_SOAP_Handler soap_handlers[4] = { + {"http://www.loc.gov/zing/srw/", 0, + (Z_SOAP_fun) yaz_srw_codec}, + {"http://www.loc.gov/zing/srw/v1.0/", 0, + (Z_SOAP_fun) yaz_srw_codec}, + {"http://www.loc.gov/zing/srw/update/", 0, + (Z_SOAP_fun) yaz_ucp_codec}, + {0, 0, 0} + }; + + + // empty stylesheet means NO stylesheet + if (stylesheet && *stylesheet == '\0') + stylesheet = 0; + + // encoding SRU package + + soap->u.generic->p = (void*) sru_pdu_res; + //int ret = + z_soap_codec_enc_xsl(odr_en, &soap, + &http_res->content_buf, &http_res->content_len, + soap_handlers, charset, stylesheet); + + + package.response() = zgdu_res; + return true; + } + package.session().close(); return false; } + Z_SRW_PDU * yf::SRUtoZ3950::Rep::decode_sru_request(mp::Package &package, - mp::odr &odr_de) const + mp::odr &odr_de, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SOAP *&soap, + char *charset, + char *stylesheet) + const { Z_GDU *zgdu_req = package.request().get(); Z_SRW_PDU *sru_pdu_req = 0; - // ignoring all non HTTP_Request packages - if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request)){ - return 0; - } + assert((zgdu_req->which == Z_GDU_HTTP_Request)); + + //ignoring all non HTTP_Request packages + //if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request)){ + // return 0; + //} Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request; if (! http_req) return 0; - Z_SOAP *soap_req = 0; - char *charset = 0; - Z_SRW_diagnostic *diag = 0; - int num_diags = 0; + //Z_SRW_PDU *sru_pdu_res_exp = yaz_srw_get(odr_en, Z_SRW_explain_response); - if (0 == yaz_sru_decode(http_req, &sru_pdu_req, &soap_req, - odr_de, &charset, &diag, &num_diags)) + if (0 == yaz_sru_decode(http_req, &sru_pdu_req, &soap, + odr_de, &charset, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics))) { - if (num_diags) + if (sru_pdu_res->u.response->num_diagnostics) { - std::cout << "SRU DIAGNOSTICS " << num_diags << "\n"; - // TODO: make nice diagnostic return package - //Z_SRW_PDU *srw_pdu_res = - // yaz_srw_get(odr(ODR_ENCODE), - // Z_SRW_searchRetrieve_response); - // Z_SRW_searchRetrieveResponse *srw_res = srw_pdu_res->u.response; - - // srw_res->diagnostics = diagnostic; - // srw_res->num_diagnostics = num_diagnostic; - // send_srw_response(srw_pdu_res); - // return; - - // package.session().close(); + //sru_pdu_res = sru_pdu_res_exp; + package.session().close(); return 0; } return sru_pdu_req; } - else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap_req, + else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap, odr_de, &charset)) return sru_pdu_req; else { - //std::cout << "SRU DECODING ERROR - SHOULD NEVER HAPPEN\n"; + //sru_pdu_res = sru_pdu_res_exp; package.session().close(); return 0; } @@ -301,6 +465,47 @@ bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const } bool +yf::SRUtoZ3950::Rep::check_sru_query_exists(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_searchRetrieveRequest + const *sr_req) + const +{ + if( (sr_req->query_type == Z_SRW_query_type_cql && !sr_req->query.cql) ) + { + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 7, "query"); + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 10, "CQL query is empty"); + return false; + } + if( (sr_req->query_type == Z_SRW_query_type_xcql && !sr_req->query.xcql) ) + { + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 10, "XCQL query is empty"); + return false; + } + if( (sr_req->query_type == Z_SRW_query_type_pqf && !sr_req->query.pqf) ) + { + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 10, "PQF query is empty"); + return false; + } + return true; +}; + + + +bool yf::SRUtoZ3950::Rep::z3950_init_request(mp::Package &package, const std::string &database) const { @@ -355,7 +560,10 @@ yf::SRUtoZ3950::Rep::z3950_init_request(mp::Package &package, bool yf::SRUtoZ3950::Rep::z3950_close_request(mp::Package &package) const { - // prepare Z3950 package + // close SRU package + package.session().close(); + + // prepare and close Z3950 package Package z3950_package(package.session(), package.origin()); z3950_package.copy_filter(package); z3950_package.session().close(); @@ -374,32 +582,30 @@ yf::SRUtoZ3950::Rep::z3950_close_request(mp::Package &package) const // return true; if (z3950_package.session().is_closed()){ - //package.session().close(); return true; } return false; } bool -yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package, - unsigned int &hits, +yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest const *sr_req) const { - hits = 0; - Package z3950_package(package.session(), package.origin()); - z3950_package.copy_filter(package); - mp::odr odr_en(ODR_ENCODE); - Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest); + z3950_package.copy_filter(package); - //TODO: add stuff in apdu + //add stuff in z3950 apdu + Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest); Z_SearchRequest *z_searchRequest = apdu->u.searchRequest; - // database repackaging + // z3950'fy database z_searchRequest->num_databaseNames = 1; z_searchRequest->databaseNames = (char**) odr_malloc(odr_en, sizeof(char *)); + if (sr_req->database) z_searchRequest->databaseNames[0] = odr_strdup(odr_en, const_cast(sr_req->database)); @@ -408,7 +614,7 @@ yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package, = odr_strdup(odr_en, "Default"); - // query repackaging + // z3950'fy query Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query)); z_searchRequest->query = z_query; @@ -424,15 +630,37 @@ yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package, //std::cout << "z3950_search_request " << *apdu << "\n"; z3950_package.move(); - //TODO: check success condition + + Z_GDU *z3950_gdu = z3950_package.response().get(); //std::cout << "z3950_search_request " << *z3950_gdu << "\n"; + //TODO: check success condition + + //int yaz_diag_bib1_to_srw (int bib1_code); + //int yaz_diag_srw_to_bib1(int srw_code); + //Se kode i src/seshigh.c (srw_bend_search, srw_bend_init). + if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 && z3950_gdu->u.z3950->which == Z_APDU_searchResponse && z3950_gdu->u.z3950->u.searchResponse->searchStatus) { - hits = *(z3950_gdu->u.z3950->u.searchResponse->resultCount); + + Z_SearchResponse *sr = z3950_gdu->u.z3950->u.searchResponse; + if (sr) + { + // srw'fy number of records + sru_pdu_res->u.response->numberOfRecords + = (int *) odr_malloc(odr_en, sizeof(int *)); + *(sru_pdu_res->u.response->numberOfRecords) = *(sr->resultCount); + + // srw'fy nextRecordPosition + //sru_pdu_res->u.response->nextRecordPosition + // = (int *) odr_malloc(odr_en, sizeof(int *)); + //*(sru_pdu_res->u.response->nextRecordPosition) = 1; + + } + return true; } @@ -441,34 +669,80 @@ yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package, bool yf::SRUtoZ3950::Rep::z3950_present_request(mp::Package &package, - unsigned int &records_returned, - unsigned int &next_position, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest const *sr_req) -// unsigned int start_position, -// unsigned int records_requested) const { if (!sr_req) return false; - records_returned = 0; - next_position = 1; - // no need to work if nobody wants records seen .. + // no need to work if nobody wants record .. if (!(sr_req->maximumRecords) || 0 == *(sr_req->maximumRecords)) return true; // creating Z3950 package Package z3950_package(package.session(), package.origin()); z3950_package.copy_filter(package); - mp::odr odr_en(ODR_ENCODE); Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest); - //TODO: add stuff in apdu assert(apdu->u.presentRequest); + bool send_z3950_present = true; + + // recordXPath unsupported. + if (sr_req->recordXPath) + { + send_z3950_present = false; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 72, 0); + } + + // resultSetTTL unsupported. + // resultSetIdleTime in response + if (sr_req->resultSetTTL) + { + send_z3950_present = false; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 50, 0); + } + + // sort unsupported + if (sr_req->sort_type != Z_SRW_sort_type_none) + { + send_z3950_present = false; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 80, 0); + } + + // start record requested larger than number of records + if (sr_req->startRecord + && sru_pdu_res->u.response->numberOfRecords + && *(sr_req->startRecord) > *(sru_pdu_res->u.response->numberOfRecords)) + { + // = *(sr_req->startRecord); + send_z3950_present = false; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 61, 0); + } + + // exit on all these above diagnostics + if (!send_z3950_present) + return false; + + // now packaging the z3950 present request + // z3950'fy start record position if (sr_req->startRecord) *(apdu->u.presentRequest->resultSetStartPoint) @@ -481,49 +755,137 @@ yf::SRUtoZ3950::Rep::z3950_present_request(mp::Package &package, *(apdu->u.presentRequest->numberOfRecordsRequested) = *(sr_req->maximumRecords); - // TODO: z3950'fy record schema - //if (sr_req->recordSchema) - // *(apdu->u.presentRequest->preferredRecordSyntax) - // = *(sr_req->recordSchema); - + // z3950'fy recordPacking + int record_packing = Z_SRW_recordPacking_XML; + if (sr_req->recordPacking && 's' == *(sr_req->recordPacking)) + record_packing = Z_SRW_recordPacking_string; + + // RecordSyntax will always be XML + (apdu->u.presentRequest->preferredRecordSyntax) + = yaz_oidval_to_z3950oid (odr_en, CLASS_RECSYN, VAL_TEXT_XML); + + // z3950'fy record schema + if (sr_req->recordSchema) + { + apdu->u.presentRequest->recordComposition + = (Z_RecordComposition *) odr_malloc(odr_en, sizeof(Z_RecordComposition)); + apdu->u.presentRequest->recordComposition->which + = Z_RecordComp_simple; + apdu->u.presentRequest->recordComposition->u.simple + = build_esn_from_schema(odr_en, (const char *) sr_req->recordSchema); + } + + // z3950'fy time to live - flagged as diagnostics above + //if (sr_req->resultSetTTL) + + // attaching Z3950 package to filter chain z3950_package.request() = apdu; //std::cout << "z3950_present_request " << *apdu << "\n"; z3950_package.move(); - //TODO: check success condition + //check successful Z3950 present response Z_GDU *z3950_gdu = z3950_package.response().get(); - if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 - && z3950_gdu->u.z3950->which == Z_APDU_presentResponse) - //&& z3950_gdu->u.z3950->u.presentResponse->searchStatus) + if (!z3950_gdu || z3950_gdu->which != Z_GDU_Z3950 + || z3950_gdu->u.z3950->which != Z_APDU_presentResponse + || !z3950_gdu->u.z3950->u.presentResponse) + { - //std::cout << "z3950_present_request OK\n"; - records_returned = 0; - next_position = 0; - Z_PresentResponse *pr = z3950_gdu->u.z3950->u.presentResponse; - if (pr) - { - if (pr->numberOfRecordsReturned) - records_returned = *(pr->numberOfRecordsReturned); - if (pr->nextResultSetPosition) - next_position = *(pr->nextResultSetPosition); - } - return true; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 2, 0); + package.session().close(); + return false; } + - return false; + // everything fine, continuing + //std::cout << "z3950_present_request OK\n"; + + Z_PresentResponse *pr = z3950_gdu->u.z3950->u.presentResponse; + Z_SRW_searchRetrieveResponse *sru_res = sru_pdu_res->u.response; + + // checking non surrogate dioagnostics in Z3950 present response package + if (pr->records + && pr->records->which == Z_Records_NSD + && pr->records->u.nonSurrogateDiagnostic) + { + //int http_code = + z3950_to_srw_diag(odr_en, sru_res, pr->records->u.nonSurrogateDiagnostic); + return false; + } + + // copy all records if existing + if (pr->records && pr->records->which == Z_Records_DBOSD) + { + // srw'fy number of returned records + sru_res->num_records + = pr->records->u.databaseOrSurDiagnostics->num_records; + + sru_res->records + = (Z_SRW_record *) odr_malloc(odr_en, + sru_res->num_records *sizeof(Z_SRW_record)); + + // srw'fy nextRecordPosition + if (pr->nextResultSetPosition) + sru_res->nextRecordPosition + = odr_intdup(odr_en, *(pr->nextResultSetPosition)); + + // inserting all records + for (int i = 0; i < sru_res->num_records; i++) + { + Z_NamePlusRecord *npr + = pr->records->u.databaseOrSurDiagnostics->records[i]; + + sru_res->records[i].recordPosition + = odr_intdup(odr_en, i + *(apdu->u.presentRequest->resultSetStartPoint)); + + sru_res->records[i].recordPacking = record_packing; + + if (npr->which != Z_NamePlusRecord_databaseRecord) + { + sru_res->records[i].recordSchema = "diagnostic"; + sru_res->records[i].recordData_buf = "67"; + sru_res->records[i].recordData_len = 2; + } + else + { + Z_External *r = npr->u.databaseRecord; + oident *ent = oid_getentbyoid(r->direct_reference); + if (r->which == Z_External_octet + && ent->value == VAL_TEXT_XML) + { + sru_res->records[i].recordSchema = "dc"; + sru_res->records[i].recordData_buf + = odr_strdupn(odr_en, + (const char *)r->u.octet_aligned->buf, + r->u.octet_aligned->len); + sru_res->records[i].recordData_len + = r->u.octet_aligned->len; + } + else + { + sru_res->records[i].recordSchema = "diagnostic"; + sru_res->records[i].recordData_buf = "67"; + sru_res->records[i].recordData_len = 2; + } + } + } + } + + return true; } bool yf::SRUtoZ3950::Rep::z3950_scan_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, Z_SRW_scanRequest const *sr_req) const - //const std::string &database, - //const std::string &query, - //int query_type) const { Package z3950_package(package.session(), package.origin()); z3950_package.copy_filter(package); - mp::odr odr_en(ODR_ENCODE); + //mp::odr odr_en(ODR_ENCODE); Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_scanRequest); //TODO: add stuff in apdu @@ -707,6 +1069,37 @@ void yf::SRUtoZ3950::Rep::http_response(metaproxy_1::Package &package, } +Z_ElementSetNames * +yf::SRUtoZ3950::Rep::build_esn_from_schema(mp::odr &odr_en, + const char *schema) const +{ + if (!schema) + return 0; + + Z_ElementSetNames *esn + = (Z_ElementSetNames *) odr_malloc(odr_en, sizeof(Z_ElementSetNames)); + esn->which = Z_ElementSetNames_generic; + esn->u.generic = odr_strdup(odr_en, schema); + return esn; +} + +int +yf::SRUtoZ3950::Rep::z3950_to_srw_diag(mp::odr &odr_en, + Z_SRW_searchRetrieveResponse *sru_res, + Z_DefaultDiagFormat *ddf) const +{ + int bib1_code = *ddf->condition; + if (bib1_code == 109) + return 404; + sru_res->num_diagnostics = 1; + sru_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(odr_en, sizeof(*sru_res->diagnostics)); + yaz_mk_std_diagnostic(odr_en, sru_res->diagnostics, + yaz_diag_bib1_to_srw(*ddf->condition), + ddf->u.v2Addinfo); + return 0; +} + static mp::filter::Base* filter_creator()