+ 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:
+ 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;
+ for (i = 0 ; i < req->num_databaseNames; i++)
+ {
+ if (i)
+ wrbuf_printf(w, "+");
+ wrbuf_puts(w, req->databaseNames[i]);
+ }
+ wrbuf_puts(w, " ");
+ if (!res->scanStatus || *res->scanStatus == 0)
+ wrbuf_puts(w, "OK");
+ else if (*res->scanStatus == 6)
+ wrbuf_puts(w, "ERROR");
+ else
+ wrbuf_printf(w, "PARTIAL" ODR_INT_PRINTF, *res->scanStatus);
+
+ wrbuf_printf(w, " " ODR_INT_PRINTF " " ODR_INT_PRINTF "+"
+ ODR_INT_PRINTF "+" ODR_INT_PRINTF " ",
+ res->numberOfEntriesReturned ?
+ *res->numberOfEntriesReturned : 0,
+ req->preferredPositionInResponse ?
+ *req->preferredPositionInResponse : 1,
+ *req->numberOfTermsRequested,
+ res->stepSize ? *res->stepSize : 1);
+
+ yaz_scan_to_wrbuf(w, req->termListAndStartPoint,
+ 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)