X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=469cf052fab3b00a827601994e85ec3d450b4d8d;hb=eb8857cfa2ceaa2635f14888b95d6f71b8def045;hp=b70343dd794c93fd4d9ea55e2fdd2066f757b851;hpb=c12b2fd1dec22f73a18a8f89551f169a19203f8a;p=idzebra-moved-to-github.git

diff --git a/index/zebrash.c b/index/zebrash.c
index b70343d..469cf05 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,5 +1,5 @@
 /* zebrash.c - command-line interface to zebra API 
- *  $ID$
+ *  $Id: zebrash.c,v 1.6 2003-02-12 15:45:59 heikki Exp $
  *
  * Copyrigth 2003 Index Data Aps
  *
@@ -7,7 +7,7 @@
  
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string.h> 
 #include <ctype.h>
 
 #if HAVE_READLINE_READLINE_H
@@ -18,6 +18,7 @@
 #endif
 
 #include "zebraapi.h"
+#include <yaz/log.h>
 
 #define MAX_NO_ARGS 32
 #define MAX_OUT_BUFF 4096
@@ -41,8 +42,10 @@ ZebraHandle  zh=0;  /* the current session */
 static int split_args( char *line, char** args )
 { /* splits line into individual null-terminated strings, 
    * returns pointers to them in args */
+  /* FIXME - do we need to handle quoted args ?? */
   char *p=line;
   int i=0;
+  int n=0;
   args[0]=0; /* by default */
   while (*p==' ' || *p=='\t' || *p=='\n')
     p++;
@@ -50,18 +53,41 @@ static int split_args( char *line, char** args )
   {
     while (*p==' ' || *p=='\t' || *p=='\n')
       p++;
+    if (*p=='#')  /* skip comments */
+      break;  
     args[i++]=p;
     args[i]=0;
-    while (*p && *p!=' ' && *p!='\t' && *p!='\n')
+    while (*p && *p!=' ' && *p!='\t' && *p!='\n' && *p!='#')
       p++;
     *p++='\0';
   }
+  n=i;
+  while (n<MAX_NO_ARGS)
+    args[n++]=0;
   return i;
 }
 
+static char *defarg( char *arg, char *def )
+{
+  if (!arg)
+    return def;
+  if (!*arg)
+    return def;
+  return arg;
+}
+static int defargint( char *arg, int def )
+{
+  int v=def;
+  char *a=defarg(arg,0);
+  if (a)
+    sscanf(a," %i", &v);
+  return v;
+}
+
+int onecommand( char *line, char *outbuff);
  
  /**************************************
- * Individual commands
+ * Simple support commands
  */
 
  int cmd_echo( char *args[], char *outbuff)
@@ -75,10 +101,14 @@ static int split_args( char *line, char** args )
    strcpy(outbuff, "bye");
    return -99; /* special stop signal */
  }
+
+/**************************************
+ * Tests for starting and stopping zebra, etc
+ */
  
- int cmd_help( char *args[], char *outbuff); 
+ static int cmd_help( char *args[], char *outbuff); 
  
- int cmd_zebra_start( char *args[], char *outbuff)
+ static int cmd_zebra_start( char *args[], char *outbuff)
  {
    char *conf=args[1];
    if (!conf || !*conf) {
@@ -88,40 +118,162 @@ static int split_args( char *line, char** args )
    }
    zs=zebra_start(conf);
    if (!zs) {
-     strcpy(outbuff, "zebra_open failed" );
+     strcpy(outbuff, "zebra_start failed" );
      return 2;
    }
    return 0; /* ok */
  }
  
- int cmd_zebra_stop( char *args[], char *outbuff)
+ static int cmd_zebra_stop( char *args[], char *outbuff)
  {
    if (!zs)
      strcat(outbuff,"zebra seems not to have been started, "
-                    "stopping anyway");
+                    "stopping anyway\n");
    zebra_stop(zs);
    zs=0;
    return 0; /* ok */
  }
 
-int cmd_zebra_open( char *args[], char *outbuff)
+static int cmd_zebra_open( char *args[], char *outbuff)
 {
   if (!zs)
     strcat(outbuff,"zebra seems not to have been started, "
-                   "trying anyway");
+                   "trying anyway\n");
   zh=zebra_open(zs);
   return 0; /* ok */
 }
 
-int cmd_zebra_close( char *args[], char *outbuff)
+static int cmd_zebra_close( char *args[], char *outbuff)
 {
   if (!zh)
     strcat(outbuff,"Seems like you have not called zebra_open,"
-                   "trying anyway");
+                   "trying anyway\n");
   zebra_close(zh);
   return 0; /* ok */
 }
+
+static int cmd_quickstart( char *args[], char *outbuff)
+{
+  char tmp[128];
+  onecommand("yaz_log_file zebrash.log",outbuff);
+  onecommand("yaz_log_prefix ZebraSh", outbuff);
+  sprintf(tmp, "yaz_log_level 0x%x", LOG_DEFAULT_LEVEL | LOG_APP);
+  onecommand(tmp,outbuff);
+  logf(LOG_APP,"quickstart");
+  onecommand("zebra_start",outbuff);
+  onecommand("zebra_open",outbuff);
+  onecommand("select_database Default",outbuff);
+  strcat(outbuff,"ok\n");
+  return 0;
+}
+
+/**************************************
+ * Log file handling
+ */
+
+static int cmd_yaz_log_file( char *args[], char *outbuff)
+{
+  char *fn = defarg(args[1],0);
+  char tmp[255];
+  sprintf(tmp, "sending yaz-log to %s\n",fn);
+  strcat(outbuff, tmp);
+  yaz_log_init_file(fn);
+  return 0; /* ok */
+}
+
+static int cmd_yaz_log_level( char *args[], char *outbuff)
+{
+  int  lev = defargint(args[1],LOG_DEFAULT_LEVEL);
+  char tmp[255];
+  sprintf(tmp, "setting yaz-log to level %d (ox%x)\n",lev,lev);
+  strcat(outbuff, tmp);
+  yaz_log_init_level(lev);
+  return 0; /* ok */
+}
+
+static int cmd_yaz_log_prefix( char *args[], char *outbuff)
+{
+  char *pref = defarg(args[1],"ZebraSh");
+  char tmp[255];
+  sprintf(tmp, "setting yaz-log prefix to %s\n",pref);
+  strcat(outbuff, tmp);
+  yaz_log_init_prefix(pref);
+  return 0; /* ok */
+}
+
+static int cmd_logf( char *args[], char *outbuff)
+{
+  int lev = defargint(args[1],0);
+  char tmp[MAX_OUT_BUFF]="";
+  int i=1;
+  if (lev)
+    i=2;
+  else
+    lev=LOG_LOG; /* this is in the default set!*/
+  while (args[i])
+  {
+    strcat(tmp, args[i++]);
+    strcat(tmp, " ");
+  }
+  logf(lev,tmp);
+  return 0; /* ok */
+}
  
+/****************
+ * Error handling 
+ */
+static int cmd_err ( char *args[], char *outbuff)
+{
+  char tmp[MAX_OUT_BUFF];
+  sprintf(tmp, "errCode: %d \nerrStr:  %s\nerrAdd:  %s \n",
+    zebra_errCode (zh),
+    zebra_errString (zh),  
+    zebra_errAdd (zh) );
+  strcat(outbuff, tmp);
+  return 0; /* ok */
+}
+static int cmd_errcode ( char *args[], char *outbuff)
+{
+  char tmp[MAX_OUT_BUFF];
+  sprintf(tmp, "errCode: %d \n",
+    zebra_errCode (zh));
+  strcat(outbuff, tmp);
+  return 0; /* ok */
+}
+static int cmd_errstr ( char *args[], char *outbuff)
+{
+  char tmp[MAX_OUT_BUFF];
+  sprintf(tmp, "errStr:  %s\n",
+    zebra_errString (zh));
+  strcat(outbuff, tmp);
+  return 0; /* ok */
+}
+static int cmd_erradd ( char *args[], char *outbuff)
+{
+  char tmp[MAX_OUT_BUFF];
+  sprintf(tmp, "errAdd:  %s \n",
+    zebra_errAdd (zh) ); 
+  strcat(outbuff, tmp);
+  return 0; /* ok */
+}
+
+/**************************************
+ * Admin commands
+ */
+
+static int cmd_init ( char *args[], char *outbuff)
+{
+  zebra_init(zh);
+  return 0; /* ok */
+}
+
+static int cmd_select_database ( char *args[], char *outbuff)
+{
+  char *db=args[1];
+  if (!db)
+    db="Default";
+  return zebra_select_database(zh, args[1]);
+}
  
 /**************************************
  * Command table, parser, and help 
@@ -150,14 +302,58 @@ struct cmdstruct cmds[] = {
   { "zebra_stop",   "", 
     "stops the zebra service", 
     cmd_zebra_stop },
-  { "zebra_open", "", 
+  { "zebra_open", "",  
     "starts a zebra session. Once you have called zebra_start\n"
     "you can call zebra_open to start working", 
     cmd_zebra_open },
   { "zebra_close", "", 
     "closes a zebra session", 
-    cmd_zebra_close },
-  { "", "Misc:","", 0},
+    cmd_zebra_close }, 
+  { "quickstart", "[configfile]", 
+    "Does a zebra_start, zebra_open, and sets up the log", 
+    cmd_quickstart }, 
+  
+  { "", "Log file:","", 0},  
+  { "yaz_log_file", 
+    "[filename]",
+    "Directs the log to filename (or stderr)",
+    cmd_yaz_log_file },
+  { "yaz_log_level", 
+    "[level]",
+    "Sets the logging level (or returns to default)",
+    cmd_yaz_log_level },
+  { "yaz_log_prefix", 
+    "[prefix]",
+    "Sets the log prefix",
+    cmd_yaz_log_prefix},    
+  { "logf", 
+    "[level] text...",
+    "writes an entry in the log",
+    cmd_logf},    
+
+  { "", "Error handling:","", 0},
+  { "err",  "",
+    "Displays zebra's error status (code, str, add)",
+    cmd_err},    
+  { "errcode",  "",
+    "Displays zebra's error code",
+    cmd_errcode},    
+  { "errstr",  "",
+    "Displays zebra's error string",
+    cmd_errstr},    
+  { "erradd",  "",
+    "Displays zebra's additional error message",
+    cmd_erradd},    
+  
+  { "", "Admin:","", 0}, 
+  { "init",  "",
+    "Initializes the zebra database, destroying all data in it",
+    cmd_init},    
+  { "select_database",  "basename",
+    "Selects a database",
+    cmd_select_database},    
+  
+  { "", "Misc:","", 0}, 
   { "echo", "string", 
     "ouputs the string", 
     cmd_echo },
@@ -168,6 +364,7 @@ struct cmdstruct cmds[] = {
     "Gives help on command, or lists them all", 
     cmd_help },
   { "", "help [command] gives more info on command", "",0 },   
+  
   {0,0,0,0} /* end marker */
 };
  
@@ -177,11 +374,13 @@ int onecommand( char *line, char *outbuff)
   char *args[MAX_NO_ARGS];
   int n;
   char argbuf[MAX_ARG_LEN];
+  int rc;
+  logf(LOG_APP,"%s",line);
   strncpy(argbuf,line, MAX_ARG_LEN-1);
   argbuf[MAX_ARG_LEN-1]='\0'; /* just to be sure */
   n=split_args(argbuf, args);
   if (0==n)
-    return 0; /* no command on line, too bad */
+    return -1; /* no command on line, too bad */
   for (i=0;cmds[i].cmd;i++)
     if (0==strcmp(cmds[i].cmd, args[0])) 
     {
@@ -191,26 +390,32 @@ int onecommand( char *line, char *outbuff)
         args[0]=""; 
       return ((cmds[i].testfunc)(args,outbuff));
     }
-  sprintf (outbuff, "Unknown command '%s'. Try help",args[0] );
-  return -1; 
+  strcat(outbuff, "Unknown command '");
+  strcat(outbuff,args[0] );
+  strcat(outbuff,"'. Try help");
+  logf(LOG_APP,"Unknown command");
+  return -2; 
 }
  
- int cmd_help( char *args[], char *outbuff)
+ static int cmd_help( char *args[], char *outbuff)
  { 
   int i;
   char tmp[MAX_ARG_LEN];
-  if (args[1])
-  { /* help for a single command */
-   for (i=0;cmds[i].cmd;i++)
-     if (0==strcmp(cmds[i].cmd, args[0])) 
-     {
-       strcat(outbuff,cmds[i].cmd);
-       strcat(outbuff,"  ");
-       strcat(outbuff,cmds[i].args);
-       strcat(outbuff,"\n");
-       strcat(outbuff,cmds[i].explanation);
-       strcat(outbuff,"\n");
-     }
+  if (args[1]) 
+  { /* help for a single command */ 
+    for (i=0;cmds[i].cmd;i++)
+      if (0==strcmp(cmds[i].cmd, args[1])) 
+      {
+        strcat(outbuff,cmds[i].cmd);
+        strcat(outbuff,"  ");
+        strcat(outbuff,cmds[i].args);
+        strcat(outbuff,"\n");
+        strcat(outbuff,cmds[i].explanation);
+        strcat(outbuff,"\n");
+        return 0;
+      }
+    strcat(outbuff, "Unknown command ");
+    strcat(outbuff, args[1] );
   }
   else 
   { /* list all commands */
@@ -244,9 +449,28 @@ int onecommand( char *line, char *outbuff)
     strcat(outbuff,tmp);
   }
   return 0;
- }
- 
+}
  
+/* If Zebra reports an error after an operation,
+ * append it to the outbuff and log it */
+static void Zerrors ( char *outbuff)
+{
+  int ec;
+  char tmp[MAX_OUT_BUFF];
+  if (!zh)
+    return ;
+  ec=zebra_errCode (zh);
+  if (ec)
+  {
+    sprintf(tmp, "Zebra error %d: %s, (%s)",
+      ec, zebra_errString (zh),
+      zebra_errAdd (zh) );
+    strcat(outbuff, tmp);
+    strcat(outbuff, "\n");
+    logf(LOG_APP, tmp);
+  }
+}
+  
 /************************************** 
  * The shell
  */
@@ -254,6 +478,7 @@ int onecommand( char *line, char *outbuff)
 void shell()
 {
   int rc=0;
+  char tmp[MAX_ARG_LEN];
   while (rc!=-99)
   {
     char buf[MAX_ARG_LEN];
@@ -277,15 +502,25 @@ void shell()
 	  printf (PROMPT); 
 	  fflush (stdout);
 	  if (!fgets (buf, MAX_ARG_LEN-1, stdin))
-	    break;
+	    break; 
 #endif 
     outbuff[0]='\0';
     rc=onecommand(buf, outbuff);
+    if (rc==0)
+    {
+      strcat(outbuff, "OK\n");
+      logf(LOG_APP, "OK");
+    }
+    else if (rc > 0)
+    {
+      sprintf(tmp, "command returned %d\n",rc);
+      strcat(outbuff,tmp);
+    } 
+    Zerrors(outbuff);
   	printf("%s\n", outbuff);
-  }
-
- }
- 
+  } /* while */
+} /* shell() */
+  
  
 /**************************************
  * Main