#include <metaproxy/util.hpp>
#include <metaproxy/xmlutil.hpp>
+#include <yaz/oid_db.h>
#include <yaz/zgdu.h>
#include <yaz/wrbuf.h>
#include <yaz/log.h>
static void log_DefaultDiagFormat(WRBUF w, Z_DefaultDiagFormat *e)
{
if (e->condition)
- wrbuf_printf(w, ODR_INT_PRINTF " ",*e->condition);
+ wrbuf_printf(w, ODR_INT_PRINTF " ", *e->condition);
else
wrbuf_puts(w, "?? ");
if (e->which == Z_DefaultDiagFormat_v2Addinfo && e->u.v2Addinfo)
+ {
+ wrbuf_puts(w, "\"");
wrbuf_puts(w, e->u.v2Addinfo);
+ wrbuf_puts(w, "\"");
+ }
else if (e->which == Z_DefaultDiagFormat_v3Addinfo && e->u.v3Addinfo)
+ {
+ wrbuf_puts(w, "\"");
wrbuf_puts(w, e->u.v3Addinfo);
+ wrbuf_puts(w, "\"");
+ }
+ else
+ wrbuf_puts(w, "-");
}
static void log_DiagRecs(WRBUF w, int num_diagRecs, Z_DiagRec **diags)
}
}
-static void log_1_line(Z_APDU *z_req, Z_APDU *z_res, WRBUF w)
+static void log_syntax(WRBUF w, const Odr_oid *syntax)
+{
+ if (syntax)
+ {
+ char oid_name[OID_STR_MAX+1];
+ wrbuf_puts(w, yaz_oid_to_string_buf(syntax, 0, oid_name));
+ }
+ else
+ wrbuf_puts(w, "-");
+}
+
+static void log_1line_Z_APDU(Z_APDU *z_req, Z_APDU *z_res, WRBUF w)
{
switch (z_req->which)
{
case Z_APDU_initRequest:
- if (z_res->which == Z_APDU_initResponse)
+ wrbuf_puts(w, "Init ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_initResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
{
Z_InitRequest *req = z_req->u.initRequest;
Z_InitResponse *res = z_res->u.initResponse;
- wrbuf_printf(w, "Init ");
if (res->result && *res->result)
wrbuf_printf(w, "OK -");
else
}
break;
case Z_APDU_searchRequest:
- if (z_res->which == Z_APDU_searchResponse)
+ wrbuf_puts(w, "Search ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_searchResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
{
Z_SearchRequest *req = z_req->u.searchRequest;
Z_SearchResponse *res = z_res->u.searchResponse;
int i;
- wrbuf_puts(w, "Search ");
for (i = 0 ; i < req->num_databaseNames; i++)
{
if (i)
res->records->u.multipleNonSurDiagnostics->num_diagRecs,
res->records->u.multipleNonSurDiagnostics->diagRecs);
}
+ wrbuf_puts(w, " ");
+ log_syntax(w, req->preferredRecordSyntax);
wrbuf_printf(w, " 1+" ODR_INT_PRINTF " ",
res->numberOfRecordsReturned
? *res->numberOfRecordsReturned : 0);
}
break;
case Z_APDU_presentRequest:
- if (z_res->which == Z_APDU_presentResponse)
+ wrbuf_puts(w, "Present ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_presentResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
{
Z_PresentRequest *req = z_req->u.presentRequest;
Z_PresentResponse *res = z_res->u.presentResponse;
- wrbuf_printf(w, "Present ");
-
if (!res->records)
{
wrbuf_printf(w, "OK");
res->records->u.multipleNonSurDiagnostics->num_diagRecs,
res->records->u.multipleNonSurDiagnostics->diagRecs);
}
+ wrbuf_puts(w, " ");
+ assert(req->preferredRecordSyntax);
+ log_syntax(w, req->preferredRecordSyntax);
+
wrbuf_printf(w, " %s " ODR_INT_PRINTF "+" ODR_INT_PRINTF " ",
req->resultSetId, *req->resultSetStartPoint,
*req->numberOfRecordsRequested);
}
break;
+ case Z_APDU_deleteResultSetRequest:
+ wrbuf_puts(w, "deleteResultSet ");
+ break;
+ case Z_APDU_accessControlRequest:
+ wrbuf_puts(w, "accessControl ");
+ break;
+ case Z_APDU_resourceControlRequest:
+ wrbuf_puts(w, "resourceControl ");
+ break;
+ case Z_APDU_triggerResourceControlRequest:
+ wrbuf_puts(w, "triggerResourceControlRequest");
+ break;
+ case Z_APDU_resourceReportRequest:
+ wrbuf_puts(w, "resourceReport ");
+ break;
case Z_APDU_scanRequest:
- if (z_res->which == Z_APDU_scanResponse)
+ wrbuf_puts(w, "Scan ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_scanResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
{
Z_ScanRequest *req = z_req->u.scanRequest;
Z_ScanResponse *res = z_res->u.scanResponse;
int i;
- wrbuf_printf(w, "Scan ");
for (i = 0 ; i < req->num_databaseNames; i++)
{
if (i)
if (!res->scanStatus || *res->scanStatus == 0)
wrbuf_puts(w, "OK");
else if (*res->scanStatus == 6)
- wrbuf_puts(w, "FAIL");
+ wrbuf_puts(w, "ERROR");
else
wrbuf_printf(w, "PARTIAL" ODR_INT_PRINTF, *res->scanStatus);
req->attributeSet);
}
break;
+ case Z_APDU_sortRequest:
+ wrbuf_puts(w, "sort ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_sortResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
+ {
+ Z_SortResponse *res = z_res->u.sortResponse;
+ Z_SortRequest *req = z_res->u.sortRequest;
+ int i;
+
+ if (*res->sortStatus == Z_SortResponse_success)
+ wrbuf_puts(w, "OK");
+ else if (*res->sortStatus == Z_SortResponse_partial_1)
+ wrbuf_puts(w, "PARTIAL");
+ else if (*res->sortStatus == Z_SortResponse_failure)
+ wrbuf_puts(w, "ERROR");
+
+ wrbuf_puts(w, " ");
+ if (res->diagnostics && res->num_diagnostics >= 1)
+ log_DiagRecs(w, res->num_diagnostics,res->diagnostics);
+ else
+ wrbuf_puts(w, "-");
+
+ wrbuf_puts(w, " (");
+ for (i = 0; i < req->num_inputResultSetNames; i++)
+ {
+ if (i)
+ wrbuf_puts(w, "+");
+ wrbuf_puts(w, req->inputResultSetNames[i]);
+ }
+ wrbuf_printf(w, ")->%s ",req->sortedResultSetName);
+
+ }
+ break;
+ case Z_APDU_segmentRequest:
+ wrbuf_puts(w, "segmentRequest");
+ break;
+ case Z_APDU_extendedServicesRequest:
+ wrbuf_puts(w, "extendedServices ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_extendedServicesResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
+ {
+ Z_ExtendedServicesResponse *res =
+ z_res->u.extendedServicesResponse;
+ switch (*res->operationStatus)
+ {
+ case Z_ExtendedServicesResponse_done:
+ wrbuf_puts(w, "DONE"); break;
+ case Z_ExtendedServicesResponse_accepted:
+ wrbuf_puts(w, "ACCEPTED"); break;
+ case Z_ExtendedServicesResponse_failure:
+ wrbuf_puts(w, "ERROR"); break;
+ default:
+ wrbuf_printf(w, ODR_INT_PRINTF, *res->operationStatus);
+ }
+ wrbuf_puts(w, " ");
+ if (res->diagnostics && res->num_diagnostics >= 1)
+ log_DiagRecs(w, res->num_diagnostics,res->diagnostics);
+ else
+ wrbuf_puts(w, "-");
+ }
+ break;
+ case Z_APDU_close:
+ wrbuf_puts(w, "close");
+ break;
+ case Z_APDU_duplicateDetectionRequest:
+ wrbuf_puts(w, "duplicateDetention ");
+ if (!z_res)
+ wrbuf_puts(w, "?");
+ else if (z_res->which != Z_APDU_duplicateDetectionResponse)
+ wrbuf_printf(w, "? response=%d", z_res->which);
+ else
+ {
+ Z_DuplicateDetectionResponse *res =
+ z_res->u.duplicateDetectionResponse;
+ if (*res->status)
+ wrbuf_puts(w, "OK");
+ else
+ wrbuf_puts(w, "ERROR");
+
+ wrbuf_puts(w, " ");
+ if (res->diagnostics && res->num_diagnostics >= 1)
+ log_DiagRecs(w, res->num_diagnostics, res->diagnostics);
+ else
+ wrbuf_puts(w, "-");
+ }
+ break;
default:
wrbuf_printf(w, "REQ=%d RES=%d", z_req->which, z_res->which);
}
}
+
+static void log_1line_Z_HTTP(Z_HTTP_Request *req, Z_HTTP_Response *res, WRBUF w)
+{
+ wrbuf_printf(w, "%s %s HTTP/%s", req->method, req->path, req->version);
+ if (res)
+ wrbuf_printf(w, " %d %d", res->code, res->content_len);
+ else
+ wrbuf_printf(w, " ?");
+}
+
+static void log_1line_Z_GDU(Z_GDU *gdu_req, Z_GDU *gdu_res, WRBUF w)
+{
+ if (gdu_req && gdu_req->which == Z_GDU_Z3950)
+ {
+ log_1line_Z_APDU(gdu_req->u.z3950,
+ (gdu_res && gdu_res->which == Z_GDU_Z3950) ?
+ gdu_res->u.z3950 : 0, w);
+ }
+ else if (gdu_req && gdu_req->which == Z_GDU_HTTP_Request)
+ {
+ log_1line_Z_HTTP(gdu_req->u.HTTP_Request,
+ (gdu_res && gdu_res->which == Z_GDU_HTTP_Response) ?
+ gdu_res->u.HTTP_Response : 0, w);
+ }
+}
+
void yf::Log::Impl::configure(const xmlNode *ptr)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
if (m_1line)
{
- if (gdu_req && gdu_res && gdu_req->which == Z_GDU_Z3950
- && gdu_res->which == Z_GDU_Z3950)
+ mp::wrbuf w;
+
+ log_1line_Z_GDU(gdu_req, gdu_res, w);
+ if (w.len() > 0)
{
- mp::wrbuf w;
-
- log_1_line(gdu_req->u.z3950, gdu_res->u.z3950, w);
const char *message = wrbuf_cstr(w);
-
std::ostringstream os;
os << m_msg_config << " "
<< package << " "
projects / metaproxy-moved-to-github.git / blobdiff