X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=a9d1d383f1bc0a1aefd2b750a59263d52f7187ba;hb=a9eae0225b1a51b0257f80d9da9f95475dd04f53;hp=f29ff8a3a5b88de212f6dc4e1ec50cb26c98f150;hpb=d7728e1b31c9043189b9c05635ea5512fd0d31e7;p=idzebra-moved-to-github.git

diff --git a/index/zebrash.c b/index/zebrash.c
index f29ff8a..a9d1d38 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,5 +1,5 @@
-/* $Id: zebrash.c,v 1.24 2003-12-04 11:20:39 heikki Exp $
-   Copyright (C) 2002,2003
+/* $Id: zebrash.c,v 1.29 2004-08-25 09:23:36 adam Exp $
+   Copyright (C) 2002,2003,2004
    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,7 @@ 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;
 
 /**************************************
  * Help functions
@@ -159,9 +161,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) {
@@ -344,11 +347,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 +369,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;
 }
@@ -815,12 +824,34 @@ 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();
+	default:
+	    fprintf(stderr, "bad option %s\n", arg);
+	    usage();
+	}
+    }
     shell();
     return 0;
 } /* main */