Implemented utility yaz_sort_spec.

diff --git a/client/client.c b/client/client.c
index 00819c2..774a08b 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,413 +2,7 @@
  * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  *
- * $Log: client.c,v $
- * Revision 1.126  2001-08-06 20:22:23  adam
- * Client doesn't set VAL_PROXY otherinfo unless -p is specified.
- *
- * Revision 1.125  2001/07/19 19:51:41  adam
- * Added typecasts to make C++ happy.
- *
- * Revision 1.124  2001/07/04 20:13:51  ja7
- * Added new commend "proxy" for ysing a yaz-proxy to connect to the target
- * Added new command line option -p for setting the proxy host
- *
- * Revision 1.123  2001/06/11 12:54:47  heikki
- * Displayng diags in EsResponse, even if they should not be there...
- *
- * Revision 1.122  2001/05/16 07:27:29  adam
- * Reference id set for InitRequest.
- *
- * Revision 1.121  2001/04/22 12:26:17  ja7
- * if Compiled with Command line history a open command is pushed into
- * the command history if yaz-client is startet with a server on the
- * command line. eg
- *   yaz-clinet tcp:server:port/database
- * hash the commend
- *   open tcp:server:port/database
- * in the command history on startup
- *
- * Added the refid set with setrefid to the update APDU
- *
- * Revision 1.120  2001/04/06 12:26:46  adam
- * Optional CCL module. Moved atoi_n to marcdisp.h from yaz-util.h.
- *
- * Revision 1.119  2001/04/05 13:08:48  adam
- * New configure options: --enable-module.
- *
- * Revision 1.118  2001/03/27 14:48:06  adam
- * Fixed scan for bad CCL.
- *
- * Revision 1.117  2001/03/25 21:55:12  adam
- * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
- *
- * Revision 1.116  2001/03/21 12:43:36  adam
- * Implemented cs_create_host. Better error reporting for SSL comstack.
- *
- * Revision 1.115  2001/03/13 18:10:58  adam
- * Added option -c to set CCL config file.
- *
- * Revision 1.114  2001/02/21 13:46:53  adam
- * C++ fixes.
- *
- * Revision 1.113  2001/02/21 09:41:15  adam
- * Fixed problem with old codecs.
- *
- * Revision 1.112  2001/02/20 11:25:32  adam
- * Added ill_get_APDU and ill_get_Cancel.
- *
- * Revision 1.111  2001/01/30 15:52:48  ja7
- * added command for setting packageName in ES packages!
- * command is named packagename default is NULL for server suplyed package name
- *
- * Revision 1.110  2001/01/29 11:19:05  adam
- * Clients prints options in InitResponse.
- *
- * Revision 1.109  2001/01/22 10:41:47  adam
- * Multiple attribute may be specified for sorging.
- *
- * Revision 1.108  2000/11/23 10:58:32  adam
- * SSL comstack support. Separate POSIX thread support library.
- *
- * Revision 1.107  2000/11/16 13:11:07  adam
- * Changed because ccl_rpn_query sets attribute set.
- *
- * Revision 1.106  2000/11/13 09:44:59  adam
- * Work on SCAN: RPN2CCL conversion and proper "next" scan.
- *
- * Revision 1.105  2000/10/02 11:07:44  adam
- * Added peer_name member for bend_init handler. Changed the YAZ
- * client so that tcp: can be avoided in target spec.
- *
- * Revision 1.104  2000/09/04 08:58:15  adam
- * Added prefix yaz_ for most logging utility functions.
- *
- * Revision 1.103  2000/08/10 08:41:26  adam
- * Fixes for ILL.
- *
- * Revision 1.102  2000/05/18 11:57:04  adam
- * Client display time elapsed.
- *
- * Revision 1.101  2000/04/05 07:39:54  adam
- * Added shared library support (libtool).
- *
- * Revision 1.100  2000/03/20 19:29:59  adam
- * Minor change.
- *
- * Revision 1.99  2000/03/20 19:06:25  adam
- * Added Segment request for fronend server. Work on admin for client.
- *
- * Revision 1.98  2000/03/16 13:55:49  ian
- * Added commands for sending shutdown and startup admin requests via the admin ES.
- *
- * Revision 1.97  2000/03/14 14:06:04  ian
- * Minor change to order of debugging output for send_apdu,
- * fixed encoding of admin request.
- *
- * Revision 1.96  2000/03/14 09:27:07  ian
- * Added code to enable sending of admin extended service requests
- *
- * Revision 1.95  2000/02/28 11:20:05  adam
- * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
- *
- * Revision 1.94  2000/01/31 13:15:21  adam
- * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
- * that some characters are not surrounded by spaces in resulting term.
- * ILL-code updates.
- *
- * Revision 1.93  2000/01/15 09:39:50  adam
- * Implemented ill_get_ILLRequest. More ILL testing for client.
- *
- * Revision 1.92  1999/12/21 16:24:48  adam
- * More robust ISO2709 handling (in case of real bad formats).
- *
- * Revision 1.91  1999/12/16 23:36:19  adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.90  1999/11/30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.89  1999/11/04 14:58:44  adam
- * Added status elements for backend delete result set handler.
- * Updated delete result result set command for client.
- *
- * Revision 1.88  1999/10/11 10:00:29  adam
- * Modified printing of records.
- *
- * Revision 1.87  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.86  1999/07/06 12:13:35  adam
- * Added "schema" command.
- *
- * Revision 1.85  1999/06/16 11:55:24  adam
- * Added APDU log to client.
- *
- * Revision 1.84  1999/06/01 14:29:11  adam
- * Work on Extended Services.
- *
- * Revision 1.83  1999/05/26 15:24:26  adam
- * Fixed minor bugs regarding DB Update (introduced by previous commit).
- *
- * Revision 1.82  1999/05/26 13:49:12  adam
- * DB Update implemented in client (very basic).
- *
- * Revision 1.81  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.80  1999/03/31 11:18:24  adam
- * Implemented odr_strdup. Added Reference ID to backend server API.
- *
- * Revision 1.79  1999/03/23 14:14:25  adam
- * Yet another fix.
- *
- * Revision 1.78  1999/03/18 12:57:18  adam
- * Minor fix.
- *
- * Revision 1.77  1999/03/11 15:26:51  adam
- * Fixed bug (introduced by previous commit).
- *
- * Revision 1.76  1999/03/11 11:12:07  adam
- * Added GNU readline support. HTML display in client.
- *
- * Revision 1.75  1999/02/01 15:37:32  adam
- * Fixed minor bug introduced by previous commit.
- *
- * Revision 1.74  1999/02/01 15:35:21  adam
- * Added XML display.
- *
- * Revision 1.73  1998/10/20 13:55:43  quinn
- * Fixed Scan bug in asn and client
- *
- * Revision 1.72  1998/10/20 13:23:15  quinn
- * changed preferred pos to 1
- *
- * Revision 1.71  1998/10/20 13:21:43  adam
- * Fixed scan response handler.
- *
- * Revision 1.70  1998/09/22 09:40:37  adam
- * Minor changes in sort spec.
- *
- * Revision 1.69  1998/08/19 16:10:06  adam
- * Changed som member names of DeleteResultSetRequest/Response.
- *
- * Revision 1.68  1998/07/20 12:37:06  adam
- * Added 'delete <resultset>' command. Changed open command so that
- * it reconnects if already connected.
- *
- * Revision 1.67  1998/06/09 13:55:06  adam
- * Minor changes.
- *
- * Revision 1.66  1998/05/18 13:06:53  adam
- * Changed the way attribute sets are handled by the retriaval module.
- * Extended Explain conversion / schema.
- * Modified server and client to work with ASN.1 compiled protocol handlers.
- *
- * Revision 1.65  1998/03/31 15:13:19  adam
- * Development towards compiled ASN.1.
- *
- * Revision 1.64  1998/03/31 11:07:44  adam
- * Furhter work on UNIverse resource report.
- * Added Extended Services handling in frontend server.
- *
- * Revision 1.63  1998/03/05 08:05:10  adam
- * Added a few casts to make C++ happy.
- *
- * Revision 1.62  1998/02/11 11:53:33  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.61  1998/02/10 11:03:06  adam
- * Implemented command refid. Client prints reference-ID's, when present,
- * in responses.
- *
- * Revision 1.60  1998/01/29 14:08:52  adam
- * Better sort diagnostics.
- *
- * Revision 1.59  1998/01/29 13:17:56  adam
- * Added sort.
- *
- * Revision 1.58  1998/01/07 13:51:45  adam
- * Minor change.
- *
- * Revision 1.57  1998/01/07 12:58:22  adam
- * Using fgets instead of gets.
- *
- * Revision 1.56  1997/11/05 09:18:31  adam
- * The client handles records with no associated syntax.
- *
- * Revision 1.55  1997/10/31 12:20:08  adam
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
- *
- * Revision 1.54  1997/10/27 13:52:46  adam
- * Header yaz-util includes all YAZ utility header files.
- *
- * Revision 1.53  1997/09/29 13:18:59  adam
- * Added function, oid_ent_to_oid, to replace the function
- * oid_getoidbyent, which is not thread safe.
- *
- * Revision 1.52  1997/09/29 07:20:31  adam
- * Client code uses nmem_init.
- *
- * Revision 1.51  1997/09/26 09:41:55  adam
- * Updated client to handle multiple diagnostics.
- *
- * Revision 1.50  1997/09/17 12:10:29  adam
- * YAZ version 1.4.
- *
- * Revision 1.49  1997/09/04 13:45:17  adam
- * Added UNImarc to list of available syntaxes.
- *
- * Revision 1.48  1997/09/01 08:48:44  adam
- * New windows NT/95 port using MSV5.0. Only a few changes made
- * to avoid warnings. Sub project created: client.dsp.
- *
- * Revision 1.47  1997/07/01 13:49:56  adam
- * Take care of case when invalid target is specified on command line.
- *
- * Revision 1.46  1997/06/23 10:30:18  adam
- * Added call to ccl_rpn_delete in search. Added ODR stream "out"
- * as parameter to ccl_rpn_query to release RPN query.
- *
- * Revision 1.45  1997/05/14 06:53:29  adam
- * C++ support.
- *
- * Revision 1.44  1997/05/05 11:20:35  adam
- * Client uses "options" utility and marc dump filename may be specified
- * as an option (-m <file>).
- *
- * Revision 1.43  1996/11/08 11:03:26  adam
- * Client accepts multiple database names.
- *
- * Revision 1.42  1996/10/08 10:44:57  quinn
- * Resolved conflicts.
- *
- * Revision 1.41  1996/10/07  15:29:03  quinn
- * Work
- *
- * Revision 1.40  1996/08/29  14:19:34  quinn
- * Fixed conflict (CVS)
- *
- * Revision 1.39  1996/08/27  10:43:22  quinn
- * Made select() optional
- *
- * Revision 1.38  1996/08/12  14:09:11  adam
- * Default prefix query attribute set defined by using p_query_attset.
- *
- * Revision 1.37  1996/07/06  19:58:29  quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.36  1996/06/10  08:53:47  quinn
- * Added Summary
- *
- * Revision 1.35  1996/06/03  09:45:50  quinn
- * Added display of OIDs in the GRS routine.
- *
- * Revision 1.34  1996/05/09  07:26:49  quinn
- * *** empty log message ***
- *
- * Revision 1.33  1996/05/09  07:25:22  quinn
- * Small
- *
- * Revision 1.32  1996/03/15  11:05:33  adam
- * The user can set the preferred query type (prefix, ccl, ..) with the
- * querytype command.
- *
- * Revision 1.31  1996/02/20  12:51:54  quinn
- * Fixed problems with EXTERNAL.
- *
- * Revision 1.30  1996/02/12  18:18:09  quinn
- * Fidgeting.
- *
- * Revision 1.29  1996/01/02  08:57:25  quinn
- * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
- *
- * Revision 1.28  1995/12/14  11:09:31  quinn
- * Added Explain record syntax to the format command.
- *
- * Revision 1.27  1995/12/12  16:37:02  quinn
- * Added destroy element to data1_node.
- *
- * Revision 1.26  1995/12/12  14:11:00  quinn
- * Minimal.
- *
- * Revision 1.25  1995/11/13  09:27:22  quinn
- * Fiddling with the variant stuff.
- *
- * Revision 1.24  1995/10/30  12:41:13  quinn
- * Added hostname lookup for server.
- *
- * Revision 1.23  1995/10/18  16:12:30  quinn
- * Better diagnostics.
- *
- * Revision 1.22  1995/10/11  14:49:12  quinn
- * Smallish.
- *
- * Revision 1.21  1995/09/29  17:01:47  quinn
- * More Windows work
- *
- * Revision 1.20  1995/08/29  14:24:13  quinn
- * Added second half of close-handshake
- *
- * Revision 1.19  1995/08/29  11:17:28  quinn
- * Added code to receive close
- *
- * Revision 1.18  1995/08/28  12:21:27  quinn
- * Client can now ask for simple element set names.
- *
- * Revision 1.17  1995/08/17  12:45:02  quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.16  1995/08/15  12:00:04  quinn
- * Updated External
- *
- * Revision 1.15  1995/06/22  09:28:03  quinn
- * Fixed bug in SUTRS processing.
- *
- * Revision 1.14  1995/06/19  12:37:41  quinn
- * Added BER dumper.
- *
- * Revision 1.13  1995/06/16  10:29:11  quinn
- * *** empty log message ***
- *
- * Revision 1.12  1995/06/15  07:44:57  quinn
- * Moving to v3.
- *
- * Revision 1.11  1995/06/14  15:26:40  quinn
- * *** empty log message ***
- *
- * Revision 1.10  1995/06/06  14:56:58  quinn
- * Better diagnostics.
- *
- * Revision 1.9  1995/06/06  08:15:19  quinn
- * Cosmetic.
- *
- * Revision 1.8  1995/06/05  10:52:22  quinn
- * Added SCAN.
- *
- * Revision 1.7  1995/06/02  09:50:09  quinn
- * Smallish.
- *
- * Revision 1.6  1995/05/31  08:29:21  quinn
- * Nothing significant.
- *
- * Revision 1.5  1995/05/29  08:10:47  quinn
- * Moved oid.c to util.
- *
- * Revision 1.4  1995/05/22  15:30:13  adam
- * Client uses prefix query notation.
- *
- * Revision 1.3  1995/05/22  15:06:53  quinn
- * *** empty log message ***
- *
- * Revision 1.2  1995/05/22  14:56:40  quinn
- * *** empty log message ***
- *
- * Revision 1.1  1995/05/22  11:30:31  quinn
- * Added prettier client.
- *
+ * $Id: client.c,v 1.127 2001-08-08 19:35:06 adam Exp $
  *
  */
 
@@ -434,6 +28,7 @@
 #include <yaz/otherinfo.h>
 
 #include <yaz/pquery.h>
+#include <yaz/sortspec.h>
 
 #if YAZ_MODULE_ill
 #include <yaz/ill.h>
@@ -1992,10 +1587,6 @@ int send_sortrequest(char *arg, int newset)
     Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
         odr_malloc (out, sizeof(*sksl));
     char setstring[32];
-    char sort_string_buf[32], sort_flags[32];
-    int off;
-    int oid[OID_SIZE];
-    oident bib1;
 
     if (setnumber >= 0)
         sprintf (setstring, "%d", setnumber);
@@ -2024,105 +1615,8 @@ int send_sortrequest(char *arg, int newset)
 
     req->sortedResultSetName = odr_strdup (out, setstring);
 
-    req->sortSequence = sksl;
-    sksl->num_specs = 0;
-    sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20);
-    
-    bib1.proto = protocol;
-    bib1.oclass = CLASS_ATTSET;
-    bib1.value = VAL_BIB1;
-    while ((sscanf (arg, "%31s %31s%n", sort_string_buf, sort_flags, &off)) == 2 
-           && off > 1)
-    {
-        int i;
-        char *sort_string_sep;
-       char *sort_string = sort_string_buf;
-        Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks));
-        Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk));
-
-        arg += off;
-        sksl->specs[sksl->num_specs++] = sks;
-        sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement));
-        sks->sortElement->which = Z_SortElement_generic;
-        sks->sortElement->u.generic = sk;
-        
-        if ((sort_string_sep = strchr (sort_string, '=')))
-        {
-           int i = 0;
-            sk->which = Z_SortKey_sortAttributes;
-            sk->u.sortAttributes =
-                (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes));
-            sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid);
-            sk->u.sortAttributes->list =
-                (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
-            sk->u.sortAttributes->list->attributes =
-                (Z_AttributeElement **)
-               odr_malloc (out, 10 *
-                           sizeof(*sk->u.sortAttributes->list->attributes));
-           while (i < 10 && sort_string && sort_string_sep)
-           {
-               Z_AttributeElement *el = (Z_AttributeElement *)
-                   odr_malloc (out, sizeof(*el));
-               sk->u.sortAttributes->list->attributes[i] = el;
-               el->attributeSet = 0;
-               el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType));
-               *el->attributeType = atoi (sort_string);
-               el->which = Z_AttributeValue_numeric;
-               el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric));
-               *el->value.numeric = atoi (sort_string_sep + 1);
-               i++;
-               sort_string = strchr(sort_string, ',');
-               if (sort_string)
-               {
-                   sort_string++;
-                   sort_string_sep = strchr (sort_string, '=');
-               }
-           }
-            sk->u.sortAttributes->list->num_attributes = i;
-        }
-        else
-        {
-            sk->which = Z_SortKey_sortField;
-            sk->u.sortField = odr_strdup (out, sort_string);
-        }
-        sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation));
-        *sks->sortRelation = Z_SortRelation_ascending;
-        sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity));
-        *sks->caseSensitivity = Z_SortCase_caseSensitive;
-
-#ifdef ASN_COMPILED
-        sks->which = Z_SortKeySpec_null;
-        sks->u.null = odr_nullval ();
-#else
-        sks->missingValueAction = NULL;
-#endif
-
-        for (i = 0; sort_flags[i]; i++)
-        {
-            switch (sort_flags[i])
-            {
-            case 'a':
-            case 'A':
-            case '>':
-                *sks->sortRelation = Z_SortRelation_descending;
-                break;
-            case 'd':
-            case 'D':
-            case '<':
-                *sks->sortRelation = Z_SortRelation_ascending;
-                break;
-            case 'i':
-            case 'I':
-                *sks->caseSensitivity = Z_SortCase_caseInsensitive;
-                break;
-            case 'S':
-            case 's':
-                *sks->caseSensitivity = Z_SortCase_caseSensitive;
-                break;
-            }
-        }
-    }
-    if (!sksl->num_specs)
+    req->sortSequence = yaz_sort_spec (out, arg);
+    if (!req->sortSequence)
     {
         printf ("Missing sort specifications\n");
         return -1;

diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am
index 89d7fcf..1e3e301 100644 (file)
--- a/include/yaz/Makefile.am
+++ b/include/yaz/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.10 2001-05-16 07:37:39 adam Exp $
+## $Id: Makefile.am,v 1.11 2001-08-08 19:35:06 adam Exp $
 
 pkginclude_HEADERS= backend.h ccl.h comstack.h \
- d1_attset.h d1_map.h data1.h diagbib1.h \
+ d1_attset.h d1_map.h data1.h diagbib1.h sortspec.h \
  log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h \
  pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h \
  yaz-ccl.h yaz-util.h yaz-version.h yaz-date.h yconfig.h proto.h \

diff --git a/include/yaz/sortspec.h b/include/yaz/sortspec.h
new file mode 100644 (file)
index 0000000..98a63e0
--- /dev/null
+++ b/include/yaz/sortspec.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1995-2001, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Id: sortspec.h,v 1.1 2001-08-08 19:35:06 adam Exp $
+ */
+
+#ifndef SORTSPEC_H
+#define SORTSPEC_H
+
+#include <yaz/yconfig.h>
+#include <yaz/proto.h>
+
+YAZ_BEGIN_CDECL
+
+YAZ_EXPORT Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg);
+
+YAZ_END_CDECL
+
+#endif
+

diff --git a/zutil/Makefile.am b/zutil/Makefile.am
index 221a0c0..6f65e69 100644 (file)
--- a/zutil/Makefile.am
+++ b/zutil/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.6 2001-08-08 19:35:06 adam Exp $
 noinst_LTLIBRARIES = libzutil.la
 
 INCLUDES=-I$(top_srcdir)/include 
@@ -6,4 +6,4 @@ INCLUDES=-I$(top_srcdir)/include
 LIBS =
 
 libzutil_la_SOURCES = zget.c prt-ext.c yaz-ccl.c diagbib1.c logrpn.c \
-  otherinfo.c pquery.c
+  otherinfo.c pquery.c sortspec.c

diff --git a/zutil/sortspec.c b/zutil/sortspec.c
new file mode 100644 (file)
index 0000000..c421fcb
--- /dev/null
+++ b/zutil/sortspec.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1995-2001, Index Data.
+ * See the file LICENSE for details.
+ *
+ * $Id: sortspec.c,v 1.1 2001-08-08 19:35:06 adam Exp $
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/sortspec.h>
+
+Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg)
+{
+    int oid[OID_SIZE];
+    oident bib1;
+    char sort_string_buf[32], sort_flags[32];
+    Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
+        odr_malloc (out, sizeof(*sksl));
+    int off;
+    
+    sksl->num_specs = 0;
+    sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20);
+    
+    bib1.proto = PROTO_Z3950;
+    bib1.oclass = CLASS_ATTSET;
+    bib1.value = VAL_BIB1;
+    while ((sscanf (arg, "%31s %31s%n", sort_string_buf,
+                   sort_flags, &off)) == 2  && off > 1)
+    {
+        int i;
+        char *sort_string_sep;
+       char *sort_string = sort_string_buf;
+        Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks));
+        Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk));
+       
+        arg += off;
+        sksl->specs[sksl->num_specs++] = sks;
+        sks->sortElement = (Z_SortElement *)
+           odr_malloc (out, sizeof(*sks->sortElement));
+        sks->sortElement->which = Z_SortElement_generic;
+        sks->sortElement->u.generic = sk;
+        
+        if ((sort_string_sep = strchr (sort_string, '=')))
+        {
+           int i = 0;
+            sk->which = Z_SortKey_sortAttributes;
+            sk->u.sortAttributes = (Z_SortAttributes *)
+               odr_malloc (out, sizeof(*sk->u.sortAttributes));
+            sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid);
+            sk->u.sortAttributes->list = (Z_AttributeList *)
+               odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
+            sk->u.sortAttributes->list->attributes = (Z_AttributeElement **)
+               odr_malloc (out, 10 * 
+                           sizeof(*sk->u.sortAttributes->list->attributes));
+           while (i < 10 && sort_string && sort_string_sep)
+           {
+               Z_AttributeElement *el = (Z_AttributeElement *)
+                   odr_malloc (out, sizeof(*el));
+               sk->u.sortAttributes->list->attributes[i] = el;
+               el->attributeSet = 0;
+               el->attributeType = odr_intdup (out, atoi (sort_string));
+               el->which = Z_AttributeValue_numeric;
+               el->value.numeric =
+                   odr_intdup (out, atoi (sort_string_sep + 1));
+               i++;
+               sort_string = strchr(sort_string, ',');
+               if (sort_string)
+               {
+                   sort_string++;
+                   sort_string_sep = strchr (sort_string, '=');
+               }
+           }
+            sk->u.sortAttributes->list->num_attributes = i;
+        }
+        else
+        {
+            sk->which = Z_SortKey_sortField;
+            sk->u.sortField = odr_strdup (out, sort_string);
+        }
+        sks->sortRelation = odr_intdup (out, Z_SortRelation_ascending);
+        sks->caseSensitivity = odr_intdup (out, Z_SortCase_caseSensitive);
+
+#ifdef ASN_COMPILED
+        sks->which = Z_SortKeySpec_null;
+        sks->u.null = odr_nullval ();
+#else
+        sks->missingValueAction = NULL;
+#endif
+       
+        for (i = 0; sort_flags[i]; i++)
+        {
+            switch (sort_flags[i])
+            {
+            case 'a':
+            case 'A':
+            case '>':
+                *sks->sortRelation = Z_SortRelation_descending;
+                break;
+            case 'd':
+            case 'D':
+            case '<':
+                *sks->sortRelation = Z_SortRelation_ascending;
+                break;
+            case 'i':
+            case 'I':
+                *sks->caseSensitivity = Z_SortCase_caseInsensitive;
+                break;
+            case 'S':
+            case 's':
+                *sks->caseSensitivity = Z_SortCase_caseSensitive;
+                break;
+            }
+        }
+    }
+    if (!sksl->num_specs)
+       return 0;
+    return sksl;
+}