X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.cpp;h=2cc2759c109d703c97a07f1a3cec1ce7d4ec4154;hb=16921033f2609ed948cf6985b4fbce3d927a20c1;hp=8bb34f972460f46d5b6ac89c8e77a222fc28cf6a;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git diff --git a/src/util.cpp b/src/util.cpp index 8bb34f9..2cc2759 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,7 +1,7 @@ -/* $Id: util.cpp,v 1.14 2006-03-16 10:40:59 adam Exp $ +/* $Id: util.cpp,v 1.18 2006-06-19 23:54:02 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" @@ -16,11 +16,49 @@ namespace mp = metaproxy_1; -void mp::util::piggyback(int smallSetUpperBound, - int largeSetLowerBound, - int mediumSetPresentNumber, - int result_set_size, - int &number_to_present) +// Doxygen doesn't like mp::util, so we use this instead +namespace mp_util = metaproxy_1::util; + +int mp_util::memcmp2(const void *buf1, int len1, + const void *buf2, int len2) +{ + int d = len1 - len2; + + // compare buffer (common length) + int c = memcmp(buf1, buf2, d > 0 ? len2 : len1); + if (c > 0) + return 1; + else if (c < 0) + return -1; + + // compare (remaining bytes) + if (d > 0) + return 1; + else if (d < 0) + return -1; + return 0; +} + + +std::string mp_util::database_name_normalize(const std::string &s) +{ + std::string r = s; + size_t i; + for (i = 0; i < r.length(); i++) + { + int ch = r[i]; + if (ch >= 'A' && ch <= 'Z') + r[i] = ch + 'a' - 'A'; + } + return r; + +} + +void mp_util::piggyback(int smallSetUpperBound, + int largeSetLowerBound, + int mediumSetPresentNumber, + int result_set_size, + int &number_to_present) { // deal with piggyback @@ -44,7 +82,8 @@ void mp::util::piggyback(int smallSetUpperBound, } -bool mp::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) { +bool mp_util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) +{ YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); Z_RPNQuery *rpn = yaz_pqf_parse(pqf_parser, odr, q.c_str()); @@ -63,7 +102,7 @@ bool mp::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) { } -std::string mp::util::zQueryToString(Z_Query *query) +std::string mp_util::zQueryToString(Z_Query *query) { std::string query_str = ""; @@ -105,8 +144,8 @@ std::string mp::util::zQueryToString(Z_Query *query) return query_str; } -void mp::util::get_default_diag(Z_DefaultDiagFormat *r, - int &error_code, std::string &addinfo) +void mp_util::get_default_diag(Z_DefaultDiagFormat *r, + int &error_code, std::string &addinfo) { error_code = *r->condition; switch (r->which) @@ -120,8 +159,8 @@ void mp::util::get_default_diag(Z_DefaultDiagFormat *r, } } -void mp::util::get_init_diagnostics(Z_InitResponse *initrs, - int &error_code, std::string &addinfo) +void mp_util::get_init_diagnostics( + Z_InitResponse *initrs, int &error_code, std::string &addinfo) { Z_External *uif = initrs->userInformationField; @@ -152,9 +191,10 @@ void mp::util::get_init_diagnostics(Z_InitResponse *initrs, } } -int mp::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation, - bool remove_flag, - std::list &vhosts) +int mp_util::get_vhost_otherinfo( + Z_OtherInformation **otherInformation, + bool remove_flag, + std::list &vhosts) { int cat; for (cat = 1; ; cat++) @@ -173,9 +213,9 @@ int mp::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation, return cat; } -void mp::util::set_vhost_otherinfo(Z_OtherInformation **otherInformation, - ODR odr, - const std::list &vhosts) +void mp_util::set_vhost_otherinfo( + Z_OtherInformation **otherInformation, ODR odr, + const std::list &vhosts) { int cat; std::list::const_iterator it = vhosts.begin(); @@ -186,8 +226,8 @@ void mp::util::set_vhost_otherinfo(Z_OtherInformation **otherInformation, } } -void mp::util::split_zurl(std::string zurl, std::string &host, - std::list &db) +void mp_util::split_zurl(std::string zurl, std::string &host, + std::list &db) { const char *zurl_cstr = zurl.c_str(); const char *sep = strchr(zurl_cstr, '/'); @@ -216,8 +256,9 @@ void mp::util::split_zurl(std::string zurl, std::string &host, } } -bool mp::util::set_databases_from_zurl(ODR odr, std::string zurl, - int *db_num, char ***db_strings) +bool mp_util::set_databases_from_zurl( + ODR odr, std::string zurl, + int *db_num, char ***db_strings) { std::string host; std::list dblist; @@ -255,8 +296,8 @@ mp::odr::operator ODR() const return m_odr; } -Z_APDU *mp::odr::create_close(Z_APDU *in_apdu, - int reason, const char *addinfo) +Z_APDU *mp::odr::create_close(const Z_APDU *in_apdu, + int reason, const char *addinfo) { Z_APDU *apdu = create_APDU(Z_APDU_close, in_apdu); @@ -266,20 +307,25 @@ Z_APDU *mp::odr::create_close(Z_APDU *in_apdu, return apdu; } -Z_APDU *mp::odr::create_APDU(int type, Z_APDU *in_apdu) +Z_APDU *mp::odr::create_APDU(int type, const Z_APDU *in_apdu) { return mp::util::create_APDU(m_odr, type, in_apdu); } -Z_APDU *mp::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu) +Z_APDU *mp_util::create_APDU(ODR odr, int type, const Z_APDU *in_apdu) { Z_APDU *out_apdu = zget_APDU(odr, type); + transfer_referenceId(odr, in_apdu, out_apdu); + return out_apdu; +} - Z_ReferenceId **id_to = mp::util::get_referenceId(out_apdu); +void mp_util::transfer_referenceId(ODR odr, const Z_APDU *src, Z_APDU *dst) +{ + Z_ReferenceId **id_to = mp::util::get_referenceId(dst); *id_to = 0; - if (in_apdu) + if (src) { - Z_ReferenceId **id_from = mp::util::get_referenceId(in_apdu); + Z_ReferenceId **id_from = mp::util::get_referenceId(src); if (id_from && *id_from && id_to) { *id_to = (Z_ReferenceId*) odr_malloc (odr, sizeof(**id_to)); @@ -290,11 +336,10 @@ Z_APDU *mp::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu) else if (id_to) *id_to = 0; } - return out_apdu; } -Z_APDU *mp::odr::create_initResponse(Z_APDU *in_apdu, - int error, const char *addinfo) +Z_APDU *mp::odr::create_initResponse(const Z_APDU *in_apdu, + int error, const char *addinfo) { Z_APDU *apdu = create_APDU(Z_APDU_initResponse, in_apdu); if (error) @@ -306,8 +351,8 @@ Z_APDU *mp::odr::create_initResponse(Z_APDU *in_apdu, return apdu; } -Z_APDU *mp::odr::create_searchResponse(Z_APDU *in_apdu, - int error, const char *addinfo) +Z_APDU *mp::odr::create_searchResponse(const Z_APDU *in_apdu, + int error, const char *addinfo) { Z_APDU *apdu = create_APDU(Z_APDU_searchResponse, in_apdu); if (error) @@ -323,8 +368,8 @@ Z_APDU *mp::odr::create_searchResponse(Z_APDU *in_apdu, return apdu; } -Z_APDU *mp::odr::create_presentResponse(Z_APDU *in_apdu, - int error, const char *addinfo) +Z_APDU *mp::odr::create_presentResponse(const Z_APDU *in_apdu, + int error, const char *addinfo) { Z_APDU *apdu = create_APDU(Z_APDU_presentResponse, in_apdu); if (error) @@ -340,8 +385,8 @@ Z_APDU *mp::odr::create_presentResponse(Z_APDU *in_apdu, return apdu; } -Z_APDU *mp::odr::create_scanResponse(Z_APDU *in_apdu, - int error, const char *addinfo) +Z_APDU *mp::odr::create_scanResponse(const Z_APDU *in_apdu, + int error, const char *addinfo) { Z_APDU *apdu = create_APDU(Z_APDU_scanResponse, in_apdu); Z_ScanResponse *res = apdu->u.scanResponse; @@ -368,7 +413,7 @@ Z_APDU *mp::odr::create_scanResponse(Z_APDU *in_apdu, } Z_GDU *mp::odr::create_HTTP_Response(mp::Session &session, - Z_HTTP_Request *hreq, int code) + Z_HTTP_Request *hreq, int code) { const char *response_version = "1.0"; bool keepalive = false; @@ -400,7 +445,7 @@ Z_GDU *mp::odr::create_HTTP_Response(mp::Session &session, return gdu; } -Z_ReferenceId **mp::util::get_referenceId(Z_APDU *apdu) +Z_ReferenceId **mp_util::get_referenceId(const Z_APDU *apdu) { switch (apdu->which) {