X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_sru_to_z3950.cpp;h=523bdee3e49f5e08b69d7045fc6f9575b5fb9243;hb=76a98c38e74bf2c4b9f3840d06dce994e268c20b;hp=ff86c668c87ced40bd37c45b9e998b860bddbdd9;hpb=73fe81c09bd2f06722a1563190234ecc68a14a1c;p=metaproxy-moved-to-github.git diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index ff86c66..523bdee 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.4 2006-09-14 11:51:08 marc Exp $ +/* $Id: filter_sru_to_z3950.cpp,v 1.11 2006-09-22 11:11:17 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details @@ -8,10 +8,13 @@ #include "filter.hpp" #include "package.hpp" #include "util.hpp" +#include "gduutil.hpp" #include "filter_sru_to_z3950.hpp" #include +#include #include +#include #include @@ -57,16 +60,55 @@ 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; public: void configure(const xmlNode *xmlnode); void process(metaproxy_1::Package &package) const; private: std::string sru_protocol(const Z_HTTP_Request &http_req) const; std::string debug_http(const Z_HTTP_Request &http_req) const; - void http_response(metaproxy_1::Package &package, + void http_response(mp::Package &package, const std::string &content, int http_code = 200) const; + bool build_sru_debug_package(mp::Package &package) 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, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SOAP *&soap, + char *charset, + char *stylesheet) const; + bool z3950_build_query(mp::odr &odr_en, Z_Query *z_query, + const SRW_query &query, + SRW_query_type query_type) const; + bool z3950_init_request(mp::Package &package, + const std::string + &database = "Default") const; + bool z3950_close_request(mp::Package &package) const; + bool z3950_search_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_searchRetrieveRequest + const *sr_req) const; + bool z3950_present_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_searchRetrieveRequest + const *sr_req) 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; + Z_ElementSetNames * build_esn_from_schema(mp::odr &odr_en, const char *schema) const; }; } } @@ -104,96 +146,704 @@ void yf::SRUtoZ3950::Rep::process(mp::Package &package) const } // only working on HTTP_Request packages now - Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request; - // SRU request package checking - - // std::cout << "Detected " << sru_protocol(*http_req) << "\n"; + // TODO: Z3950 response parsing and translation to SRU package + bool ok = true; + + mp::odr odr_de(ODR_DECODE); Z_SRW_PDU *sru_pdu_req = 0; - Z_SOAP *soap_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; - Z_SRW_diagnostic *diag = 0; - int num_diags = 0; - mp::odr odr(ODR_DECODE); + char *stylesheet = 0; + + if (! (sru_pdu_req = decode_sru_request(package, odr_de, odr_en, + sru_pdu_res, soap, + charset, stylesheet))) + { + build_sru_response(package, odr_en, soap, + sru_pdu_res, charset, stylesheet); + return; + } - if (0 == yaz_sru_decode(http_req, &sru_pdu_req, &soap_req, - odr, &charset, &diag, &num_diags)) + + // SRU request package translation to Z3950 package + if (sru_pdu_req) + std::cout << *sru_pdu_req << "\n"; + else + std::cout << "SRU empty\n"; + + + // explain + if (sru_pdu_req && sru_pdu_req->which == Z_SRW_explain_request) { - std::cout << "SRU GET/POST \n"; + //Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request; + // sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); + std::cout << "TODO: implement explain response"; + } - else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap_req, - odr, &charset)) + + + // searchRetrieve + if (sru_pdu_req && sru_pdu_req->which == Z_SRW_searchRetrieve_request) { - std::cout << "SRU SOAP \n"; - } - else + Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request; + + sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_searchRetrieve_response); + + if (z3950_init_request(package)) + { + { + 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); + } + } + } + + // scan + else if (sru_pdu_req && sru_pdu_req->which == Z_SRW_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, odr_en, sru_pdu_res, sr_req); + z3950_close_request(package); + } + } + else { - std::cout << "SRU DECODING ERROR - SHOULD NEVER HAPPEN\n"; + 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; } - if (num_diags) - { - 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; + //build_sru_debug_package(package); + build_sru_response(package, odr_en, soap, + sru_pdu_res, charset, stylesheet); + return; - // srw_res->diagnostics = diagnostic; - // srw_res->num_diagnostics = num_diagnostic; - // send_srw_response(srw_pdu_res); - // return; - // package.session().close(); - return; + + + + + +} + +bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const +{ + Z_GDU *zgdu_req = package.request().get(); + if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request) + { + Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request; + std::string content = debug_http(*http_req); + int http_code = 400; + 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"; - // searchRetrieve - if (sru_pdu_req && sru_pdu_req->which == Z_SRW_searchRetrieve_request) + + 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, + 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; + + 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_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, + odr_de, &charset, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics))) + { + if (sru_pdu_res->u.response->num_diagnostics) + { + //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, + odr_de, &charset)) + return sru_pdu_req; + else { - Z_SRW_searchRetrieveRequest *srw_req = sru_pdu_req->u.request; - - // recordXPath unsupported. - //if (srw_req->recordXPath) - // yaz_add_srw_diagnostic(odr_decode(), - // &diag, &num_diags, 72, 0); - // sort unsupported - // if (srw_req->sort_type != Z_SRW_sort_type_none) - // yaz_add_srw_diagnostic(odr_decode(), - // &diag, &num_diags, 80, 0); + //sru_pdu_res = sru_pdu_res_exp; + package.session().close(); + return 0; + } + return 0; +} + +bool +yf::SRUtoZ3950::Rep::z3950_init_request(mp::Package &package, + const std::string &database) const +{ + // prepare Z3950 package + //Session s; + //Package z3950_package(s, package.origin()); + Package z3950_package(package.session(), package.origin()); + z3950_package.copy_filter(package); + + // set initRequest APDU + mp::odr odr_en(ODR_ENCODE); + Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_initRequest); + Z_InitRequest *init_req = apdu->u.initRequest; + //TODO: add user name in apdu + //TODO: add user passwd in apdu + //init_req->idAuthentication = org_init->idAuthentication; + //init_req->implementationId = "IDxyz"; + //init_req->implementationName = "NAMExyz"; + //init_req->implementationVersion = "VERSIONxyz"; + + ODR_MASK_SET(init_req->options, Z_Options_search); + ODR_MASK_SET(init_req->options, Z_Options_present); + ODR_MASK_SET(init_req->options, Z_Options_namedResultSets); + ODR_MASK_SET(init_req->options, Z_Options_scan); + + ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_1); + ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_2); + ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_3); + + z3950_package.request() = apdu; + + // send Z3950 package + // std::cout << "z3950_init_request " << *apdu <<"\n"; + z3950_package.move(); + + // dead Z3950 backend detection + if (z3950_package.session().is_closed()){ + package.session().close(); + return false; } + + // check successful initResponse + Z_GDU *z3950_gdu = z3950_package.response().get(); + + if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 + && z3950_gdu->u.z3950->which == Z_APDU_initResponse) + return true; + + return false; +} + +bool +yf::SRUtoZ3950::Rep::z3950_close_request(mp::Package &package) const +{ + // 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(); + + // set close APDU + //mp::odr odr_en(ODR_ENCODE); + //Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_close); + //z3950_package.request() = apdu; + + z3950_package.move(); + + // check successful close 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_close) + // return true; + + if (z3950_package.session().is_closed()){ + return true; + } + return false; +} + +bool +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 +{ + 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); + + //add stuff in z3950 apdu + Z_SearchRequest *z_searchRequest = apdu->u.searchRequest; + + // 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)); else + z_searchRequest->databaseNames[0] + = odr_strdup(odr_en, "Default"); + + + // z3950'fy query + Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query)); + z_searchRequest->query = z_query; + + if (!z3950_build_query(odr_en, z_query, + (const SRW_query&)sr_req->query, + sr_req->query_type)) + { + //send_to_srw_client_error(7, "query"); + return false; + } + + z3950_package.request() = apdu; + //std::cout << "z3950_search_request " << *apdu << "\n"; + + z3950_package.move(); + + + 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) { - std::cout << "SRU OPERATION NOT SUPPORTED \n"; - // TODO: make nice diagnostic return package - // package.session().close(); - return; + + 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; } + return false; +} +bool +yf::SRUtoZ3950::Rep::z3950_present_request(mp::Package &package, + mp::odr &odr_en, + Z_SRW_PDU *sru_pdu_res, + Z_SRW_searchRetrieveRequest + const *sr_req) + const +{ - // sending Z3950 package through pipeline - package.move(); + if (!sr_req) + return false; + + // no need to work if nobody wants records seen .. + if (!(sr_req->maximumRecords) || 0 == *(sr_req->maximumRecords)) + return true; - // TODO: Z3950 response parsing and translation to SRU package - //Z_HTTP_Response* http_res = 0; + // creating Z3950 package + Package z3950_package(package.session(), package.origin()); + z3950_package.copy_filter(package); + Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest); + + 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); + } + + // exit on all these above diagnostics + if (!send_z3950_present) + return false; + + // now packaging the z3950 present request - std::string content = debug_http(*http_req); - int http_code = 200; + // z3950'fy start record position + if (sr_req->startRecord) + *(apdu->u.presentRequest->resultSetStartPoint) + = *(sr_req->startRecord); + else + *(apdu->u.presentRequest->resultSetStartPoint) = 1; - http_response(package, content, http_code); + // z3950'fy number of records requested + if (sr_req->maximumRecords) + *(apdu->u.presentRequest->numberOfRecordsRequested) + = *(sr_req->maximumRecords); + + // 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 + 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) + + { + //std::cout << "z3950_present_request OK\n"; + + Z_PresentResponse *pr = z3950_gdu->u.z3950->u.presentResponse; + if (pr) + { + Z_SRW_searchRetrieveResponse *sru_res = sru_pdu_res->u.response; + + // srw'fy nextRecordPosition + if (pr->nextResultSetPosition) + sru_res->nextRecordPosition + = odr_intdup(odr_en, *(pr->nextResultSetPosition)); + + // = (int *) odr_malloc(odr_en, sizeof(int *)); + //*(sru_res->nextRecordPosition) + //= *(Pr->nextResultSetPosition); + + // 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)); + + 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; + } + + return false; +} + +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 +{ + 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_scanRequest); + + //TODO: add stuff in apdu + Z_ScanRequest *z_scanRequest = apdu->u.scanRequest; + + // database repackaging + z_scanRequest->num_databaseNames = 1; + z_scanRequest->databaseNames = (char**) + odr_malloc(odr_en, sizeof(char *)); + if (sr_req->database) + z_scanRequest->databaseNames[0] + = odr_strdup(odr_en, const_cast(sr_req->database)); + else + z_scanRequest->databaseNames[0] + = odr_strdup(odr_en, "Default"); + + + // query repackaging + // CQL or XCQL scan is not possible in Z3950, flagging a diagnostic + if (sr_req->query_type != Z_SRW_query_type_pqf) + { + //send_to_srw_client_error(7, "query"); + return false; + } - //package.response() = zgdu_res; + // PQF query repackaging + // need to use Z_AttributesPlusTerm structure, not Z_Query + // this can be digget out of a + // Z_query->type1(Z_RPNQuery)->RPNStructure(Z_RPNStructure) + // ->u.simple(Z_Operand)->u.attributesPlusTerm(Z_AttributesPlusTerm ) + + //Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query)); + //z_searchRequest->query = z_query; + + //if (!z3950_build_query(odr_en, z_query, + // (const SRW_query&)sr_req->query, + // sr_req->query_type)) + //{ + //send_to_srw_client_error(7, "query"); + // return false; + //} + + // TODO: + + z3950_package.request() = apdu; + std::cout << "z3950_scan_request " << *apdu << "\n"; + + z3950_package.move(); + //TODO: check success condition + return true; + return false; +} + +bool yf::SRUtoZ3950::Rep::z3950_build_query(mp::odr &odr_en, Z_Query *z_query, + const SRW_query &query, + SRW_query_type query_type) const +{ + if (query_type == Z_SRW_query_type_cql) + { + Z_External *ext = (Z_External *) + odr_malloc(odr_en, sizeof(*ext)); + ext->direct_reference = + odr_getoidbystr(odr_en, "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = const_cast(query.cql); + + z_query->which = Z_Query_type_104; + z_query->u.type_104 = ext; + return true; + } + + if (query_type == Z_SRW_query_type_pqf) + { + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create (); + + RPNquery = yaz_pqf_parse (pqf_parser, odr_en, query.pqf); + if (!RPNquery) + { + std::cout << "TODO: Handeling of bad PQF\n"; + std::cout << "TODO: Diagnostic to be send\n"; + } + z_query->which = Z_Query_type_1; + z_query->u.type_1 = RPNquery; + + yaz_pqf_destroy(pqf_parser); + return true; + } + return false; } + std::string yf::SRUtoZ3950::Rep::sru_protocol(const Z_HTTP_Request &http_req) const { @@ -281,7 +931,17 @@ 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; +} static mp::filter::Base* filter_creator() {