* Europagate, 1995
*
* $Log: urp.c,v $
- * Revision 1.17 1995/02/28 13:16:26 adam
+ * Revision 1.18 1995/03/01 14:32:26 adam
+ * Better diagnostics. Default is, that only one database selected when
+ * several are known.
+ *
+ * Revision 1.17 1995/02/28 13:16:26 adam
* Configurable From: added.
*
* Revision 1.16 1995/02/23 10:08:20 adam
#include <ctype.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include "kernel.h"
{
const char *v;
if (info.zass)
- gw_log (GW_LOG_WARN, "urp", "Zass free...");
+ gw_log (GW_LOG_WARN, KERNEL_LOG, "Zass free...");
info.zass = zass_open (info.hostname, info.port);
if (!info.zass)
{
}
v = gw_res_get (info.kernel_res, "gw.description", NULL);
if (v)
- fprintf (reply_fd, "%s\n", v);
+ {
+ put_esc_str (v);
+ fprintf (reply_fd, "\n");
+ }
fprintf (reply_fd, "%s %s:%d\n",
gw_res_get (info.kernel_res, "gw.msg.connect",
"Connection established to"),
gw_res_get (info.kernel_res, "gw.msg.databases",
"Available databases"),
info.databases);
+ if (*info.database)
+ fprintf (reply_fd, "%s:\n%s\n",
+ gw_res_get (info.kernel_res, "gw.msg.database",
+ "Selected databases"),
+ info.database);
return 0;
}
return 0;
}
+static void display_diag_error (int code, const char *addinfo)
+{
+ static char str[20];
+
+ sprintf (str, "gw.bib1.diag.%d", code);
+ fprintf (reply_fd, "%s %d:\n %s: '%s'\n",
+ gw_res_get (info.kernel_res, "gw.msg.z39errcode",
+ "Z39.50 Error"),
+ code,
+ gw_res_get (info.kernel_res, str, ""), addinfo);
+}
+
static int exec_find (struct ccl_token *list)
{
const struct zass_searchent *p;
ccl_pr_tree (rpn, reply_fd);
fprintf (reply_fd, "\n");
- if (!*info.databases)
+ if (!*info.database )
{
fprintf (reply_fd, "%s\n",
gw_res_get (info.kernel_res, "gw.err.no.database",
"You must select database"));
return -3;
}
- gw_log (GW_LOG_DEBUG, "urp", "Searching in database %s",
- info.databases);
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Searching in database %s",
+ info.database );
assert (info.zass);
- p = zass_search (info.zass, rpn, "Default", info.databases);
+ p = zass_search (info.zass, rpn, "Default", info.database );
if (!p)
return -1;
if (p->errcode != -1)
{
- fprintf (reply_fd, "%s %d: %s\n",
- gw_res_get (info.kernel_res, "gw.msg.z39errcode",
- "Z39.50 error code"),
- p->errcode, p->errstring);
+ display_diag_error (p->errcode, p->errstring);
return -2;
}
fprintf (reply_fd, "%d %s\n", p->num,
assert (info.zass);
if (list->kind == CCL_TOK_EOL)
return -1;
- free (info.databases);
+ free (info.database);
while (li->kind != CCL_TOK_EOL)
{
len += li->len + 1;
if (li->kind == CCL_TOK_COMMA)
li = li->next;
}
- info.databases = malloc (len);
- assert (info.databases);
+ info.database = malloc (len);
+ assert (info.database );
len = 0;
li = list;
while (li->kind != CCL_TOK_EOL)
{
- memcpy (info.databases+len, li->name, li->len);
+ memcpy (info.database+len, li->name, li->len);
len += li->len;
- info.databases[len++] = ',';
+ info.database[len++] = ',';
li = li->next;
if (li->kind == CCL_TOK_COMMA)
li = li->next;
}
- info.databases[len-1] = '\0';
+ info.database[len-1] = '\0';
return 0;
}
"200"));
if (number > max_number)
number = max_number;
- gw_log (GW_LOG_DEBUG, "urp", "present in set %s", set);
- gw_log (GW_LOG_DEBUG, "urp", "present of %d records from offset %d",
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "present in set %s", set);
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "present of %d records from offset %d",
number, offset);
zp = zass_present(info.zass, (char *) set, offset, number);
if (zp)
{
int i;
zass_record *pp;
-
+ char path[128];
+ int record_log_fd = -1;
+ const char *record_log_name;
+
+ record_log_name = gw_res_get (info.kernel_res, "gw.marc.log",
+ NULL);
+ if (record_log_name)
+ {
+ sprintf (path, "%s/%s", gw_res_get (info.kernel_res,
+ "gw.path", "."),
+ record_log_name );
+ record_log_fd = open (path, O_WRONLY|O_CREAT|O_APPEND, 0666);
+ if (record_log_fd == -1)
+ gw_log (GW_LOG_WARN, "Cannot open %s", path);
+ }
fprintf (reply_fd, gw_res_get (info.kernel_res,
"gw.msg.records",
"Got %d records"),
{
if (pp->which == ZASS_REC_DIAG)
{
- fprintf (reply_fd, "Record error %d: %s\n",
- pp->errcode, pp->errstring);
+ display_diag_error (pp->errcode, pp->errstring);
continue;
}
else if (pp->which != ZASS_REC_USMARC)
continue;
}
}
+ if (record_log_fd != -1)
+ write (record_log_fd, pp->record, strlen(pp->record));
rec = iso2709_cvt (pp->record);
if (rec)
{
else
fprintf (reply_fd, "Not a MARC record\n");
}
+ if (record_log_fd != -1)
+ close (record_log_fd);
}
}
li = li->next;
}
if (set_token)
- gw_log (GW_LOG_DEBUG, "urp", "Got set=%.*s", set_token->len,
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Got set=%.*s", set_token->len,
set_token->name);
if (format_token)
- gw_log (GW_LOG_DEBUG, "urp", "Got format=%.*s", format_token->len,
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Got format=%.*s", format_token->len,
format_token->name);
li = list;
}
else
{
- fprintf (reply_fd, "\n> %s", str);
+ fprintf (reply_fd, "\n> %s\n", str);
fprintf (reply_fd, " ^ %s\n",
gw_res_get (info.kernel_res, "gw.err.unknown.command",
"unknown command. "
if (email_header (inf, from_str, subject_str))
{
- gw_log (GW_LOG_WARN, "urp", "No message body");
+ gw_log (GW_LOG_WARN, KERNEL_LOG, "No message body");
return -1;
}
if (*from_str)
reply_fd = fopen (reply_fname, "w");
if (!reply_fd)
{
- gw_log (GW_LOG_FATAL, "urp", "Cannot create %s",
+ gw_log (GW_LOG_FATAL, KERNEL_LOG, "Cannot create %s",
reply_fname);
return -1;
}
"gw.msg.subject",
"Your Query"));
fprintf (reply_fd, "\n");
- gw_log (GW_LOG_DEBUG, "urp", "Mail from %s", from_str);
+ gw_log (GW_LOG_ACCT, KERNEL_LOG, "User start %s", from_str);
}
else
- gw_log (GW_LOG_WARN, "urp", "No From in email header");
+ gw_log (GW_LOG_WARN, KERNEL_LOG, "No From in email header");
fprintf (reply_fd, "%s\n", gw_res_get (info.kernel_res, "gw.msg.greeting",
"Email->Z39.50 gateway"));
while (fgets (line_buf, LINE_MAX, inf))
break;
if ((cp = strchr (line_buf, '\n')))
*cp = '\0';
- gw_log (GW_LOG_ACCT, "urp", "cmd: %s", line_buf);
+ gw_log (GW_LOG_ACCT, KERNEL_LOG, "cmd: %s", line_buf);
ccl_token_and = gw_res_get (info.kernel_res, "ccl.token.and", "and");
ccl_token_or = gw_res_get (info.kernel_res, "ccl.token.or", "or");
ccl_token_not = gw_res_get (info.kernel_res, "ccl.token.not", "not");
mta_code = system (cmd);
if (mta_code)
- gw_log (GW_LOG_FATAL, "urp", "Reply '%s' got exit code %d",
+ gw_log (GW_LOG_FATAL, KERNEL_LOG, "Reply '%s' got exit code %d",
cmd, mta_code);
unlink (reply_fname);
- gw_log (GW_LOG_DEBUG, "urp", "Normal session for user %s", from_str);
+ gw_log (GW_LOG_ACCT, KERNEL_LOG, "User end %s", from_str);
}
return 0;
}
projects / egate.git / blobdiff