* Europagate, 1995
*
* $Log: urp.c,v $
- * Revision 1.29 1995/04/19 16:01:58 adam
+ * 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
+ * CCL commands stop/continue implemented. New functions gw_res_{int,bool}
+ * are used when possible.
+ *
+ * Revision 1.31 1995/05/01 12:43:38 adam
+ * First work on resource monitor program.
+ *
+ * Revision 1.30 1995/04/20 16:10:47 adam
+ * Modified to work with non-blocking zass-api. Not using non-blocking
+ * facility yet.
+ *
+ * Revision 1.29 1995/04/19 16:01:58 adam
* Some hacks to get the FIFO communication work!! Isn't reliable.
* Resource gw.account added - default account info.
*
*
*/
+/*
+ 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 <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <unistd.h>
#include <fcntl.h>
+#include <lgets.h>
#include <ttyemit.h>
#include <strqueue.h>
#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)
tty_emit (*s++);
}
-int lgets (char *buf, int max, int fd)
-{
- int r, no = 0;
-
- --max;
- while (no <= max)
- {
- if ((r=read (fd, buf+no, 1)) != 1)
- {
- if (r == -1)
- gw_log (GW_LOG_WARN|GW_LOG_ERRNO, KERNEL_LOG, "read fail");
- else
- gw_log (GW_LOG_WARN, KERNEL_LOG, "read eof");
- buf[no] = '\0';
- return 0;
- }
- if (buf[no] == 1)
- return 0;
- if (buf[no++] == '\n')
- break;
- }
- buf[no] = '\0';
- return 1;
-}
-
int reopen_target (void)
{
const char *v;
if (info.zass)
gw_log (GW_LOG_WARN, KERNEL_LOG, "Zass free...");
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "reopen_target");
- info.zass = zass_open (info.hostname, info.port, *info.account ?
- info.account : NULL);
+ info.zass = zass_open (info.hostname, info.port, NULL, /* complete */
+ *info.account ? info.account : NULL);
if (!info.zass)
{
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Cannot connect to target %s:%d",
"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);
return 0;
}
-
-static struct command_word {
+struct command_word {
char *default_value;
char *resource_suffix;
-} command_tab [] =
-{
-{ "find", "find"},
-{ "show", "show"},
-{ "base", "base" },
-{ "help", "help" },
-{ "info", "info" },
-{ "continue", "continue" },
-{ "status", "status" },
-{ "cancel", "cancel" },
-{ "target", "target" },
-{ "stop", "stop" },
-{ "account", "account" },
-{ NULL, NULL }
};
static int command_search (struct command_word *tab, struct ccl_token *cmd,
static char *sep = "-------------------------------\\n";
help_general ();
-#if 1
put_esc_str (sep);
put_esc_str (gw_res_get (info.kernel_res, "gw.help.target",
"target <name> - selects a given target\n"));
put_esc_str (gw_res_get (info.kernel_res, "gw.help.show",
"show <spec> - retrieves and displays "
"records\n"));
-#endif
return 0;
}
const struct zass_searchent *p;
struct gw_user_set *us;
char setname[32];
+ int autoshow;
struct ccl_rpn_node *rpn;
int error;
strcpy (setname, "Default");
else
sprintf (setname, "%d", info.setno);
+ info.next_position = 1;
+ if (info.setno >= 0)
+ info.setno++;
rpn = ccl_find (info.bibset, list, &error, &pos);
if (!rpn)
{
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)
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);
- if (info.setno >= 0)
- info.setno++;
+ 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;
}
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;
}
return 0;
}
-struct command_word show_tab [] =
-{
-{ "f", "format"},
-{ "p", "position"},
-{ NULL, NULL }
-};
-
static void present (const char *set, int offset, int number,
struct ccl_token *format_token)
{
int max_number;
char format_str[16];
- max_number = atoi (gw_res_get (info.kernel_res, "gw.max.show",
- "200"));
+ max_number = gw_res_int (info.kernel_res, "gw.max.show", 200);
if (number > max_number)
number = max_number;
gw_log (GW_LOG_DEBUG, KERNEL_LOG, "present in set %s", set);
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")))
{
static int exec_show (struct ccl_token *list)
{
+ static struct command_word show_tab [] =
+ {
+ { "f", "format"},
+ { "p", "position"},
+ { NULL, NULL }
+ };
char tmp_str[20];
struct ccl_token *set_token = NULL;
struct ccl_token *format_token = NULL;
us = user_set_search (NULL);
if (us && us->hits != -1) /* proper result-set? */
{
- default_show = atoi (gw_res_get (info.kernel_res,
- "gw.default.show", "20"));
- if (us->hits > default_show)
- present (us->name, 1, default_show, format_token);
- else if (us->hits > 0)
- present (us->name, 1, us->hits, format_token);
+ default_show = gw_res_int (info.kernel_res, "gw.default.show", 20);
+ if (us->hits >= info.next_position + default_show)
+ {
+ present (us->name, info.next_position, default_show,
+ format_token);
+ info.next_position += default_show;
+ }
+ else if (us->hits >= info.next_position)
+ {
+ present (us->name, info.next_position,
+ us->hits - info.next_position + 1,
+ format_token);
+ info.next_position = us->hits + 1;
+ }
}
else /* display error message */
{
return 0;
}
-static int exec_command (const char *str)
+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 value[128];
+ char fname[256];
+ static struct command_word def_tab [] =
+ {
+ { "reset", "reset" },
+ { "show", "show" },
+ { "f", "format"},
+ { "autoshow", "autoshow" },
+ { "defaultshow", "defaultshow" },
+ { "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);
+
+ if (list->kind == CCL_TOK_EOL)
+ show_def ();
+ else
+ {
+ int setting_no = command_search (def_tab, list, "ccl.token.");
+
+ if (!setting_no)
+ {
+ fprintf (reply_fd, "Unknown setting in def\n");
+ return -1;
+ }
+ if (setting_no == 1)
+ {
+ unlink (fname);
+ read_kernel_res ();
+ return 0;
+ }
+ else if (setting_no == 2)
+ {
+ 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 3:
+ name = "gw.display.format";
+ break;
+ case 4:
+ name = "gw.auto.show";
+ break;
+ case 5:
+ name = "gw.default.show";
+ break;
+ case 6:
+ name = "gw.language";
+ break;
+ default:
+ return 0;
+ }
+ gw_log (GW_LOG_DEBUG, KERNEL_LOG, "update file %s with %s=%s",
+ fname, name, value);
+ 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 == 6)
+ read_kernel_res ();
+ }
+ return 0;
+}
+
+
+/*
+ * exec_command: parse and execute ccl command in str.
+ * str: ccl command string
+ * stop_flag pointer to integer. On completion the integer
+ * is 1 (stop) or 2 (continue); 0 (other command)
+ * return: 0 success; non-zero otherwise
+ */
+static int exec_command (const char *str, int *stop_flag)
{
+ static struct command_word command_tab [] =
+ {
+ { "find", "find"},
+ { "show", "show"},
+ { "base", "base" },
+ { "help", "help" },
+ { "info", "info" },
+ { "continue", "continue" },
+ { "status", "status" },
+ { "stop", "stop" },
+ { "target", "target" },
+ { "def", "def" },
+ { "account", "account" },
+ { NULL, NULL }
+ };
+
struct ccl_token *cmd = ccl_tokenize (str);
int no;
+ *stop_flag = 0;
if (cmd->kind != CCL_TOK_EOL &&
(no = command_search (command_tab, cmd, "ccl.command.")))
{
- if (!info.zass && no != 9 && no != 4 && no != 11 && no != 7)
- reopen_target ();
- fprintf (reply_fd, "\n> %s\n", str);
- if (!info.zass && (no == 1 || no == 2 || no == 3))
+ if (no == 1 || no == 2 || no == 3) /* find/show/base? */
{
- fprintf (reply_fd, "%s\n",
- gw_res_get (info.kernel_res, "gw.err.no.target",
- "No connection established - "
- "command ignored"));
- return 0;
+ if (!info.zass) /* open if not already opened */
+ reopen_target ();
+ fprintf (reply_fd, "\n> %s\n", str);
+ if (!info.zass) /* fail? */
+ {
+ fprintf (reply_fd, "%s\n",
+ gw_res_get (info.kernel_res, "gw.err.no.target",
+ "No connection established - "
+ "command ignored"));
+ return 0;
+ }
}
+ 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");
case 3:
return exec_base (cmd->next);
case 4:
+ fprintf (reply_fd, "\n> %s\n", str);
return exec_help (cmd->next);
+ case 6: /* continue */
+ *stop_flag = 2;
+ return 0;
case 7:
return exec_status (cmd->next);
+ case 8: /* stop */
+ *stop_flag = 1;
+ return 0;
case 9:
return exec_target (cmd->next);
+ case 10:
+ return exec_def (cmd->next);
case 11:
return exec_account (cmd->next);
default:
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)
{
int urp_command (struct str_queue *queue)
{
char *cp;
+ int stop_flag;
while (str_queue_deq (queue, line_buf, LINE_MAX))
{
*cp = '\0';
gw_log (GW_LOG_ACCT, KERNEL_LOG, "cmd: %s", line_buf);
if (isalpha (line_buf[0]))
- exec_command (line_buf);
+ {
+ exec_command (line_buf, &stop_flag);
+ if (stop_flag)
+ {
+ info.command_no++; /* prevent help! */
+ while (str_queue_deq (queue, line_buf, LINE_MAX))
+ ;
+ return stop_flag;
+ }
+ }
info.command_no++;
}
return 0;
projects / egate.git / blobdiff