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
For GFS, allow field record in bend_fetch_rr to hold NULL - meaning
[yaz-moved-to-github.git]
/
src
/
pquery.c
diff --git
a/src/pquery.c
b/src/pquery.c
index
f85e837
..
5ddd11a
100644
(file)
--- a/
src/pquery.c
+++ b/
src/pquery.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: pquery.c,v 1.2 2004-10-15 00:19:00 adam Exp $
+ * $Id: pquery.c,v 1.5 2005-01-15 19:47:14 adam Exp $
*/
/**
* \file pquery.c
*/
/**
* \file pquery.c
@@
-80,7
+80,7
@@
static int query_token (struct yaz_pqf_parser *li)
}
li->lex_buf = *qptr;
}
li->lex_buf = *qptr;
- if (**qptr == li->escape_char && isdigit ((*qptr)[1]))
+ if (**qptr == li->escape_char && isdigit (((const unsigned char *) *qptr)[1]))
{
++(li->lex_len);
++(*qptr);
{
++(li->lex_len);
++(*qptr);
@@
-400,15
+400,9
@@
static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
return NULL;
}
if (*li->lex_buf == '1')
return NULL;
}
if (*li->lex_buf == '1')
- {
- p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
- *p->exclusion = 1;
- }
+ p->exclusion = odr_intdup (o, 1);
else if (*li->lex_buf == '0')
else if (*li->lex_buf == '0')
- {
- p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
- *p->exclusion = 0;
- }
+ p->exclusion = odr_intdup (o, 0);
else
p->exclusion = NULL;
else
p->exclusion = NULL;
@@
-417,24
+411,21
@@
static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->distance = (int *)odr_malloc (o, sizeof(*p->distance));
- *p->distance = atoi (li->lex_buf);
+ p->distance = odr_intdup (o, atoi(li->lex_buf));
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->ordered = (int *)odr_malloc (o, sizeof(*p->ordered));
- *p->ordered = atoi (li->lex_buf);
+ p->ordered = odr_intdup (o, atoi (li->lex_buf));
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->relationType = (int *)odr_malloc (o, sizeof(*p->relationType));
- *p->relationType = atoi (li->lex_buf);
+ p->relationType = odr_intdup (o, atoi (li->lex_buf));
if (!lex (li))
{
if (!lex (li))
{
@@
-442,9
+433,9
@@
static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
return NULL;
}
if (*li->lex_buf == 'k')
return NULL;
}
if (*li->lex_buf == 'k')
- p->which = 0;
+ p->which = Z_ProximityOperator_known;
else if (*li->lex_buf == 'p')
else if (*li->lex_buf == 'p')
- p->which = 1;
+ p->which = Z_ProximityOperator_private;
else
p->which = atoi (li->lex_buf);
else
p->which = atoi (li->lex_buf);
@@
-453,9
+444,7
@@
static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->which = Z_ProximityOperator_known;
- p->u.known = (int *)odr_malloc (o, sizeof(*p->u.known));
- *p->u.known = atoi (li->lex_buf);
+ p->u.known = odr_intdup (o, atoi(li->lex_buf));
return p;
}
return p;
}
@@
-643,8
+632,7
@@
Z_RPNQuery *p_query_rpn_mk (ODR o, struct yaz_pqf_parser *li, oid_proto proto,
return zq;
}
return zq;
}
-Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto,
- const char *qbuf)
+Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf)
{
struct yaz_pqf_parser li;
{
struct yaz_pqf_parser li;