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 4.2.7
[yaz-moved-to-github.git]
/
src
/
cqltransform.c
diff --git
a/src/cqltransform.c
b/src/cqltransform.c
index
a07894e
..
3163775
100644
(file)
--- a/
src/cqltransform.c
+++ b/
src/cqltransform.c
@@
-23,7
+23,6
@@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/rpn2cql.h>
#include <yaz/xmalloc.h>
#include <yaz/diagsrw.h>
#include <yaz/rpn2cql.h>
#include <yaz/xmalloc.h>
#include <yaz/diagsrw.h>
@@
-138,7
+137,7
@@
static int cql_transform_parse_tok_line(cql_transform_t ct,
break;
}
value_str = yaz_tok_parse_string(tp);
break;
}
value_str = yaz_tok_parse_string(tp);
- if (isdigit(*value_str))
+ if (yaz_isdigit(*value_str))
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =
@@
-735,7
+734,7
@@
static void emit_term(cql_transform_t ct,
}
(*pr)("\"", client_data);
}
(*pr)("\"", client_data);
- for (i = 0; i<length; i++)
+ for (i = 0; i < length; i++)
{
/* pr(int) each character */
/* we do not need to deal with \-sequences because the
{
/* pr(int) each character */
/* we do not need to deal with \-sequences because the
@@
-877,7
+876,9
@@
void cql_transform_r(cql_transform_t ct,
cql_transform_r(ct, cn->u.boolean.left, pr, client_data);
cql_transform_r(ct, cn->u.boolean.right, pr, client_data);
break;
cql_transform_r(ct, cn->u.boolean.left, pr, client_data);
cql_transform_r(ct, cn->u.boolean.right, pr, client_data);
break;
-
+ case CQL_NODE_SORT:
+ cql_transform_r(ct, cn->u.sort.search, pr, client_data);
+ break;
default:
fprintf(stderr, "Fatal: impossible CQL node-type %d\n", cn->which);
abort();
default:
fprintf(stderr, "Fatal: impossible CQL node-type %d\n", cn->which);
abort();
@@
-913,7
+914,8
@@
int cql_transform_FILE(cql_transform_t ct, struct cql_node *cn, FILE *f)
return cql_transform(ct, cn, cql_fputs, f);
}
return cql_transform(ct, cn, cql_fputs, f);
}
-int cql_transform_buf(cql_transform_t ct, struct cql_node *cn, char *out, int max)
+int cql_transform_buf(cql_transform_t ct, struct cql_node *cn,
+ char *out, int max)
{
struct cql_buf_write_info info;
int r;
{
struct cql_buf_write_info info;
int r;