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
RPN to CQL: always quote resulting terms
[yaz-moved-to-github.git]
/
src
/
rpn2cql.c
diff --git
a/src/rpn2cql.c
b/src/rpn2cql.c
index
9fedba6
..
43f09ec
100644
(file)
--- a/
src/rpn2cql.c
+++ b/
src/rpn2cql.c
@@
-194,7
+194,6
@@
static int rpn2cql_simple(cql_transform_t ct,
size_t lterm = 0;
Odr_int trunc = lookup_truncation(apt->attributes);
size_t i;
size_t lterm = 0;
Odr_int trunc = lookup_truncation(apt->attributes);
size_t i;
- int must_quote = 0;
wrbuf_rewind(w);
ret = rpn2cql_attr(ct, apt->attributes, w);
wrbuf_rewind(w);
ret = rpn2cql_attr(ct, apt->attributes, w);
@@
-222,10
+221,7
@@
static int rpn2cql_simple(cql_transform_t ct,
for (i = 0 ; i < lterm; i++)
if (strchr(" ()=></", sterm[i]))
break;
for (i = 0 ; i < lterm; i++)
if (strchr(" ()=></", sterm[i]))
break;
- if (i < lterm || lterm == 0)
- must_quote = 1;
- if (must_quote)
- wrbuf_puts(w, "\"");
+ 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++)
@@
-258,8
+254,7
@@
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
{
}
else
{