X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=236069a33f1486b9712dd238c11b068ca0e07549;hb=7b4a8fda694b878b0b3c3bfd67be164fa8293043;hp=13bc53b2199555286457558c1cce8df8776ec4ed;hpb=9efa56ca92283783db05f88eb52cf212eef909d9;p=yaz-moved-to-github.git diff --git a/src/seshigh.c b/src/seshigh.c index 13bc53b..236069a 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.102 2006-10-24 08:12:12 adam Exp $ */ /** * \file seshigh.c @@ -102,27 +102,36 @@ 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 */ /** get_logbits sets global loglevel bits */ -static void get_logbits() +static void get_logbits(void) { /* needs to be called after parsing cmd-line args that can set loglevels!*/ if (!logbits_set) { 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,17 +332,27 @@ 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); return; } assoc->cs_get_mask = EVENT_INPUT; - if ((res = cs_get(conn, &assoc->input_buffer, - &assoc->input_buffer_len)) <= 0) + res = cs_get(conn, &assoc->input_buffer, + &assoc->input_buffer_len); + if (res < 0 && cs_errno(conn) == CSBUFSIZE) { - yaz_log(log_session, "Connection closed by client"); + yaz_log(log_session, "Connection error: %s res=%d", + cs_errmsg(cs_errno(conn)), res); + req = request_get(&assoc->incoming); /* get a new request */ + do_close_req(assoc, Z_Close_protocolError, + "Incoming package too large", req); + return; + } + else if (res <= 0) + { + yaz_log(log_sessiondetail, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -368,7 +388,7 @@ void ir_session(IOCHAN h, int event) yaz_log(YLOG_WARN, "PDU dump:"); odr_dumpBER(yaz_log_file(), assoc->input_buffer, res); request_release(req); - do_close(assoc, Z_Close_protocolError,"Malformed package"); + do_close(assoc, Z_Close_protocolError, "Malformed package"); } else { @@ -407,7 +427,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,12 +516,9 @@ 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; - assoc->preferredMessageSize = 3000000; - if (sr->username) { Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth)); @@ -680,7 +697,8 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) static int srw_bend_fetch(association *assoc, int pos, Z_SRW_searchRetrieveRequest *srw_req, - Z_SRW_record *record) + Z_SRW_record *record, + const char **addinfo) { bend_fetch_rr rr; ODR o = assoc->encode; @@ -779,7 +797,12 @@ static int srw_bend_fetch(association *assoc, int pos, else record->recordSchema = 0; } - return rr.errcode; + if (rr.errcode) + { + *addinfo = rr.errstring; + return rr.errcode; + } + return 0; } static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, @@ -990,112 +1013,112 @@ static void srw_bend_search(association *assoc, request *req, srw_res->resultSetIdleTime = odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - if (number > 0) + + if ((rr.hits > 0 && start > rr.hits) || start < 1) + { + yaz_add_srw_diagnostic( + assoc->encode, + &srw_res->diagnostics, &srw_res->num_diagnostics, + YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + } + else if (number > 0) { int i; + int ok = 1; + if (start + number > rr.hits) + number = rr.hits - start + 1; - if (start > rr.hits) + /* Call bend_present if defined */ + if (assoc->init->bend_present) { - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + bend_present_rr *bprr = (bend_present_rr*) + odr_malloc (assoc->decode, sizeof(*bprr)); + bprr->setname = "default"; + bprr->start = start; + bprr->number = number; + bprr->format = VAL_TEXT_XML; + if (srw_req->recordSchema) + { + bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode, + sizeof(*bprr->comp)); + bprr->comp->which = Z_RecordComp_simple; + bprr->comp->u.simple = (Z_ElementSetNames *) + odr_malloc(assoc->decode, sizeof(Z_ElementSetNames)); + bprr->comp->u.simple->which = Z_ElementSetNames_generic; + bprr->comp->u.simple->u.generic = srw_req->recordSchema; + } + else + { + bprr->comp = 0; + } + bprr->stream = assoc->encode; + bprr->referenceId = 0; + bprr->print = assoc->print; + bprr->request = req; + bprr->association = assoc; + bprr->errcode = 0; + bprr->errstring = NULL; + (*assoc->init->bend_present)(assoc->backend, bprr); + + if (!bprr->request) + return; + if (bprr->errcode) + { + srw_error = yaz_diag_bib1_to_srw (bprr->errcode); + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, bprr->errstring); + ok = 0; + } } - else + + if (ok) { - int ok = 1; - if (start + number > rr.hits) - number = rr.hits - start + 1; - - /* Call bend_present if defined */ - if (assoc->init->bend_present) + int j = 0; + int packing = Z_SRW_recordPacking_string; + if (srw_req->recordPacking){ + if (!strcmp(srw_req->recordPacking, "xml")) + packing = Z_SRW_recordPacking_XML; + if (!strcmp(srw_req->recordPacking, "url")) + packing = Z_SRW_recordPacking_URL; + } + srw_res->records = (Z_SRW_record *) + odr_malloc(assoc->encode, + number * sizeof(*srw_res->records)); + + srw_res->extra_records = (Z_SRW_extra_record **) + odr_malloc(assoc->encode, + number*sizeof(*srw_res->extra_records)); + + for (i = 0; idecode, sizeof(*bprr)); - bprr->setname = "default"; - bprr->start = start; - bprr->number = number; - bprr->format = VAL_TEXT_XML; - if (srw_req->recordSchema) - { - bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode, - sizeof(*bprr->comp)); - bprr->comp->which = Z_RecordComp_simple; - bprr->comp->u.simple = (Z_ElementSetNames *) - odr_malloc(assoc->decode, sizeof(Z_ElementSetNames)); - bprr->comp->u.simple->which = Z_ElementSetNames_generic; - bprr->comp->u.simple->u.generic = srw_req->recordSchema; - } - else - { - bprr->comp = 0; - } - bprr->stream = assoc->encode; - bprr->referenceId = 0; - bprr->print = assoc->print; - bprr->request = req; - bprr->association = assoc; - bprr->errcode = 0; - bprr->errstring = NULL; - (*assoc->init->bend_present)(assoc->backend, bprr); + int errcode; + const char *addinfo = 0; - if (!bprr->request) - return; - if (bprr->errcode) + srw_res->records[j].recordPacking = packing; + srw_res->records[j].recordData_buf = 0; + srw_res->extra_records[j] = 0; + yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); + errcode = srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j, + &addinfo); + if (errcode) { - srw_error = yaz_diag_bib1_to_srw (bprr->errcode); yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, - srw_error, bprr->errstring); - ok = 0; - } - } - - if (ok) - { - int j = 0; - int packing = Z_SRW_recordPacking_string; - if (srw_req->recordPacking){ - if (!strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - if (!strcmp(srw_req->recordPacking, "url")) - packing = Z_SRW_recordPacking_URL; - } - srw_res->records = (Z_SRW_record *) - odr_malloc(assoc->encode, - number * sizeof(*srw_res->records)); - - srw_res->extra_records = (Z_SRW_extra_record **) - odr_malloc(assoc->encode, - number*sizeof(*srw_res->extra_records)); - - for (i = 0; irecords[j].recordPacking = packing; - srw_res->records[j].recordData_buf = 0; - srw_res->extra_records[j] = 0; - yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); - errcode = srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); - if (errcode) - { - yaz_add_srw_diagnostic(assoc->encode, - &srw_res->diagnostics, - &srw_res->num_diagnostics, - yaz_diag_bib1_to_srw (errcode), - rr.errstring); - - break; - } - if (srw_res->records[j].recordData_buf) - j++; + break; } - srw_res->num_records = j; - if (!j) - srw_res->records = 0; + if (srw_res->records[j].recordData_buf) + j++; } + srw_res->num_records = j; + if (!j) + srw_res->records = 0; } } } @@ -1392,7 +1415,7 @@ static void srw_bend_scan(association *assoc, request *req, querystr = srw_req->scanClause.cql; break; default: - querytype = "Unknown"; + querytype = "UNKNOWN"; querystr = ""; } @@ -1401,11 +1424,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 ? @@ -2278,13 +2303,12 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options); - assoc->maximumRecordSize = *req->maximumRecordSize; - if (cb && assoc->maximumRecordSize > cb->maxrecordsize) - assoc->maximumRecordSize = cb->maxrecordsize; - assoc->preferredMessageSize = *req->preferredMessageSize; - if (assoc->preferredMessageSize > assoc->maximumRecordSize) - assoc->preferredMessageSize = assoc->maximumRecordSize; + if (*req->maximumRecordSize < assoc->maximumRecordSize) + assoc->maximumRecordSize = *req->maximumRecordSize; + + if (*req->preferredMessageSize < assoc->preferredMessageSize) + assoc->preferredMessageSize = *req->preferredMessageSize; resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize; @@ -2297,7 +2321,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.102 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -2775,7 +2799,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 +2908,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 +3103,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 +3207,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);