X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=51a09cdeb8c6c608a1783b0f72bfdd163e0bdf17;hb=23b1af194b14847f3ba187e3c5c3015797ad3c4a;hp=bd42f93684a265db7acbe7289cf9a8b175b515f4;hpb=b4c71713ff8400d7b6eb211c9c2ed23adb04fded;p=idzebra-moved-to-github.git

diff --git a/index/zebrash.c b/index/zebrash.c
index bd42f93..51a09cd 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,5 +1,5 @@
-/* $Id: zebrash.c,v 1.23 2003-11-21 15:30:16 heikki Exp $
-   Copyright (C) 2002,2003
+/* $Id: zebrash.c,v 1.25 2004-01-22 11:27:21 adam Exp $
+   Copyright (C) 2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -28,6 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <string.h> 
 #include <ctype.h>
+#include <unistd.h>  /* for isatty */
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
@@ -39,6 +40,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "zebraapi.h"
 #include <yaz/log.h>
 #include <yaz/proto.h>
+#include <yaz/sortspec.h>
 #include <yaz/wrbuf.h>
 
 #define MAX_NO_ARGS 32
@@ -161,7 +163,7 @@ static int cmd_zebra_start( char *args[], WRBUF outbuff)
 		   DEFAULTCONFIG "\n" );
 	conf=DEFAULTCONFIG;
     }
-    zs=zebra_start(conf);
+    zs=zebra_start(conf, 0, 0);
     if (!zs) {
 	wrbuf_puts(outbuff, "zebra_start failed" );
 	return 2;
@@ -346,7 +348,13 @@ static int cmd_record_insert( char *args[], WRBUF outbuff)
     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));
     if (0==rc)
     {
         wrbuf_printf(outbuff,"ok sysno=%d\n",sysno);
@@ -357,18 +365,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;
 }
@@ -449,7 +456,52 @@ static int cmd_show( char *args[], WRBUF outbuff)
     }
     odr_destroy(odr);
     return rc;
-}
+} /* cmd_show */
+
+static int cmd_sort( char *args[], WRBUF outbuff)
+{
+    int rc=0;
+    ODR odr;
+    int sortstatus=0;
+    Z_SortKeySpecList *spec=0;
+    const char * inpsets[]={ DEFAULTRESULTSET, 0};
+    /* FIXME - allow the user to specify result sets in/out */
+
+    odr=odr_createmem(ODR_ENCODE);
+    spec=yaz_sort_spec (odr, restargs(args,1));
+    if (!spec)
+        rc=1;
+    if (!rc)
+        rc=zebra_sort(zh, odr,
+                        1, inpsets,
+                        DEFAULTRESULTSET,
+                        spec,
+                        &sortstatus);
+    if (!rc)
+        wrbuf_printf(outbuff, "sort returned status %d\n",sortstatus);
+
+    odr_destroy(odr);
+    return rc;
+} /* cmd_sort */
+/*
+ *
+ * int bend_sort (void *handle, bend_sort_rr *rr)
+ * {
+ *     ZebraHandle zh = (ZebraHandle) handle;
+ *
+ *     zebra_sort (zh, rr->stream,
+ *                     rr->num_input_setnames, (const char **)
+ *                     rr->input_setnames,
+ *                     rr->output_setname,
+ *                     rr->sort_sequence,
+ *                     &rr->sort_status);
+ *     zebra_result (zh, &rr->errcode,
+ *                  &rr->errstring);
+ *     return 0;
+ *  }
+ *
+ */
+
 /**************************************)
  * Command table, parser, and help 
  */
@@ -548,6 +600,7 @@ 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 ",
@@ -564,6 +617,10 @@ struct cmdstruct cmds[] = {
     { "s","[start] [numrecs] [resultset]",
       "shows a result",
       cmd_show},
+    { "sort","sortspec",
+      "sorts a result set. (example spec: 1=4 >)",
+      cmd_sort},
+      
     { "", "Misc:","", 0}, 
     { "echo", "string", 
       "ouputs the string",