X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=bd42f93684a265db7acbe7289cf9a8b175b515f4;hb=d66990c38540b6196ede05d4b5636a9b51609134;hp=0bc43eaefc95726e84424e96a1b5fd9871d70b4a;hpb=dbd6f3a01791401472b07250bf35dcbc3ead4f92;p=idzebra-moved-to-github.git

diff --git a/index/zebrash.c b/index/zebrash.c
index 0bc43ea..bd42f93 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,10 +1,29 @@
-/* zebrash.c - command-line interface to zebra API 
- *  $Id: zebrash.c,v 1.12 2003-06-23 15:35:25 adam Exp $
- *
- * Copyrigth 2003 Index Data Aps
- *
- */
- 
+/* $Id: zebrash.c,v 1.23 2003-11-21 15:30:16 heikki Exp $
+   Copyright (C) 2002,2003
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+/* 
+   zebrash.c - command-line interface to zebra API
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h> 
@@ -19,12 +38,17 @@
 
 #include "zebraapi.h"
 #include <yaz/log.h>
+#include <yaz/proto.h>
+#include <yaz/wrbuf.h>
 
 #define MAX_NO_ARGS 32
 #define MAX_OUT_BUFF 4096
 #define MAX_ARG_LEN 1024
 #define PROMPT "ZebraSh>"
 #define DEFAULTCONFIG "./zebra.cfg"
+#define DEFAULTDATABASE "Default"
+#define DEFAULTRESULTSET "MyResultSet"
+
 
 /**************************************
  * Global variables (yuck!)
@@ -33,6 +57,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 */
 
 /**************************************
  * Help functions
@@ -48,7 +73,7 @@ static int split_args( char *line, char** args )
     int n=0;
     args[0]=0; /* by default */
     while (*p==' ' || *p=='\t' || *p=='\n')
-	p++;
+	    p++;
     while (*p)
     {
 	while (*p==' ' || *p=='\t' || *p=='\n')
@@ -84,21 +109,41 @@ static int defargint( char *arg, int def )
     return v;
 }
 
-int onecommand( char *line, char *outbuff, const char *prevout); 
- 
+static char *restargs( char *args[], int n)
+{ /* Returns the rest of the arguments, starting at the nth, */
+  /* to the end of the command line. Assumes args[0] contains */
+  /* the original line, minus the command itself */
+    int skiplen= args[n]-args[1];
+    if (skiplen > strlen(args[0]))
+        return "";
+    return args[0]+skiplen;
+}
+
+int onecommand( char *line, WRBUF outbuff, const char *prevout); 
+
 /**************************************
  * Simple support commands
  */
 
-int cmd_echo( char *args[], char *outbuff)
+int cmd_echo( char *args[], WRBUF outbuff)
 {
-    strcpy(outbuff, args[0]);
+    wrbuf_printf(outbuff,"%s\n",restargs(args,1));
     return 0;
 }
  
-int cmd_quit( char *args[], char *outbuff)
+int cmd_quit( char *args[], WRBUF outbuff)
 {
-    strcpy(outbuff, "bye");
+    if (zs)
+    {
+        onecommand("zebra_close",outbuff,"");
+        zs=0;
+    }
+    if (zh)
+    {
+        onecommand("zebra_stop",outbuff,"");
+        zh=0;
+    }
+    wrbuf_puts(outbuff, "bye");
     return -99; /* special stop signal */
 }
 
@@ -106,53 +151,53 @@ int cmd_quit( char *args[], char *outbuff)
  * Tests for starting and stopping zebra, etc
  */
  
-static int cmd_help( char *args[], char *outbuff); 
+static int cmd_help( char *args[], WRBUF outbuff); 
  
-static int cmd_zebra_start( char *args[], char *outbuff)
+static int cmd_zebra_start( char *args[], WRBUF outbuff)
 {
     char *conf=args[1];
     if (!conf || !*conf) {
-	strcat(outbuff,"no config file specified, using "
-	       DEFAULTCONFIG "\n" );
+	wrbuf_puts(outbuff,"no config file specified, using "
+		   DEFAULTCONFIG "\n" );
 	conf=DEFAULTCONFIG;
     }
     zs=zebra_start(conf);
     if (!zs) {
-	strcpy(outbuff, "zebra_start failed" );
+	wrbuf_puts(outbuff, "zebra_start failed" );
 	return 2;
     }
     return 0; /* ok */
 }
  
-static int cmd_zebra_stop( char *args[], char *outbuff)
+static int cmd_zebra_stop( char *args[], WRBUF outbuff)
 {
     if (!zs)
-	strcat(outbuff,"zebra seems not to have been started, "
-	       "stopping anyway\n");
+	wrbuf_puts(outbuff,"zebra seems not to have been started, "
+		   "stopping anyway\n");
     zebra_stop(zs);
     zs=0;
     return 0; /* ok */
 }
 
-static int cmd_zebra_open( char *args[], char *outbuff)
+static int cmd_zebra_open( char *args[], WRBUF outbuff)
 {
     if (!zs)
-	strcat(outbuff,"zebra seems not to have been started, "
-	       "trying anyway\n");
+	wrbuf_puts(outbuff,"zebra seems not to have been started, "
+		   "trying anyway\n");
     zh=zebra_open(zs);
     return 0; /* ok */
 }
 
-static int cmd_zebra_close( char *args[], char *outbuff)
+static int cmd_zebra_close( char *args[], WRBUF outbuff)
 {
     if (!zh)
-	strcat(outbuff,"Seems like you have not called zebra_open,"
-	       "trying anyway\n");
+	wrbuf_puts(outbuff,"Seems like you have not called zebra_open,"
+		   "trying anyway\n");
     zebra_close(zh);
     return 0; /* ok */
 }
 
-static int cmd_quickstart( char *args[], char *outbuff)
+static int cmd_quickstart( char *args[], WRBUF outbuff)
 {
     char tmp[128];
     int rc=0;
@@ -164,10 +209,12 @@ static int cmd_quickstart( char *args[], char *outbuff)
     if (!rc)
         rc=onecommand(tmp,outbuff,"");
     logf(LOG_APP,"quickstart");
-    if (!rc)
-        rc=onecommand("zebra_start",outbuff,"");
-    if (!rc)
-        rc=onecommand("zebra_open",outbuff,"");
+    if (!zs)
+        if (!rc)
+            rc=onecommand("zebra_start",outbuff,"");
+    if (!zh)
+        if (!rc)
+            rc=onecommand("zebra_open",outbuff,"");
     if (!rc)
         rc=onecommand("select_database Default",outbuff,"");
     return rc;
@@ -177,89 +224,69 @@ static int cmd_quickstart( char *args[], char *outbuff)
  * Log file handling
  */
 
-static int cmd_yaz_log_file( char *args[], char *outbuff)
+static int cmd_yaz_log_file( char *args[], WRBUF outbuff)
 {
     char *fn = defarg(args[1],0);
-    char tmp[255];
-    sprintf(tmp, "sending yaz-log to %s\n",fn);
-    strcat(outbuff, tmp);
+    wrbuf_printf(outbuff, "sending yaz-log to %s\n",fn);
     yaz_log_init_file(fn);
     return 0; /* ok */
 }
 
-static int cmd_yaz_log_level( char *args[], char *outbuff)
+static int cmd_yaz_log_level( char *args[], WRBUF 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);
+    wrbuf_printf(outbuff, "setting yaz-log to level %d (ox%x)\n",lev,lev);
     yaz_log_init_level(lev);
     return 0; /* ok */
 }
 
-static int cmd_yaz_log_prefix( char *args[], char *outbuff)
+static int cmd_yaz_log_prefix( char *args[], WRBUF outbuff)
 {
     char *pref = defarg(args[1],"ZebraSh");
-    char tmp[255];
-    sprintf(tmp, "setting yaz-log prefix to %s\n",pref);
-    strcat(outbuff, tmp);
+    wrbuf_printf(outbuff, "setting yaz-log prefix to %s\n",pref);
     yaz_log_init_prefix(pref);
     return 0; /* ok */
 }
 
-static int cmd_logf( char *args[], char *outbuff)
+static int cmd_logf( char *args[], WRBUF outbuff)
 {
     int lev = defargint(args[1],0);
-    char tmp[MAX_OUT_BUFF]="";
-    int i=1;
+    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);
+    logf( lev, restargs(args,i));
     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);
+static int cmd_err ( char *args[], WRBUF outbuff)
+{
+    wrbuf_printf(outbuff, "errCode: %d \nerrStr:  %s\nerrAdd:  %s \n",
+		 zebra_errCode (zh),
+		 zebra_errString (zh),  
+		 zebra_errAdd (zh) );
     return 0; /* ok */
 }
-static int cmd_errcode ( char *args[], char *outbuff)
+static int cmd_errcode ( char *args[], WRBUF outbuff)
 {
-    char tmp[MAX_OUT_BUFF];
-    sprintf(tmp, "errCode: %d \n",
-	    zebra_errCode (zh));
-    strcat(outbuff, tmp);
+    wrbuf_printf(outbuff, "errCode: %d \n",
+		 zebra_errCode (zh));
     return 0; /* ok */
 }
-static int cmd_errstr ( char *args[], char *outbuff)
+static int cmd_errstr ( char *args[], WRBUF outbuff)
 {
-    char tmp[MAX_OUT_BUFF];
-    sprintf(tmp, "errStr:  %s\n",
-	    zebra_errString (zh));
-    strcat(outbuff, tmp);
+    wrbuf_printf(outbuff, "errStr:  %s\n",
+		 zebra_errString (zh));
     return 0; /* ok */
 }
-static int cmd_erradd ( char *args[], char *outbuff)
+static int cmd_erradd ( char *args[], WRBUF outbuff)
 {
-    char tmp[MAX_OUT_BUFF];
-    sprintf(tmp, "errAdd:  %s \n",
-	    zebra_errAdd (zh) ); 
-    strcat(outbuff, tmp);
+    wrbuf_printf(outbuff, "errAdd:  %s \n",
+		 zebra_errAdd (zh) ); 
     return 0; /* ok */
 }
 
@@ -267,42 +294,45 @@ static int cmd_erradd ( char *args[], char *outbuff)
  * Admin commands
  */
 
-static int cmd_init ( char *args[], char *outbuff)
+static int cmd_init ( char *args[], WRBUF outbuff)
 {
     zebra_init(zh);
     return 0; /* ok */
 }
 
-static int cmd_select_database ( char *args[], char *outbuff)
+static int cmd_select_database ( char *args[], WRBUF outbuff)
 {
-    char *db=args[1];
-    if (!db) {
-        db="Default";
-	strcat(outbuff,"Selecting database 'Default'\n");
-    }
+    char *db=defarg(args[1],DEFAULTDATABASE);
+	wrbuf_printf(outbuff,"Selecting database '%s'\n",db);
     return zebra_select_database(zh, db);
 }
  
-static int cmd_create_database( char *args[], char *outbuff)
+static int cmd_create_database( char *args[], WRBUF outbuff)
+{
+    char *db=defarg(args[1],DEFAULTDATABASE);
+    wrbuf_printf(outbuff,"Creating database '%s'\n",db);
+    
+    return zebra_create_database(zh, db);
+}
+
+static int cmd_drop_database( char *args[], WRBUF outbuff)
 {
     char *db=args[1];
     if (!db)
         db="Default";
-    strcat(outbuff,"Creating database ");
-    strcat(outbuff,db);
-    strcat(outbuff,"\n");
-	
-    return zebra_create_database(zh, db);
+    wrbuf_printf(outbuff,"Dropping database '%s'\n",db);
+    return zebra_drop_database(zh, db);
 }
 
-static int cmd_begin_trans( char *args[], char *outbuff)
+static int cmd_begin_trans( char *args[], WRBUF outbuff)
 {
     int rw=0;
     if (args[1] && ( (args[1][0]=='1') || (args[1][0]=='w') ))
         rw=1;
     return zebra_begin_trans(zh,rw);
 }
-static int cmd_end_trans( char *args[], char *outbuff)
+
+static int cmd_end_trans( char *args[], WRBUF outbuff)
 {
     return zebra_end_trans(zh);
 }
@@ -310,65 +340,126 @@ static int cmd_end_trans( char *args[], char *outbuff)
  * Inserting and deleting
  */
 
-static int cmd_record_insert( char *args[], char *outbuff)
+static int cmd_record_insert( char *args[], WRBUF outbuff)
 {
     int sysno=0;
-    char buf[MAX_ARG_LEN];
-    int i;
     int rc;
+    char *rec=restargs(args,1);
     
-    i=1;
-    buf[0]='\0';
-    while (args[i])
-    {
-	strcat(buf, args[i++]);
-	strcat(buf, " ");
-    }
-    rc=zebra_record_insert(zh,buf, strlen(buf), &sysno);
+    rc=zebra_record_insert(zh,rec, strlen(rec), &sysno);
     if (0==rc)
     {
-        sprintf(buf,"ok sysno=%d\n",sysno);
-	strcat(outbuff,buf);
+        wrbuf_printf(outbuff,"ok sysno=%d\n",sysno);
     }
     return rc;
 }
 
 
-static int cmd_exchange_record( char *args[], char *outbuff)
+static int cmd_exchange_record( char *args[], WRBUF outbuff)
 {
     char *base=args[1];
     char *id = args[2];
     char *action = args[3];
-    int i=4;
     int rc;
-    char buf[MAX_ARG_LEN];
+    char *rec=restargs(args,4);
     if (!(base && id && action && args[4] ))
     {
-	strcat(outbuff,"Missing arguments!\n");
+	wrbuf_puts(outbuff,"Missing arguments!\n");
 	onecommand("help exchange_record", outbuff, "");
 	return -90;
     }
-    while (args[i])
+    rc=zebra_admin_exchange_record(zh, base, rec, strlen(rec),
+        id, strlen(id), atoi(action));
+    return rc;
+}
+
+/**********************************
+ * Searching and retrieving
+ */
+
+static int cmd_search_pqf( char *args[], WRBUF outbuff)
+{
+    int hits=0;
+    char *set=args[1];
+    char *qry=restargs(args,2);
+    int rc;
+    rc=zebra_search_PQF(zh, qry, set, &hits);
+    if (0==rc)
+        wrbuf_printf(outbuff,"%d hits found\n",hits);
+    return rc;
+}
+
+static int cmd_find( char *args[], WRBUF outbuff)
+{
+    char *setname=DEFAULTRESULTSET;
+    int rc;
+    int hits=0;
+    WRBUF qry=wrbuf_alloc();
+    if (0==strstr(args[0],"@attr"))
+        wrbuf_puts(qry, "@attr 1=/ ");
+    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);
+    if (0==rc)
     {
-	strcat(buf, args[i++]);
-	strcat(buf, " ");
+        wrbuf_printf(outbuff,"%d hits found\n",hits);
+        nextrecno=1;
     }
-    rc=zebra_admin_exchange_record(zh, base, buf, strlen(buf),
-        id, strlen(id), atoi(action));
+    wrbuf_free(qry,1);
     return rc;
 }
 
+static int cmd_show( char *args[], WRBUF outbuff)
+{
+    int start=defargint(args[1], nextrecno);
+    int nrecs=defargint(args[2],1);
+    char *setname=defarg(args[3],DEFAULTRESULTSET);
+    int rc=0;
+    ZebraRetrievalRecord *recs;
+    ODR odr;
+    Z_RecordComposition *pcomp=0;
+    int i;
+    oid_value format;
+
+    odr=odr_createmem(ODR_ENCODE);
+    recs= odr_malloc(odr,sizeof(ZebraRetrievalRecord)*nrecs);
+    rc =z_RecordComposition(odr, &pcomp, 0,"recordComposition");
+    format=oid_getvalbyname ("xml"); /*FIXME - let the user specify*/
+    for (i=0;i<nrecs;i++)
+        recs[i].position=start+i;
 
+    rc = zebra_records_retrieve (zh, odr, setname,
+				 pcomp, format, nrecs,recs);
+    if (0==rc)
+    {
+        for (i=0;i<nrecs;i++)
+        {
+            printf("Err %d: %d\n",i,recs[i].errCode);
+            if (recs[i].buf)
+            {
+                wrbuf_printf(outbuff,"Record %d\n", recs[i].position);
+                wrbuf_write(outbuff, recs[i].buf, recs[i].len);
+                wrbuf_puts(outbuff, "\n");
+            } else
+                wrbuf_printf(outbuff,"NO Record %d\n", recs[i].position);
+        }
+        nextrecno=start+nrecs;
+    }
+    odr_destroy(odr);
+    return rc;
+}
 /**************************************)
  * Command table, parser, and help 
  */
 
 struct cmdstruct
 {
-    char * cmd;
-    char * args;
-    char * explanation;
-    int (*testfunc)(char *args[], char *outbuff);
+    char *cmd;
+    char *args;
+    char *explanation;
+    int (*testfunc)(char *args[], WRBUF outbuff);
 } ;
 
  
@@ -437,8 +528,11 @@ struct cmdstruct cmds[] = {
       "Selects a database",
       cmd_select_database},    
     { "create_database", "basename",
-      "Creates a database",
+      "Create database",
       cmd_create_database},
+    { "drop_database", "basename",
+      "Drop database",
+      cmd_drop_database},
     { "begin_trans", "[rw]",
       "Begins a transaction. rw=1 means write, otherwise read-only",
       cmd_begin_trans},
@@ -454,10 +548,29 @@ struct cmdstruct cmds[] = {
       "inserts (1), updates (2), or deletes (3) a record \n"
       "record-id must be a unique identifier for the record",
       cmd_exchange_record},
+    { "","Searching and retrieving:","",0},
+    { "search_pqf","setname query",
+      "search ",
+      cmd_search_pqf},
+    { "find","query",
+      "simplified search",
+      cmd_find},
+    { "f","query",
+      "simplified search",
+      cmd_find},
+    { "show","[start] [numrecs] [resultset]",
+      "shows a result",
+      cmd_show},
+    { "s","[start] [numrecs] [resultset]",
+      "shows a result",
+      cmd_show},
     { "", "Misc:","", 0}, 
     { "echo", "string", 
       "ouputs the string", 
       cmd_echo },
+    { "q", "", 
+      "exits the program", 
+      cmd_quit },
     { "quit", "", 
       "exits the program", 
       cmd_quit },
@@ -471,18 +584,19 @@ struct cmdstruct cmds[] = {
  
 int onecommand( 
 		char *line,     /* input line */
-		char *outbuff,  /* output goes here */
+		WRBUF outbuff,  /* output goes here */
 		const char *prevout) /* prev output, for 'expect' */
 {
     int i;
     char *args[MAX_NO_ARGS];
-    int n;
+    int nargs;
     char argbuf[MAX_ARG_LEN];
     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);
-
+    /*memset(args,'\0',MAX_NO_ARGS*sizeof(char *));*/
+    nargs=split_args(argbuf, args);
+    
 #if 0
     for (i = 0; i <= n; i++)
     {
@@ -490,20 +604,19 @@ int onecommand(
 	printf ("args %d :%s:\n", i, cp ? cp : "<null>");
     }
 #endif
-    if (0==n)
-	return -90; /* no command on line, too bad */
+    if (0==nargs)
+	    return -90; /* no command on line, too bad */
 
     if (0==strcmp(args[0],"expect")) 
     {
 	char *rest;
-        if (n>1)
+        if (nargs>1) /* args[0] is not yet set, can't use restargs */
             rest= line + (args[1]-argbuf); /* rest of the line */
         else
             return -1; /* need something to expect */
-	printf("expecting '%s'\n",rest); /*!*/
 	if (0==strstr(prevout,rest))
 	{
-	    printf( "Failed expectation, '%s' not found\n", res);
+	    printf( "Failed expectation, '%s' not found\n", rest);
             exit(9); 
 	}
 	return 0;
@@ -511,94 +624,78 @@ int onecommand(
     for (i=0;cmds[i].cmd;i++)
 	if (0==strcmp(cmds[i].cmd, args[0])) 
 	{
-	    if (n>1)
+	    if (nargs>1)
 		args[0]= line + (args[1]-argbuf); /* rest of the line */
 	    else
 		args[0]=""; 
 	    return ((cmds[i].testfunc)(args,outbuff));
 	}
-    strcat(outbuff, "Unknown command '");
-    strcat(outbuff,args[0] );
-    strcat(outbuff,"'. Try help");
+    wrbuf_printf(outbuff, "Unknown command '%s'. Try help\n",args[0]);
     logf(LOG_APP,"Unknown command");
     return -90; 
 }
  
-static int cmd_help( char *args[], char *outbuff)
+static int cmd_help( char *args[], WRBUF outbuff)
 { 
     int i;
-    char tmp[MAX_ARG_LEN];
+    int linelen;
     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");
+                wrbuf_printf(outbuff,"%s  %s\n%s\n",
+		             cmds[i].cmd, cmds[i].args, 
+			     cmds[i].explanation);
 		return 0;
 	    }
-	strcat(outbuff, "Unknown command ");
-	strcat(outbuff, args[1] );
+	wrbuf_printf(outbuff, "Unknown command '%s'", args[1]);
     }
     else 
     { /* list all commands */
-	strcpy(tmp,"    ");
+        linelen=9999;
 	for (i=0;cmds[i].cmd;i++)
-	    if (cmds[i].explanation)
-	    {
-		/* sprintf(tmp, "%s %s %s\n",
-		   cmds[i].cmd, cmds[i].args, cmds[i].explanation);
-		*/
-		strcat(tmp, cmds[i].cmd);
-		strcat(tmp,"  ");
-		if (!*cmds[i].cmd)
-		{
-		    strcat(outbuff, tmp);
-		    strcat(outbuff,"\n");
-		    strcpy(tmp,"    ");
-		    if (*cmds[i].args)
-		    {
-			strcat(outbuff, cmds[i].args);
-			strcat(outbuff,"\n");
-		    }
-		}
-		if (strlen(tmp)>50)
-		{
-		    strcat(outbuff,tmp);
-		    strcat(outbuff,"\n");
-		    strcpy(tmp,"    ");
-		}
-	    }
-	strcat(outbuff,tmp);
+        {
+            if (*cmds[i].cmd)
+            { /* ordinary command */
+                if (linelen>50)
+                {
+                    wrbuf_puts(outbuff,"\n   ");
+                    linelen=0;
+                }
+                linelen += strlen(cmds[i].cmd) + 2;
+                wrbuf_printf(outbuff,"%s ", cmds[i].cmd);
+            } else
+            { /* section head */
+                wrbuf_printf(outbuff,"\n%s\n   ",cmds[i].args);
+                linelen=0;
+            }
+	    } /* for */
+        wrbuf_puts(outbuff,"\n");
     }
     return 0;
 }
  
 /* If Zebra reports an error after an operation,
  * append it to the outbuff and log it */
-static void Zerrors ( char *outbuff)
+static void Zerrors ( WRBUF 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);
+	logf(LOG_APP, "   Zebra error %d: %s, (%s)",
+	     ec, zebra_errString (zh),
+	     zebra_errAdd (zh) );
+	wrbuf_printf(outbuff, "   Zebra error %d: %s, (%s)\n",
+		     ec, zebra_errString (zh),
+		     zebra_errAdd (zh) );
 	zebra_clearError(zh);
     }
 }
-  
+
 /************************************** 
  * The shell
  */
@@ -606,53 +703,66 @@ static void Zerrors ( char *outbuff)
 void shell()
 {
     int rc=0;
-    char tmp[MAX_ARG_LEN];
-    char outbuff[MAX_OUT_BUFF]="";
+    WRBUF outbuff=wrbuf_alloc();
     char prevout[MAX_OUT_BUFF]=""; /* previous output for 'expect' */
+    wrbuf_puts(outbuff,"Zebrash at your service");
     while (rc!=-99)
     {
+	char *nl_cp;
 	char buf[MAX_ARG_LEN];
+	char* line_in = 0;
 #if HAVE_READLINE_READLINE_H
-	char* line_in;
-	line_in=readline(PROMPT);
-	if (!line_in)
-	    break;
+	if (isatty(0)) {
+	    line_in=readline(PROMPT);
+	    if (!line_in)
+		break;
 #if HAVE_READLINE_HISTORY_H
-	if (*line_in)
-	    add_history(line_in);
+	    if (*line_in)
+		add_history(line_in);
+#endif
+	}
 #endif
-	if(strlen(line_in) > MAX_ARG_LEN-1) {
-	    fprintf(stderr,"Input line too long\n");
-	    break;
-	};
-	strcpy(buf,line_in);
-	free (line_in);
-#else    
+	/* line_in != NULL if readine is present and input is a tty */
+	
 	printf (PROMPT); 
 	fflush (stdout);
-	if (!fgets (buf, MAX_ARG_LEN-1, stdin))
-	    break; 
-#endif 
+	if (line_in)
+	{
+	    if(strlen(line_in) > MAX_ARG_LEN-1) {
+		fprintf(stderr,"Input line too long\n");
+		break;
+	    }
+	    strcpy(buf,line_in);
+	    free (line_in);
+	}
+	else 
+	{
+	    if (!fgets (buf, MAX_ARG_LEN-1, stdin))
+		break; 
+	}
 	
-	strncpy(prevout, outbuff, MAX_OUT_BUFF);
-	outbuff[0]='\0';
+	/* get rid of \n in line */
+	if ((nl_cp = strchr(buf, '\n')))
+	    *nl_cp = '\0';
+	strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
+        wrbuf_rewind(outbuff);
 	rc=onecommand(buf, outbuff, prevout);
 	if (rc==0)
 	{
-	    strcat(outbuff, "   OK\n");
+	    wrbuf_puts(outbuff, "   OK\n");
 	    logf(LOG_APP, "OK");
 	}
 	else if (rc>-90)
 	{
-	    sprintf(tmp, "   command returned %d\n",rc);
-	    strcat(outbuff,tmp);
+	    wrbuf_printf(outbuff, "   command returned %d\n",rc);
 	} 
 	Zerrors(outbuff);
-  	printf("%s\n", outbuff);
+	printf("%s\n", wrbuf_buf(outbuff));
     } /* while */
+    wrbuf_free(outbuff,1);
 } /* shell() */
-  
- 
+
+
 /**************************************
  * Main 
  */