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
daemon: exit monitor process for SIG{HUP,TERM,USR1}
[yaz-moved-to-github.git]
/
src
/
rpn2cql.c
diff --git
a/src/rpn2cql.c
b/src/rpn2cql.c
index
aef1cfd
..
1866442
100644
(file)
--- a/
src/rpn2cql.c
+++ b/
src/rpn2cql.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-192,11
+192,13
@@
static int rpn2cql_simple(cql_transform_t ct,
Z_Term *term = apt->term;
const char *sterm = 0;
size_t lterm = 0;
Z_Term *term = apt->term;
const char *sterm = 0;
size_t lterm = 0;
+ Odr_int trunc = lookup_truncation(apt->attributes);
+ size_t i;
wrbuf_rewind(w);
ret = rpn2cql_attr(ct, apt->attributes, w);
wrbuf_rewind(w);
ret = rpn2cql_attr(ct, apt->attributes, w);
- switch(term->which)
+ switch (term->which)
{
case Z_Term_general:
lterm = term->u.general->len;
{
case Z_Term_general:
lterm = term->u.general->len;
@@
-210,27
+212,16
@@
static int rpn2cql_simple(cql_transform_t ct,
lterm = strlen(sterm);
break;
default:
lterm = strlen(sterm);
break;
default:
- ret = -1;
cql_transform_set_error(ct, YAZ_BIB1_TERM_TYPE_UNSUPP, 0);
cql_transform_set_error(ct, YAZ_BIB1_TERM_TYPE_UNSUPP, 0);
+ return -1;
}
}
- if (term)
+ if (trunc <= 3 || trunc == 100 || trunc == 102 || trunc == 104)
{
{
- size_t i;
- int must_quote = 0;
- Odr_int trunc = lookup_truncation(apt->attributes);
-
- if (trunc > 3 && trunc != 100 && trunc != 102)
- {
- cql_transform_set_error(
- ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0);
- ret = -1;
- }
for (i = 0 ; i < lterm; i++)
if (strchr(" ()=></", sterm[i]))
for (i = 0 ; i < lterm; i++)
if (strchr(" ()=></", sterm[i]))
- must_quote = 1;
- if (must_quote)
- wrbuf_puts(w, "\"");
+ break;
+ wrbuf_puts(w, "\"");
if (trunc == 2 || trunc == 3)
wrbuf_puts(w, "*");
for (i = 0; i < lterm; i++)
if (trunc == 2 || trunc == 3)
wrbuf_puts(w, "*");
for (i = 0; i < lterm; i++)
@@
-249,6
+240,10
@@
static int rpn2cql_simple(cql_transform_t ct,
}
else if (trunc == 102 && sterm[i] == '.')
wrbuf_putc(w, '?');
}
else if (trunc == 102 && sterm[i] == '.')
wrbuf_putc(w, '?');
+ else if (trunc == 104 && sterm[i] == '?')
+ wrbuf_putc(w, '*');
+ else if (trunc == 104 && sterm[i] == '#')
+ wrbuf_putc(w, '?');
else if (strchr("*?\"", sterm[i]))
{
wrbuf_putc(w, '\\');
else if (strchr("*?\"", sterm[i]))
{
wrbuf_putc(w, '\\');
@@
-259,8
+254,13
@@
static int rpn2cql_simple(cql_transform_t ct,
}
if (trunc == 1 || trunc == 3)
wrbuf_puts(w, "*");
}
if (trunc == 1 || trunc == 3)
wrbuf_puts(w, "*");
- if (must_quote)
- wrbuf_puts(w, "\"");
+ wrbuf_puts(w, "\"");
+ }
+ else
+ {
+ cql_transform_set_error(
+ ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0);
+ ret = -1;
}
if (ret == 0)
pr(wrbuf_cstr(w), client_data);
}
if (ret == 0)
pr(wrbuf_cstr(w), client_data);
@@
-280,6
+280,7
@@
static int rpn2cql_structure(cql_transform_t ct,
else
{
Z_Operator *op = q->u.complex->roperator;
else
{
Z_Operator *op = q->u.complex->roperator;
+ Z_ProximityOperator *prox;
int r;
if (nested)
int r;
if (nested)
@@
-301,7
+302,7
@@
static int rpn2cql_structure(cql_transform_t ct,
break;
case Z_Operator_prox: {
pr(" prox", client_data);
break;
case Z_Operator_prox: {
pr(" prox", client_data);
- Z_ProximityOperator *prox = op->u.prox;
+ prox = op->u.prox;
/* No way to express Odr_bool *exclusion -- ignore it */
if (prox->distance) {
char buf[21]; /* Enough for any 64-bit int */
/* No way to express Odr_bool *exclusion -- ignore it */
if (prox->distance) {
char buf[21]; /* Enough for any 64-bit int */