X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsortspec.c;h=76e0f2fa6f549d65aba63adf35a327aff7887632;hp=7b5d09668d797cee55f70a71ec30c530ecf347d6;hb=9b2f4955aee1fcee3702bcd832dbaf7fca7243ad;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505 diff --git a/src/sortspec.c b/src/sortspec.c index 7b5d096..76e0f2f 100644 --- a/src/sortspec.c +++ b/src/sortspec.c @@ -1,40 +1,42 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: sortspec.c,v 1.5 2005-06-25 15:46:05 adam Exp $ */ /** * \file sortspec.c * \brief Implements SortSpec parsing. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include -#include -#include +#include #include +#include +#include -Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) +Z_SortKeySpecList *yaz_sort_spec(ODR out, const char *arg) { - char sort_string_buf[32], sort_flags[32]; + char sort_string_buf[64], sort_flags[64]; 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); + sksl->specs = (Z_SortKeySpec **)odr_malloc(out, sizeof(sksl->specs) * 20); - while ((sscanf (arg, "%31s %31s%n", sort_string_buf, - sort_flags, &off)) == 2 && off > 1) + while ((sscanf(arg, "%63s %63s%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)); + 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; @@ -43,18 +45,17 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) sks->sortElement->which = Z_SortElement_generic; sks->sortElement->u.generic = sk; - if ((sort_string_sep = strchr (sort_string, '='))) + 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 = - yaz_oidval_to_z3950oid(out, CLASS_ATTSET, VAL_BIB1); + odr_malloc(out, sizeof(*sk->u.sortAttributes)); + sk->u.sortAttributes->id = odr_oiddup(out, yaz_oid_attset_bib_1); sk->u.sortAttributes->list = (Z_AttributeList *) - odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); + odr_malloc(out, sizeof(*sk->u.sortAttributes->list)); sk->u.sortAttributes->list->attributes = (Z_AttributeElement **) - odr_malloc (out, 10 * + odr_malloc(out, 10 * sizeof(*sk->u.sortAttributes->list->attributes)); while (i < 10 && sort_string && sort_string_sep) { @@ -62,16 +63,16 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) odr_malloc (out, sizeof(*el)); sk->u.sortAttributes->list->attributes[i] = el; el->attributeSet = 0; - el->attributeType = odr_intdup (out, atoi (sort_string)); + el->attributeType = odr_intdup(out, atoi(sort_string)); el->which = Z_AttributeValue_numeric; el->value.numeric = - odr_intdup (out, atoi (sort_string_sep + 1)); + odr_intdup(out, odr_atoi(sort_string_sep + 1)); i++; sort_string = strchr(sort_string, ','); if (sort_string) { sort_string++; - sort_string_sep = strchr (sort_string, '='); + sort_string_sep = strchr(sort_string, '='); } } sk->u.sortAttributes->list->num_attributes = i; @@ -81,8 +82,8 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) sk->which = Z_SortKey_sortField; sk->u.sortField = odr_strdup (out, sort_string); } - sks->sortRelation = odr_intdup (out, Z_SortKeySpec_ascending); - sks->caseSensitivity = odr_intdup (out, Z_SortKeySpec_caseSensitive); + sks->sortRelation = odr_intdup(out, Z_SortKeySpec_ascending); + sks->caseSensitivity = odr_intdup(out, Z_SortKeySpec_caseInsensitive); sks->which = Z_SortKeySpec_null; sks->u.null = odr_nullval (); @@ -109,6 +110,20 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) case 's': *sks->caseSensitivity = Z_SortKeySpec_caseSensitive; break; + case '!': + sks->which = Z_SortKeySpec_abort; + sks->u.abort = odr_nullval(); + break; + case '=': + sks->which = Z_SortKeySpec_missingValueData; + sks->u.missingValueData = (Odr_oct*) + odr_malloc(out, sizeof(Odr_oct)); + i++; + sks->u.missingValueData->len = strlen(sort_flags+i); + sks->u.missingValueData->size = sks->u.missingValueData->len; + sks->u.missingValueData->buf = (unsigned char*) + odr_strdup(out, sort_flags+i); + i += strlen(sort_flags+i); } } } @@ -116,9 +131,113 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) return 0; return sksl; } + +int yaz_sort_spec_to_cql(Z_SortKeySpecList *sksl, WRBUF w) +{ + int i; + for (i = 0; i < sksl->num_specs; i++) + { + Z_SortKeySpec *sks = sksl->specs[i]; + Z_SortKey *sk; + + if (sks->sortElement->which != Z_SortElement_generic) + return -1; + + sk = sks->sortElement->u.generic; + if (i) + wrbuf_puts(w, " "); + else + wrbuf_puts(w, " SORTBY "); + if (sk->which == Z_SortKey_sortAttributes) + return -1; + else if (sk->which == Z_SortKey_sortField) + wrbuf_puts(w, sk->u.sortField); + switch (*sks->sortRelation) + { + case Z_SortKeySpec_ascending: + wrbuf_puts(w, "/ascending"); + break; + case Z_SortKeySpec_descending: + wrbuf_puts(w, "/descending"); + break; + } + switch (*sks->caseSensitivity) + { + case Z_SortKeySpec_caseSensitive: + wrbuf_puts(w, "/respectCase"); + break; + case Z_SortKeySpec_caseInsensitive: + wrbuf_puts(w, "/ignoreCase"); + break; + } + switch (sks->which) + { + case Z_SortKeySpec_null: + break; + case Z_SortKeySpec_abort: + wrbuf_puts(w, "/missingFail"); + break; + case Z_SortKeySpec_missingValueData: + wrbuf_puts(w, "/missingValue="); + wrbuf_write(w, (const char *) sks->u.missingValueData->buf, + sks->u.missingValueData->len); + } + } + return 0; +} + +int yaz_sort_spec_to_type7(Z_SortKeySpecList *sksl, WRBUF pqf) +{ + int i; + for (i = 0; i < sksl->num_specs; i++) + { + Z_SortKeySpec *sks = sksl->specs[i]; + Z_SortKey *sk; + + if (sks->sortElement->which != Z_SortElement_generic) + return -1; + + sk = sks->sortElement->u.generic; + + wrbuf_insert(pqf, 0, "@or ", 4); + + if (sk->which == Z_SortKey_sortAttributes) + { + int j; + for (j = 0; j < sk->u.sortAttributes->list->num_attributes; j++) + { + Z_AttributeElement *el = + sk->u.sortAttributes->list->attributes[j]; + if (el->which != Z_AttributeValue_numeric) + return -1; + wrbuf_printf(pqf, " @attr " ODR_INT_PRINTF "=" ODR_INT_PRINTF, + *el->attributeType, *el->value.numeric); + } + } + else if (sk->which == Z_SortKey_sortField) + { + wrbuf_puts(pqf, " @attr 1="); + wrbuf_puts(pqf, sk->u.sortField); + } + switch (*sks->sortRelation) + { + case Z_SortKeySpec_ascending: + wrbuf_puts(pqf, " @attr 7=1 "); + break; + case Z_SortKeySpec_descending: + wrbuf_puts(pqf, " @attr 7=2 "); + break; + } + wrbuf_printf(pqf, "%d", i); + } + return 0; +} + + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab