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
Update expected MARC result due to upd message
[yaz-moved-to-github.git]
/
src
/
cqltransform.c
diff --git
a/src/cqltransform.c
b/src/cqltransform.c
index
3846685
..
de777d0
100644
(file)
--- a/
src/cqltransform.c
+++ b/
src/cqltransform.c
@@
-1,5
+1,5
@@
/* 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-2010 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-106,7
+106,7
@@
static int cql_transform_parse_tok_line(cql_transform_t ct,
wrbuf_puts(type_str, yaz_tok_parse_string(tp));
t = yaz_tok_move(tp);
}
wrbuf_puts(type_str, yaz_tok_parse_string(tp));
t = yaz_tok_move(tp);
}
- elem->attributeType = nmem_longintdup(ct->nmem, 0);
+ elem->attributeType = nmem_intdup(ct->nmem, 0);
if (sscanf(wrbuf_cstr(type_str), ODR_INT_PRINTF, elem->attributeType)
!= 1)
{
if (sscanf(wrbuf_cstr(type_str), ODR_INT_PRINTF, elem->attributeType)
!= 1)
{
@@
-140,7
+140,7
@@
static int cql_transform_parse_tok_line(cql_transform_t ct,
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =
- nmem_longintdup(ct->nmem, atoi(value_str));
+ nmem_intdup(ct->nmem, atoi(value_str));
}
else
{
}
else
{
@@
-350,7
+350,7
@@
const char *cql_lookup_reverse(cql_transform_t ct,
}
if (i == e->attr_list.num_attributes)
}
if (i == e->attr_list.num_attributes)
- return e->pattern;
+ return e->pattern + clen;
}
}
return 0;
}
}
return 0;
@@
-435,7
+435,7
@@
int cql_pr_attr_uri(cql_transform_t ct, const char *category,
int i;
while (*cp1 && *cp1 != ' ')
cp1++;
int i;
while (*cp1 && *cp1 != ' ')
cp1++;
- if (cp1 - cp0 >= sizeof(buf))
+ if (cp1 - cp0 >= (ptrdiff_t) sizeof(buf))
break;
memcpy(buf, cp0, cp1 - cp0);
buf[cp1-cp0] = 0;
break;
memcpy(buf, cp0, cp1 - cp0);
buf[cp1-cp0] = 0;