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
Version 2.4.8
[yaz-moved-to-github.git]
/
src
/
rpn2cql.c
diff --git
a/src/rpn2cql.c
b/src/rpn2cql.c
index
851a452
..
8dc40f5
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-2010 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;
@@
-152,8
+158,7
@@
static int rpn2cql_attr(cql_transform_t ct,
return 0;
}
return 0;
}
-/* Bug 2878: Currently only support left and right truncation. Specific check for this */
-static int checkForTruncation(int flag, Z_AttributeList *attributes)
+static Odr_int lookup_truncation(Z_AttributeList *attributes)
{
int j;
for (j = 0; j < attributes->num_attributes; j++)
{
int j;
for (j = 0; j < attributes->num_attributes; j++)
@@
-162,27
+167,13
@@
static int checkForTruncation(int flag, Z_AttributeList *attributes)
if (*ae->attributeType == 5) /* truncation attribute */
{
if (ae->which == Z_AttributeValue_numeric)
if (*ae->attributeType == 5) /* truncation attribute */
{
if (ae->which == Z_AttributeValue_numeric)
- {
- 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);
- }
- /* Complex: Shouldn't happen */
+ return *(ae->value.numeric);
}
}
}
}
- /* No truncation or unsupported */
+ /* No truncation specified */
return 0;
};
return 0;
};
-static int checkForLeftTruncation(Z_AttributeList *attributes) {
- return checkForTruncation(1, attributes);
-}
-
-static int checkForRightTruncation(Z_AttributeList *attributes) {
- return checkForTruncation(2, attributes);
-};
-
static int rpn2cql_simple(cql_transform_t ct,
void (*pr)(const char *buf, void *client_data),
void *client_data,
static int rpn2cql_simple(cql_transform_t ct,
void (*pr)(const char *buf, void *client_data),
void *client_data,
@@
-226,17
+217,23
@@
static int rpn2cql_simple(cql_transform_t ct,
{
size_t i;
int must_quote = 0;
{
size_t i;
int must_quote = 0;
+ Odr_int trunc = lookup_truncation(apt->attributes);
+
+ if (trunc > 3 && trunc != 100)
+ {
+ cql_transform_set_error(
+ ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0);
+ ret = -1;
+ }
for (i = 0 ; i < lterm; i++)
if (sterm[i] == ' ')
must_quote = 1;
if (must_quote)
wrbuf_puts(w, "\"");
for (i = 0 ; i < lterm; i++)
if (sterm[i] == ' ')
must_quote = 1;
if (must_quote)
wrbuf_puts(w, "\"");
- /* Bug 2878: Check and add Truncation */
- if (checkForLeftTruncation(apt->attributes))
+ if (trunc == 2 || trunc == 3)
wrbuf_puts(w, "*");
wrbuf_write(w, sterm, lterm);
wrbuf_puts(w, "*");
wrbuf_write(w, sterm, lterm);
- /* Bug 2878: Check and add Truncation */
- if (checkForRightTruncation(apt->attributes))
+ if (trunc == 1 || trunc == 3)
wrbuf_puts(w, "*");
if (must_quote)
wrbuf_puts(w, "\"");
wrbuf_puts(w, "*");
if (must_quote)
wrbuf_puts(w, "\"");