projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around a bug in ucol_getSortKey
[yaz-moved-to-github.git]
/
src
/
rpn2cql.c
diff --git
a/src/rpn2cql.c
b/src/rpn2cql.c
index
88c96a3
..
b1063a1
100644
(file)
--- a/
src/rpn2cql.c
+++ b/
src/rpn2cql.c
@@
-1,13
+1,14
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file
* \brief Implements RPN to CQL conversion
/**
* \file
* \brief Implements RPN to CQL conversion
- *
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
@@
-18,6
+19,11
@@
#include <yaz/z-core.h>
#include <yaz/wrbuf.h>
#include <yaz/z-core.h>
#include <yaz/wrbuf.h>
+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;
static const char *lookup_index_from_string_attr(Z_AttributeList *attributes)
{
int j;
@@
-153,9
+159,9
@@
static int rpn2cql_attr(cql_transform_t ct,
}
/* Bug 2878: Currently only support left and right truncation. Specific check for this */
}
/* 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 j;
- int server_choice = 1;
for (j = 0; j < attributes->num_attributes; j++)
{
Z_AttributeElement *ae = attributes->attributes[j];
for (j = 0; j < attributes->num_attributes; j++)
{
Z_AttributeElement *ae = attributes->attributes[j];
@@
-163,10
+169,10
@@
static int checkForTruncation(int flag, Z_AttributeList *attributes) {
{
if (ae->which == Z_AttributeValue_numeric)
{
{
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)
if (truncation <= 3)
- return (int) (truncation & flag);
+ return ((int) truncation & flag);
}
/* Complex: Shouldn't happen */
}
}
/* Complex: Shouldn't happen */
}
@@
-176,11
+182,11
@@
static int checkForTruncation(int flag, Z_AttributeList *attributes) {
};
static int checkForLeftTruncation(Z_AttributeList *attributes) {
};
static int checkForLeftTruncation(Z_AttributeList *attributes) {
- return checkForTruncation(1, attributes);
+ return checkForTruncation(2, attributes);
}
static int checkForRightTruncation(Z_AttributeList *attributes) {
}
static int checkForRightTruncation(Z_AttributeList *attributes) {
- return checkForTruncation(2, attributes);
+ return checkForTruncation(1, attributes);
};
static int rpn2cql_simple(cql_transform_t ct,
};
static int rpn2cql_simple(cql_transform_t ct,