X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=kernel%2Furp.c;h=90b5cd1636c743f829bd5cbb65caa39090f28ec0;hb=aa975e8f85af258357639e3407ce40090f4a4998;hp=b608e1dafcdf89982151686103c55c09aa932019;hpb=272f54128f5b48a61b2aa6dbb7859eca1c1296ae;p=egate.git diff --git a/kernel/urp.c b/kernel/urp.c index b608e1d..90b5cd1 100644 --- a/kernel/urp.c +++ b/kernel/urp.c @@ -1,8 +1,66 @@ +/* + * Copyright (c) 1995, the EUROPAGATE consortium (see below). + * + * The EUROPAGATE consortium members are: + * + * University College Dublin + * Danmarks Teknologiske Videnscenter + * An Chomhairle Leabharlanna + * Consejo Superior de Investigaciones Cientificas + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation, in whole or in part, for any purpose, is hereby granted, + * provided that: + * + * 1. This copyright and permission notice appear in all copies of the + * software and its documentation. Notices of copyright or attribution + * which appear at the beginning of any file must remain unchanged. + * + * 2. The names of EUROPAGATE or the project partners may not be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * 3. Users of this software (implementors and gateway operators) agree to + * inform the EUROPAGATE consortium of their use of the software. This + * information will be used to evaluate the EUROPAGATE project and the + * software, and to plan further developments. The consortium may use + * the information in later publications. + * + * 4. Users of this software agree to make their best efforts, when + * documenting their use of the software, to acknowledge the EUROPAGATE + * consortium, and the role played by the software in their work. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE + * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF + * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND + * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE + * USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ /* Gateway kernel - User Request Processor * Europagate, 1995 * * $Log: urp.c,v $ - * Revision 1.33 1995/05/03 16:34:19 adam + * Revision 1.38 1995/05/19 13:26:00 adam + * Bug fixes. Better command line options. + * + * Revision 1.37 1995/05/18 12:03:09 adam + * Bug fixes and minor improvements. + * + * Revision 1.36 1995/05/17 10:51:33 adam + * Added a few more error checks to the show command. + * + * Revision 1.35 1995/05/16 09:40:43 adam + * LICENSE. Setting of CCL token names (and/or/not/set) in read_kernel_res. + * + * Revision 1.34 1995/05/04 10:40:08 adam + * More work on Def-settings. + * + * Revision 1.33 1995/05/03 16:34:19 adam * CCL def command, i.e. user definitions - saved as resource files. * * Revision 1.32 1995/05/03 07:37:46 adam @@ -136,6 +194,9 @@ #include #include "kernel.h" +static void present (const char *set, int offset, int number, + struct ccl_token *format_token); + static char line_buf[LINE_MAX+1]; static void put_esc_str (const char *s) @@ -173,12 +234,12 @@ int reopen_target (void) "Connection established to"), info.hostname, info.port); if (*info.databases) - fprintf (reply_fd, "%s:\n%s\n", + fprintf (reply_fd, "%s: %s\n", gw_res_get (info.kernel_res, "gw.msg.databases", "Available databases"), info.databases); if (*info.database) - fprintf (reply_fd, "%s:\n%s\n", + fprintf (reply_fd, "%s: %s\n", gw_res_get (info.kernel_res, "gw.msg.database", "Selected databases"), info.database); @@ -330,6 +391,7 @@ static int exec_find (struct ccl_token *list, const char *search_str) const struct zass_searchent *p; struct gw_user_set *us; char setname[32]; + int autoshow; struct ccl_rpn_node *rpn; int error; @@ -374,11 +436,12 @@ static int exec_find (struct ccl_token *list, const char *search_str) gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Searching in database %s", info.database ); assert (info.zass); - fprintf (reply_fd, "Searching in database %s\n", info.database); p = zass_p_search (info.zass, rpn, setname, info.database, info.sets); if (!p) { - fprintf (reply_fd, "Search fail\n"); + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, "gw.err.search.fail", + "Search fail. Connection closed")); return -1; } if (p->errcode != -1) @@ -386,10 +449,24 @@ static int exec_find (struct ccl_token *list, const char *search_str) display_diag_error (p->errcode, p->errstring); return -2; } - fprintf (reply_fd, "%d %s\n", p->num, - gw_res_get (info.kernel_res, "gw.msg.hits", "hit(s)")); + fprintf (reply_fd, "%d %s %s\n", p->num, + gw_res_get (info.kernel_res, "gw.msg.hits", "hit(s) in set "), + setname); us = user_set_add (setname, p->num, info.database, rpn, 1, search_str); - fprintf (reply_fd, "Result-set %s created\n", setname); + autoshow = gw_res_int (info.kernel_res, "gw.auto.show", 0); + if (autoshow && p->num > 0) + { + if (autoshow > p->num) + { + present (setname, 1, p->num, NULL); + info.next_position = 1+p->num; + } + else + { + present (setname, 1, autoshow, NULL); + info.next_position = 1+autoshow; + } + } return 0; } @@ -430,7 +507,10 @@ static void exec_status_r (struct gw_user_set *sp) static int exec_status (struct ccl_token *list) { - fprintf (reply_fd, " Name Hits Database Find\n"); + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, + "gw.msg.statusline", + " Name Hits Database Find")); exec_status_r (info.sets); return 0; } @@ -535,6 +615,9 @@ static void present (const char *set, int offset, int number, if (rec) { #if USE_FML + strcpy (format_str, + gw_res_get (info.kernel_res, + "gw.display.format", "")); if (format_token) { len = format_token->len; @@ -543,7 +626,7 @@ static void present (const char *set, int offset, int number, memcpy (format_str, format_token->name, len); format_str[len] = '\0'; } - if (info.fml && format_token && + if (info.fml && *format_str && (!strcmp (format_str, "0") || !strcmp (format_str, "1") || !strcmp(format_str, "2"))) { @@ -621,7 +704,19 @@ static int exec_show (struct ccl_token *list) li = li->next; } else + { + int len = li->len; + memcpy (tmp_str, li->name, len); + tmp_str[len] = '\0'; + if (atoi(tmp_str) <= 0) + { + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, "gw.err.bad.show", + "Integer expected")); + return -3; + } li = li->next; + } } if (set_token) gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Got set=%.*s", set_token->len, @@ -657,6 +752,15 @@ static int exec_show (struct ccl_token *list) memcpy (tmp_str, li->name, len); tmp_str [len] = '\0'; number = atoi (tmp_str) - offset + 1; + if (number <= 0) + { + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, + "gw.err.pos.show", + "Starting position " + "greater than ending position")); + return -3; + } } else { @@ -669,7 +773,7 @@ static int exec_show (struct ccl_token *list) } li = li->next; } - else + else if (li->kind == CCL_TOK_TERM) { len = li->len; memcpy (tmp_str, li->name, len); @@ -743,6 +847,18 @@ static int exec_show (struct ccl_token *list) return 0; } +static void show_def (void) +{ + fprintf (reply_fd, "format %s\n", gw_res_get + (info.kernel_res, "gw.display.format", "")); + fprintf (reply_fd, "autoshow %s\n", gw_res_get + (info.kernel_res, "gw.auto.show", "")); + fprintf (reply_fd, "defaultshow %s\n", gw_res_get + (info.kernel_res, "gw.default.show", "")); + fprintf (reply_fd, "language %s\n", gw_res_get + (info.kernel_res, "gw.language", "")); +} + static int exec_def (struct ccl_token *list) { const char *name = NULL; @@ -750,11 +866,12 @@ static int exec_def (struct ccl_token *list) char fname[256]; static struct command_word def_tab [] = { - { "reset", "reset" }, - { "f", "format"}, - { "maxshow", "maxshow" }, + { "reset", "reset" }, + { "show", "show" }, + { "f", "format"}, + { "autoshow", "autoshow" }, { "defaultshow", "defaultshow" }, - { "lang", "language" }, + { "lang", "language" }, { NULL, NULL } }; @@ -765,16 +882,7 @@ static int exec_def (struct ccl_token *list) info.userid); if (list->kind == CCL_TOK_EOL) - { - fprintf (reply_fd, "format %s\n", gw_res_get - (info.kernel_res, "gw.display.format", "")); - fprintf (reply_fd, "maxshow %s\n", gw_res_get - (info.kernel_res, "gw.max.show", "")); - fprintf (reply_fd, "default-show %s\n", gw_res_get - (info.kernel_res, "gw.default.show", "")); - fprintf (reply_fd, "language %s\n", gw_res_get - (info.kernel_res, "gw.language", "")); - } + show_def (); else { int setting_no = command_search (def_tab, list, "ccl.token."); @@ -790,26 +898,28 @@ static int exec_def (struct ccl_token *list) read_kernel_res (); return 0; } - list = list->next; - if (list->kind == CCL_TOK_EOL) + else if (setting_no == 2) { - fprintf (reply_fd, "Missing value\n"); - return -1; + show_def (); + return 0; } + list = list->next; + if (list->kind == CCL_TOK_EOL) + return 0; strncpy (value, list->name, 127); value[(size_t) list->len] = '\0'; switch (setting_no) { - case 2: - name = "gw.display.format"; - break; case 3: - name = "gw.max.show"; + name = "gw.display.format"; break; case 4: - name = "gw.default.show"; + name = "gw.auto.show"; break; case 5: + name = "gw.default.show"; + break; + case 6: name = "gw.language"; break; default: @@ -820,7 +930,7 @@ static int exec_def (struct ccl_token *list) gw_res_put (info.kernel_res, "gw.username", info.from_str, fname); gw_res_put (info.kernel_res, name, value, fname); gw_res_commit (info.kernel_res, fname); - if (setting_no == 5) + if (setting_no == 6) read_kernel_res (); } return 0; @@ -875,12 +985,6 @@ static int exec_command (const char *str, int *stop_flag) } else fprintf (reply_fd, "\n> %s\n", str); -#if 0 - 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"); - ccl_token_set = gw_res_get (info.kernel_res, "ccl.token.set", "set"); -#endif switch (no) { case 1: @@ -890,22 +994,18 @@ static int exec_command (const char *str, int *stop_flag) case 3: return exec_base (cmd->next); case 4: - fprintf (reply_fd, "\n> %s\n", str); return exec_help (cmd->next); - case 6: /* continue */ + case 6: /* continue */ *stop_flag = 2; return 0; - case 7: + case 7: /* status */ return exec_status (cmd->next); - case 8: /* stop */ - info.zass = NULL; - *info.target = 0; + case 8: /* stop */ *stop_flag = 1; - read_kernel_res(); return 0; - case 9: + case 9: /* target */ return exec_target (cmd->next); - case 10: + case 10: /* def */ return exec_def (cmd->next); case 11: return exec_account (cmd->next); @@ -941,11 +1041,11 @@ int urp_start (int continuation, struct str_queue *queue) tty_init (stdout, 40, 70); if (*info.from_str) { - info.reply_fname = tempnam (gw_res_get (info.kernel_res, - "gw.reply.tmp.dir", NULL), - gw_res_get (info.kernel_res, - "gw.reply.tmp.prefix", "gwr")); - + info.reply_fname = (char *) + tempnam (gw_res_get (info.kernel_res, "gw.reply.tmp.dir", NULL), + gw_res_get (info.kernel_res, + "gw.reply.tmp.prefix", "gwr")); + reply_fd = fopen (info.reply_fname, "w"); if (!reply_fd) { @@ -1033,7 +1133,6 @@ void urp_end (void) mta = gw_res_get (info.kernel_res, "gw.reply.mta", "/usr/lib/sendmail"); sprintf (cmd, "%s %s < %s", mta, info.from_str, info.reply_fname); - mta_code = system (cmd); if (mta_code) gw_log (GW_LOG_FATAL, KERNEL_LOG,