+/*
+ * 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.46 1995/07/28 10:51:09 adam
+ * Bug fix: account from previous session had effect when new target command
+ * was executed.
+ *
+ * Revision 1.45 1995/07/20 08:20:24 adam
+ * Minor changes.
+ *
+ * Revision 1.44 1995/07/11 12:28:53 adam
+ * New functions ccl_token_simple and ccl_token_del used.
+ *
+ * Revision 1.43 1995/07/11 11:49:13 adam
+ * LINE_MAX renamed to STR_LINE_MAX.
+ *
+ * Revision 1.42 1995/07/03 12:59:29 adam
+ * New option for eti: -c dir to chdir before start.
+ * Setting change: gw.max.show defaults to 100.
+ *
+ * Revision 1.41 1995/07/03 08:20:18 adam
+ * More help information and better diagnostics.
+ *
+ * Revision 1.40 1995/05/23 08:13:00 adam
+ * Minor changes.
+ *
+ * Revision 1.39 1995/05/22 14:57:30 adam
+ * Next default record position also set by last p=... in show.
+ *
+ * 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
Todo:
info/status (other name?)
better persistence diagnostics
- resource gw.path - use chdir call instead
Optional:
automatic information about target-aliases: name, query-support, etc.
#include <strqueue.h>
#include "kernel.h"
-static char line_buf[LINE_MAX+1];
+static void present (const char *set, int offset, int number,
+ struct ccl_token *format_token);
+
+static char line_buf[STR_LINE_MAX+1];
static void put_esc_str (const char *s)
{
"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);
char *resource_suffix;
};
-static int command_search (struct command_word *tab, struct ccl_token *cmd,
-const char *resource_prefix)
+static int command_search_str (struct command_word *tab, const char *cmd_name,
+ int cmd_len, const char *resource_prefix)
{
int no = 1;
assert (resource_prefix);
assert (tab);
- assert (cmd);
while (tab->default_value)
{
char *cp, command_names[60];
if ((split = strchr (cp, ' ')))
*split = '\0';
- if (cmd->len == strlen(cp) &&
- !memcmp (cmd->name, cp, cmd->len))
+ if (cmd_len == strlen(cp) &&
+ !memcmp (cmd_name, cp, cmd_len))
return no;
if (!split)
break;
return 0;
}
+static int command_search (struct command_word *tab, struct ccl_token *cmd,
+ const char *resource_prefix)
+{
+ return command_search_str (tab, cmd->name, cmd->len, resource_prefix);
+}
+
static struct error_no_struct {
int no;
char *resource_name;
{
*from_str = '\0';
*subject_str = '\0';
- while (str_queue_deq (sq, line_buf, LINE_MAX))
+ while (str_queue_deq (sq, line_buf, STR_LINE_MAX))
{
if (line_buf[0] == '\n')
return 0;
put_esc_str (gw_res_get (info.kernel_res, "gw.help.show",
"show <spec> - retrieves and displays "
"records\n"));
+ put_esc_str (sep);
+ put_esc_str (gw_res_get (info.kernel_res, "gw.help.def",
+ "def <setting> <value> sets/gets definitons\n"));
+ put_esc_str (sep);
+ put_esc_str (gw_res_get (info.kernel_res, "gw.help.account",
+ "account <str> sets authentication string\n"));
return 0;
}
const struct zass_searchent *p;
struct gw_user_set *us;
char setname[32];
+ int autoshow;
struct ccl_rpn_node *rpn;
int error;
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."));
return -1;
}
if (p->errcode != -1)
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;
}
}
else
*info.account = '\0';
+ info.account_in_session = 1;
return 0;
}
len = list->len;
memcpy (info.target, list->name, len);
info.target [len] = '\0';
-
+
+ if (!info.account_in_session)
+ *info.account = '\0';
+ info.account_in_session = 0;
read_kernel_res ();
return reopen_target ();
}
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;
}
int max_number;
char format_str[16];
- max_number = gw_res_int (info.kernel_res, "gw.max.show", 200);
+ max_number = gw_res_int (info.kernel_res, "gw.max.show", 100);
if (number > max_number)
number = max_number;
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "present in set %s", set);
{
int i;
zass_record *pp;
- char path[128];
int record_log_fd = -1;
const char *record_log_name;
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);
+ record_log_fd = open (record_log_name,
+ O_WRONLY|O_CREAT|O_APPEND, 0666);
if (record_log_fd == -1)
- gw_log (GW_LOG_WARN|GW_LOG_ERRNO, "Cannot open %s", path);
+ gw_log (GW_LOG_WARN|GW_LOG_ERRNO, "Cannot open %s",
+ record_log_name);
}
fprintf (reply_fd, gw_res_get (info.kernel_res,
"gw.msg.records",
if (rec)
{
#if USE_FML
+ strcpy (format_str,
+ gw_res_get (info.kernel_res,
+ "gw.display.format", ""));
if (format_token)
{
len = format_token->len;
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")))
{
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",
+ "Syntax error"));
+ return -3;
+ }
li = li->next;
+ }
}
if (set_token)
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Got set=%.*s", set_token->len,
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
{
}
li = li->next;
}
- else
+ else if (li->kind == CCL_TOK_TERM)
{
len = li->len;
memcpy (tmp_str, li->name, len);
if (offset+number-1 > us->hits)
number = us->hits - offset+1;
present (us->name, offset, number, format_token);
+ info.next_position = offset+number;
}
}
else if (!no_of_present) /* display error message once! */
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;
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 }
};
if (info.userid < 0)
return -1;
- sprintf (fname, "%s/user.%d.r", gw_res_get (info.kernel_res,
- "gw.path", "."),
- info.userid);
+ sprintf (fname, "user.%d.r", 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.");
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:
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;
{ NULL, NULL }
};
- struct ccl_token *cmd = ccl_tokenize (str);
+ struct ccl_token *cmd;
+ const char *cp = str;
int no;
+ while (*cp && *cp != ' ' && *cp != '\n' && *cp != '\t' && *cp != '\r')
+ cp++;
+
*stop_flag = 0;
- if (cmd->kind != CCL_TOK_EOL &&
- (no = command_search (command_tab, cmd, "ccl.command.")))
+ no = command_search_str (command_tab, str, cp-str, "ccl.command.");
+ if (no)
{
if (no == 1 || no == 2 || no == 3) /* find/show/base? */
{
fprintf (reply_fd, "\n> %s\n", str);
if (!info.zass) /* fail? */
{
- fprintf (reply_fd, "%s\n",
+ fprintf (reply_fd, "\n%s\n",
gw_res_get (info.kernel_res, "gw.err.no.target",
"No connection established - "
"command ignored"));
}
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:
- return exec_find (cmd->next, str);
- case 2:
- return exec_show (cmd->next);
- 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 1: /* find */
+ cmd = ccl_tokenize (cp);
+ exec_find (cmd, str);
+ break;
+ case 2: /* show */
+ cmd = ccl_tokenize (cp);
+ exec_show (cmd);
+ break;
+ case 3: /* base */
+ cmd = ccl_token_simple (cp);
+ exec_base (cmd);
+ break;
+ case 4: /* help */
+ cmd = ccl_token_simple (cp);
+ exec_help (cmd);
+ break;
+ case 6: /* continue */
*stop_flag = 2;
return 0;
- case 7:
- return exec_status (cmd->next);
- case 8: /* stop */
- info.zass = NULL;
- *info.target = 0;
+ case 7: /* status */
+ exec_status (cmd);
+ return 0;
+ case 8: /* stop */
*stop_flag = 1;
- read_kernel_res();
return 0;
- case 9:
- return exec_target (cmd->next);
- case 10:
- return exec_def (cmd->next);
- case 11:
- return exec_account (cmd->next);
+ case 9: /* target */
+ cmd = ccl_token_simple (cp);
+ exec_target (cmd);
+ break;
+ case 10: /* def */
+ cmd = ccl_token_simple (cp);
+ exec_def (cmd);
+ break;
+ case 11: /* account */
+ cmd = ccl_token_simple (cp);
+ exec_account (cmd);
+ break;
default:
+ cmd = NULL;
fprintf (reply_fd, "%s\n",
gw_res_get (info.kernel_res, "gw.err.unimplemented",
"Not implemented yet"));
}
+ ccl_token_del (cmd);
}
else
{
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)
{
char *cp;
int stop_flag;
- while (str_queue_deq (queue, line_buf, LINE_MAX))
+ while (str_queue_deq (queue, line_buf, STR_LINE_MAX))
{
if (line_buf[0] == '\n')
if (info.command_no)
if (stop_flag)
{
info.command_no++; /* prevent help! */
- while (str_queue_deq (queue, line_buf, LINE_MAX))
+ while (str_queue_deq (queue, line_buf, STR_LINE_MAX))
;
return stop_flag;
}
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,