From 4a72187a377987ccbe95cb7c549adb0678bc7159 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 18 Feb 2003 11:59:14 +0000 Subject: [PATCH] Change a few yaz_log messages --- client/Makefile.am | 4 ++-- server/eventl.c | 8 ++++---- server/seshigh.c | 6 +++--- zutil/zgdu.c | 4 ++-- zutil/zoom-c.c | 7 +++---- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index d8ea521..6526147 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1995-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.17 2003-02-18 10:37:08 adam Exp $ +## $Id: Makefile.am,v 1.18 2003-02-18 11:59:14 adam Exp $ if ISSSL extra=yaz-client-ssl @@ -14,6 +14,6 @@ yaz_client_SOURCES=client.c admin.c admin.h tabcomplete.c tabcomplete.h yaz_client_ssl_SOURCES=$(yaz_client_SOURCES) yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS) -yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) +yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS) AM_CPPFLAGS=-I$(top_srcdir)/include diff --git a/server/eventl.c b/server/eventl.c index cc150e7..2d528f2 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: eventl.c,v 1.36 2003-02-17 21:23:31 adam Exp $ + * $Id: eventl.c,v 1.37 2003-02-18 11:59:14 adam Exp $ */ #include @@ -74,7 +74,7 @@ int event_loop(IOCHAN *iochans) for (p = *iochans; p; p = p->next) { time_t w, ftime; - yaz_log(LOG_LOG, "fd=%d flags=%d force_event=%d", + yaz_log(LOG_DEBUG, "fd=%d flags=%d force_event=%d", p->fd, p->flags, p->force_event); if (p->force_event) to.tv_sec = 0; /* polling select */ @@ -97,9 +97,9 @@ int event_loop(IOCHAN *iochans) to.tv_sec = w; } } - yaz_log(LOG_LOG, "select start %d", to.tv_sec); + yaz_log(LOG_DEBUG, "select start %d", to.tv_sec); res = YAZ_EV_SELECT(max + 1, &in, &out, &except, &to); - yaz_log(LOG_LOG, "select end"); + yaz_log(LOG_DEBUG, "select end"); if (res < 0) { if (yaz_errno() == EINTR) diff --git a/server/seshigh.c b/server/seshigh.c index 58af6b1..b97a9c1 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.139 2003-02-17 22:35:48 adam Exp $ + * $Id: seshigh.c,v 1.140 2003-02-18 11:59:14 adam Exp $ */ /* @@ -516,6 +516,8 @@ static void srw_bend_search(association *assoc, request *req, char *base = "Default"; bend_search_rr rr; Z_External *ext; + + yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest"); if (!assoc->init) srw_bend_init(assoc); @@ -592,7 +594,6 @@ static void srw_bend_search(association *assoc, request *req, srw_res->num_records = j; if (!j) srw_res->records = 0; - yaz_log(LOG_LOG, "got %d records", j); } } } @@ -654,7 +655,6 @@ static void process_http_request(association *assoc, request *req) ctype = "text/html"; } z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); - yaz_log(LOG_LOG, "OK send page %s size=%ld", fpath, sz); } fclose(f); } diff --git a/zutil/zgdu.c b/zutil/zgdu.c index 49060b7..705521d 100644 --- a/zutil/zgdu.c +++ b/zutil/zgdu.c @@ -2,12 +2,12 @@ * Copyright (c) 2002-2003, Index Data. * See the file LICENSE for details. * - * $Id: zgdu.c,v 1.5 2003-02-17 22:34:40 adam Exp $ + * $Id: zgdu.c,v 1.6 2003-02-18 11:59:15 adam Exp $ */ #include -#define HTTP_DEBUG 1 +#define HTTP_DEBUG 0 static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, char **content_buf, int *content_len) diff --git a/zutil/zoom-c.c b/zutil/zoom-c.c index 8281575..3716c77 100644 --- a/zutil/zoom-c.c +++ b/zutil/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Index Data * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.23 2003-02-18 09:12:14 adam Exp $ + * $Id: zoom-c.c,v 1.24 2003-02-18 11:59:15 adam Exp $ * * ZOOM layer for C, connections, result sets, queries. */ @@ -100,7 +100,7 @@ static void set_dset_error (ZOOM_connection c, int error, else if (addinfo) c->addinfo = xstrdup(addinfo); if (error) - yaz_log(LOG_LOG, "Error %s %s:%d %s %s", + yaz_log(LOG_DEBUG, "Error %s %s:%d %s %s", c->host_port ? c->host_port : "<>", dset, error, addinfo ? addinfo : "", addinfo2 ? addinfo2 : ""); @@ -2411,7 +2411,7 @@ static void handle_srw_response(ZOOM_connection c, resultset->size = 0; - yaz_log(LOG_LOG, "got SRW response OK"); + yaz_log(LOG_DEBUG, "got SRW response OK"); if (res->numberOfRecords) resultset->size = *res->numberOfRecords; @@ -2445,7 +2445,6 @@ static void handle_srw_response(ZOOM_connection c, npr->u.databaseRecord->u.octet_aligned->size = res->records[i].recordData_len; record_cache_add (resultset, npr, pos); - yaz_log(LOG_LOG, "add SRW record to cache to pos %d", pos); } if (res->num_diagnostics > 0) { -- 1.7.10.4