Bump year. Change Aps->ApS

[idzebra-moved-to-github.git] / index / zebrash.c

diff --git a/index/zebrash.c b/index/zebrash.c
index f29ff8a..577f942 100644 (file)
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,6 +1,6 @@
-/* $Id: zebrash.c,v 1.24 2003-12-04 11:20:39 heikki Exp $
-   Copyright (C) 2002,2003
-   Index Data Aps
+/* $Id: zebrash.c,v 1.32 2005-01-15 19:38:29 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -37,10 +37,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <readline/history.h>
 #endif
 
-#include "zebraapi.h"
+#include <idzebra/api.h>
 #include <yaz/log.h>
 #include <yaz/proto.h>
 #include <yaz/sortspec.h>
+#include <yaz/options.h>
 #include <yaz/wrbuf.h>
 
 #define MAX_NO_ARGS 32
@@ -60,6 +61,9 @@ ZebraService zs=0;  /* our global handle to zebra */
 ZebraHandle  zh=0;  /* the current session */
 /* time being, only one session works */
 int nextrecno=1;  /* record number to show next */
+static char *default_config = DEFAULTCONFIG;
+static int log_level=0;
+
 
 /**************************************
  * Help functions
@@ -159,9 +163,10 @@ static int cmd_zebra_start( char *args[], WRBUF outbuff)
 {
     char *conf=args[1];
     if (!conf || !*conf) {
-       wrbuf_puts(outbuff,"no config file specified, using "
-                  DEFAULTCONFIG "\n" );
-       conf=DEFAULTCONFIG;
+       wrbuf_puts(outbuff,"no config file specified, using ");
+       wrbuf_puts(outbuff, default_config);
+       wrbuf_puts(outbuff, "\n");
+       conf=default_config;
     }
     zs=zebra_start(conf);
     if (!zs) {
@@ -207,10 +212,10 @@ static int cmd_quickstart( char *args[], WRBUF outbuff)
         rc=onecommand("yaz_log_file zebrash.log",outbuff,"");
     if (!rc)
         rc=onecommand("yaz_log_prefix ZebraSh", outbuff,"");
-    sprintf(tmp, "yaz_log_level 0x%x", LOG_DEFAULT_LEVEL | LOG_APP);
+    sprintf(tmp, "yaz_log_level 0x%x", YLOG_DEFAULT_LEVEL | log_level );
     if (!rc)
         rc=onecommand(tmp,outbuff,"");
-    logf(LOG_APP,"quickstart");
+    yaz_log(log_level,"quickstart");
     if (!zs)
         if (!rc)
             rc=onecommand("zebra_start",outbuff,"");
@@ -236,7 +241,7 @@ static int cmd_yaz_log_file( char *args[], WRBUF outbuff)
 
 static int cmd_yaz_log_level( char *args[], WRBUF outbuff)
 {
-    int  lev = defargint(args[1],LOG_DEFAULT_LEVEL);
+    int  lev = defargint(args[1],YLOG_DEFAULT_LEVEL);
     wrbuf_printf(outbuff, "setting yaz-log to level %d (ox%x)\n",lev,lev);
     yaz_log_init_level(lev);
     return 0; /* ok */
@@ -257,8 +262,8 @@ static int cmd_logf( char *args[], WRBUF outbuff)
     if (lev)
        i=2;
     else
-       lev=LOG_LOG; /* this is in the default set!*/
-    logf( lev, restargs(args,i));
+       lev=YLOG_LOG; /* this is in the default set!*/
+    yaz_log( lev, restargs(args,i));
     return 0; /* ok */
 }
  
@@ -344,11 +349,18 @@ static int cmd_end_trans( char *args[], WRBUF outbuff)
 
 static int cmd_record_insert( char *args[], WRBUF outbuff)
 {
-    int sysno=0;
+    SYSNO sysno=0;
     int rc;
     char *rec=restargs(args,1);
     
-    rc=zebra_record_insert(zh,rec, strlen(rec), &sysno);
+    rc = zebra_insert_record(zh,
+                            0,  /* record type */
+                            &sysno,
+                            0,  /* match */
+                            0,  /* fname */
+                            rec,
+                            strlen(rec),
+                            0);
     if (0==rc)
     {
         wrbuf_printf(outbuff,"ok sysno=%d\n",sysno);
@@ -359,18 +371,17 @@ static int cmd_record_insert( char *args[], WRBUF outbuff)
 
 static int cmd_exchange_record( char *args[], WRBUF outbuff)
 {
-    char *base=args[1];
-    char *id = args[2];
-    char *action = args[3];
+    char *id = args[1];
+    char *action = args[2];
     int rc;
-    char *rec=restargs(args,4);
-    if (!(base && id && action && args[4] ))
+    char *rec=restargs(args,3);
+    if (!(id && action && args[4] ))
     {
        wrbuf_puts(outbuff,"Missing arguments!\n");
        onecommand("help exchange_record", outbuff, "");
        return -90;
     }
-    rc=zebra_admin_exchange_record(zh, base, rec, strlen(rec),
+    rc=zebra_admin_exchange_record(zh, rec, strlen(rec),
         id, strlen(id), atoi(action));
     return rc;
 }
@@ -548,7 +559,7 @@ struct cmdstruct cmds[] = {
       "[prefix]",
       "Sets the log prefix",
       cmd_yaz_log_prefix},    
-    { "logf", 
+    { "yaz_log", 
       "[level] text...",
       "writes an entry in the log",
       cmd_logf},    
@@ -643,7 +654,7 @@ int onecommand(
     char *args[MAX_NO_ARGS];
     int nargs;
     char argbuf[MAX_ARG_LEN];
-    logf(LOG_APP,"%s",line);
+    yaz_log(log_level,"%s",line);
     strncpy(argbuf,line, MAX_ARG_LEN-1);
     argbuf[MAX_ARG_LEN-1]='\0'; /* just to be sure */
     /*memset(args,'\0',MAX_NO_ARGS*sizeof(char *));*/
@@ -683,7 +694,7 @@ int onecommand(
            return ((cmds[i].testfunc)(args,outbuff));
        }
     wrbuf_printf(outbuff, "Unknown command '%s'. Try help\n",args[0]);
-    logf(LOG_APP,"Unknown command");
+    yaz_log(log_level,"Unknown command");
     return -90; 
 }
  
@@ -738,7 +749,7 @@ static void Zerrors ( WRBUF outbuff)
     ec=zebra_errCode (zh);
     if (ec)
     {
-       logf(LOG_APP, "   Zebra error %d: %s, (%s)",
+       yaz_log(log_level, "   Zebra error %d: %s, (%s)",
             ec, zebra_errString (zh),
             zebra_errAdd (zh) );
        wrbuf_printf(outbuff, "   Zebra error %d: %s, (%s)\n",
@@ -802,7 +813,7 @@ void shell()
        if (rc==0)
        {
            wrbuf_puts(outbuff, "   OK\n");
-           logf(LOG_APP, "OK");
+           yaz_log(log_level, "OK");
        }
        else if (rc>-90)
        {
@@ -815,12 +826,37 @@ void shell()
 } /* shell() */
 
 
+static void usage()
+{
+    printf ("usage:\n");
+    printf ("zebrash [-c config]\n");
+    exit(1);
+}
 /**************************************
  * Main 
  */
- 
-int main (int argc, char ** args)
+
+int main (int argc, char ** argv)
 {
+    int ret;
+    char *arg = 0;
+    while ((ret = options ("c:h", argv, argc, &arg)) != -2)
+    {
+       switch(ret)
+       {
+       case 'c':
+           default_config = arg;
+           break;
+       case 'h':
+           usage();
+        /* FIXME - handle -v */
+       default:
+           fprintf(stderr, "bad option %s\n", arg);
+           usage();
+       }
+    }
+    log_level=yaz_log_module_level("zebrash");
+
     shell();
     return 0;
 } /* main */