X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frpn2cql.c;h=68b359af063d8f80ed9ad394121b117cc4ce9b2d;hb=e137416de024bcc37cc35ecae1ce2079f188ac41;hp=88c96a32a0336cac82b278a5b5252375107d9d0e;hpb=5f15a8d9071bf901861d332e7d512109df57bea3;p=yaz-moved-to-github.git diff --git a/src/rpn2cql.c b/src/rpn2cql.c index 88c96a3..68b359a 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ @@ -18,6 +18,11 @@ #include #include +static void wrbuf_vputs(const char *buf, void *client_data) +{ + wrbuf_write((WRBUF) client_data, buf, strlen(buf)); +} + static const char *lookup_index_from_string_attr(Z_AttributeList *attributes) { int j; @@ -153,9 +158,9 @@ static int rpn2cql_attr(cql_transform_t ct, } /* Bug 2878: Currently only support left and right truncation. Specific check for this */ -static int checkForTruncation(int flag, Z_AttributeList *attributes) { +static int checkForTruncation(int flag, Z_AttributeList *attributes) +{ int j; - int server_choice = 1; for (j = 0; j < attributes->num_attributes; j++) { Z_AttributeElement *ae = attributes->attributes[j]; @@ -163,10 +168,10 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes) { { if (ae->which == Z_AttributeValue_numeric) { - int truncation = *(ae->value.numeric); - /* This logic only works for Left, right and both. eg. 1,2,3 */ + Odr_int truncation = *(ae->value.numeric); + /* This logic only works for Left, right and both. eg. 1,2,3 */ if (truncation <= 3) - return (int) (truncation & flag); + return ((int) truncation & flag); } /* Complex: Shouldn't happen */ }