X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=e2b2afaffd5a0a3d603af9dfb0345954959f78c7;hb=d1ff65fe4a7472a58a182d922c4a9729f0e17f9f;hp=13bc53b2199555286457558c1cce8df8776ec4ed;hpb=9efa56ca92283783db05f88eb52cf212eef909d9;p=yaz-moved-to-github.git diff --git a/src/seshigh.c b/src/seshigh.c index 13bc53b..e2b2afa 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.90 2006-07-06 14:54:29 marc Exp $ + * $Id: seshigh.c,v 1.94 2006-07-07 13:02:21 marc Exp $ */ /** * \file seshigh.c @@ -102,7 +102,8 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd); /* dynamic logging levels */ static int logbits_set = 0; -static int log_session = 0; +static int log_session = 0; /* one-line logs for session */ +static int log_sessiondetail = 0; /* more detailed stuff */ static int log_request = 0; /* one-line logs for requests */ static int log_requestdetail = 0; /* more detailed stuff */ @@ -113,16 +114,24 @@ static void get_logbits() { logbits_set = 1; log_session = yaz_log_module_level("session"); - log_request = yaz_log_module_level("request"); + log_sessiondetail = yaz_log_module_level("sessiondetail"); + log_request = yaz_log_module_level("request"); log_requestdetail = yaz_log_module_level("requestdetail"); } } + + static void wr_diag(WRBUF w, int error, const char *addinfo) { - wrbuf_printf(w, "ERROR [%d] %s%s%s", - error, diagbib1_str(error), - addinfo ? "--" : "", addinfo ? addinfo : ""); + wrbuf_printf(w, "ERROR %d+", error); + wrbuf_puts_replace_char(w, diagbib1_str(error), ' ', '_'); + if (addinfo){ + wrbuf_puts(w, "+"); + wrbuf_puts_replace_char(w, addinfo, ' ', '_'); + } + + wrbuf_puts(w, " "); } @@ -284,7 +293,8 @@ void ir_session(IOCHAN h, int event) } else { - yaz_log(log_session, "Session idle too long. Sending close."); + yaz_log(log_sessiondetail, + "Session idle too long. Sending close."); do_close(assoc, Z_Close_lackOfActivity, 0); } return; @@ -322,7 +332,7 @@ void ir_session(IOCHAN h, int event) /* We aren't speaking to this fellow */ if (assoc->state == ASSOC_DEAD) { - yaz_log(log_session, "Connection closed - end of session"); + yaz_log(log_sessiondetail, "Connection closed - end of session"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -332,7 +342,7 @@ void ir_session(IOCHAN h, int event) if ((res = cs_get(conn, &assoc->input_buffer, &assoc->input_buffer_len)) <= 0) { - yaz_log(log_session, "Connection closed by client"); + yaz_log(log_sessiondetail, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -407,7 +417,7 @@ void ir_session(IOCHAN h, int event) switch (res = cs_put(conn, req->response, req->len_response)) { case -1: - yaz_log(log_session, "Connection closed by client"); + yaz_log(log_sessiondetail, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -496,7 +506,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S Z_External *ce; bend_initresult *binitres; - yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname); + yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname); assoc_init_reset(assoc); assoc->maximumRecordSize = 3000000; @@ -1392,7 +1402,7 @@ static void srw_bend_scan(association *assoc, request *req, querystr = srw_req->scanClause.cql; break; default: - querytype = "Unknown"; + querytype = "UNKNOWN"; querystr = ""; } @@ -1401,11 +1411,13 @@ static void srw_bend_scan(association *assoc, request *req, wrbuf_printf(wr, " "); if (srw_res->num_diagnostics) - wrbuf_printf(wr, "ERROR %s ", srw_res->diagnostics[0].uri); + wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri); + else if (srw_res->num_terms) + wrbuf_printf(wr, "OK %d - ", srw_res->num_terms); else - wrbuf_printf(wr, "OK - "); + wrbuf_printf(wr, "OK - - "); - wrbuf_printf(wr, "%d+%d 1 ", + wrbuf_printf(wr, "%d+%d+0 ", (srw_req->responsePosition ? *srw_req->responsePosition : 1), (srw_req->maximumTerms ? @@ -2297,7 +2309,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); - version = odr_strdup(assoc->encode, "$Revision: 1.90 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.94 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -2775,7 +2787,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, for (i = 0 ; i < req->num_databaseNames; i++){ if (i) - wrbuf_printf(wr, ","); + wrbuf_printf(wr, "+"); wrbuf_printf(wr, req->databaseNames[i]); } wrbuf_printf(wr, " "); @@ -2884,11 +2896,11 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, wrbuf_printf(wr, "Present "); if (*resp->presentStatus == Z_PresentStatus_failure) - wrbuf_printf(wr, "ERROR %d", errcode); + wrbuf_printf(wr, "ERROR %d ", errcode); else if (*resp->presentStatus == Z_PresentStatus_success) - wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, "OK - "); else - wrbuf_printf(wr, "Partial %d", *resp->presentStatus); + wrbuf_printf(wr, "Partial %d - ", *resp->presentStatus); wrbuf_printf(wr, " %s %d+%d ", req->resultSetId, *req->resultSetStartPoint, @@ -3079,32 +3091,39 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { int i; WRBUF wr = wrbuf_alloc(); - + wrbuf_printf(wr, "Scan "); for (i = 0 ; i < req->num_databaseNames; i++){ if (i) - wrbuf_printf(wr, ","); + wrbuf_printf(wr, "+"); wrbuf_printf(wr, req->databaseNames[i]); } wrbuf_printf(wr, " "); - if (bsrr->errcode) + if (bsrr->errcode){ wr_diag(wr, bsrr->errcode, bsrr->errstring); - else if (*res->scanStatus == Z_Scan_success) - wrbuf_printf(wr, "OK - "); + wrbuf_printf(wr, " "); + } + else + wrbuf_printf(wr, "OK "); + /* else if (*res->scanStatus == Z_Scan_success) */ + /* wrbuf_printf(wr, "OK "); */ + /* else */ + /* wrbuf_printf(wr, "Partial "); */ + + if (*res->numberOfEntriesReturned) + wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned); else - wrbuf_printf(wr, "Partial - "); + wrbuf_printf(wr, "0 - "); - wrbuf_printf(wr, "%d+%d %d ", + wrbuf_printf(wr, "%d+%d+%d ", (req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1), *req->numberOfTermsRequested, (res->stepSize ? *res->stepSize : 1)); - /* TODO - make this print out RPN: or CQL: in the beginning!! */ - /* maybe wrbuf_printf(wr, "%s: %s ", querytype, querystr); - see line 1415 */ + yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, bsrr->attributeset); - yaz_log(log_request, "Scan %s", wrbuf_buf(wr) ); + yaz_log(log_request, "%s", wrbuf_buf(wr) ); wrbuf_free(wr, 1); } return apdu; @@ -3176,7 +3195,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, for (i = 0; inum_inputResultSetNames; i++) { if (i) - wrbuf_printf(wr, ","); + wrbuf_printf(wr, "+"); wrbuf_printf(wr, req->inputResultSetNames[i]); } wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);