X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=333b378833aa9b0a778fdd51ca8c9826198c5c36;hb=4e67b823f05b521f193af096a40c0f64758c5fc1;hp=9ac13992daec8f9030fe4cac9bd7223fe913c20d;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/index/zebrash.c b/index/zebrash.c
index 9ac1399..333b378 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,5 +1,5 @@
-/* $Id: zebrash.c,v 1.39 2006-08-14 10:40:15 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zebrash.c,v 1.44 2007-03-19 21:50:39 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -351,18 +351,18 @@ static int cmd_end_trans( char *args[], WRBUF outbuff)
 
 static int cmd_record_insert( char *args[], WRBUF outbuff)
 {
-    SYSNO sysno=0;
+    zint sysno = 0;
     int rc;
     char *rec=restargs(args,1);
     
-    rc = zebra_insert_record(zh,
+    rc = zebra_update_record(zh,
+                             action_insert,
 			     0,  /* record type */
 			     &sysno,
 			     0,  /* match */
 			     0,  /* fname */
 			     rec,
-			     strlen(rec),
-			     0);
+			     strlen(rec));
     if (0==rc)
     {
         wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
@@ -383,8 +383,12 @@ static int cmd_exchange_record( char *args[], WRBUF outbuff)
 	onecommand("help exchange_record", outbuff, "");
 	return -90;
     }
-    rc=zebra_admin_exchange_record(zh, rec, strlen(rec),
-        id, strlen(id), atoi(action));
+
+    rc = zebra_update_record(zh, action_update, 0 /* record_type */,
+                             0 /* sysno */,
+                             id /* match */,
+                             0 /* fname */,
+                             rec, strlen(rec));
     return rc;
 }
 
@@ -415,14 +419,14 @@ static int cmd_find( char *args[], WRBUF outbuff)
     wrbuf_puts(qry,restargs(args,1));
     if (!zh)
 	onecommand("quickstart", outbuff, "");
-    wrbuf_printf(outbuff, "find %s\n",wrbuf_buf(qry));
-    rc = zebra_search_PQF(zh, wrbuf_buf(qry), setname, &hits);
+    wrbuf_printf(outbuff, "find %s\n",wrbuf_cstr(qry));
+    rc = zebra_search_PQF(zh, wrbuf_cstr(qry), setname, &hits);
     if (0==rc)
     {
         wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
         nextrecno = 1;
     }
-    wrbuf_free(qry, 1);
+    wrbuf_destroy(qry);
     return rc;
 }
 
@@ -764,7 +768,7 @@ static void Zerrors (WRBUF outbuff)
  * The shell
  */
  
-void shell()
+void shell(void)
 {
     int rc=0;
     WRBUF outbuff=wrbuf_alloc();
@@ -808,7 +812,7 @@ void shell()
 	/* get rid of \n in line */
 	if ((nl_cp = strchr(buf, '\n')))
 	    *nl_cp = '\0';
-	strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
+	strncpy(prevout, wrbuf_cstr(outbuff), MAX_OUT_BUFF);
         wrbuf_rewind(outbuff);
 	rc=onecommand(buf, outbuff, prevout);
 	if (rc==0)
@@ -821,13 +825,13 @@ void shell()
 	    wrbuf_printf(outbuff, "   command returned %d\n",rc);
 	} 
 	Zerrors(outbuff);
-	printf("%s\n", wrbuf_buf(outbuff));
+	printf("%s\n", wrbuf_cstr(outbuff));
     } /* while */
-    wrbuf_free(outbuff,1);
+    wrbuf_destroy(outbuff);
 } /* shell() */
 
 
-static void usage()
+static void usage(void)
 {
     printf ("usage:\n");
     printf ("zebrash [-c config]\n");