* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
- * Revision 1.13 1997-09-17 12:10:42 adam
+ * Revision 1.17 1997-11-24 11:33:57 adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.16 1997/09/29 13:19:00 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.15 1997/09/29 07:13:43 adam
+ * Changed type of a few variables to avoid warnings.
+ *
+ * Revision 1.14 1997/09/22 12:33:41 adam
+ * Fixed bug introduced by previous commit.
+ *
+ * Revision 1.13 1997/09/17 12:10:42 adam
* YAZ version 1.4.
*
* Revision 1.12 1997/09/01 08:54:13 adam
struct lex_info {
const char *query_buf;
const char *lex_buf;
- int lex_len;
+ size_t lex_len;
int query_look;
char *left_sep;
char *right_sep;
return oid_getvalbyname (buf);
}
-static int compare_term (struct lex_info *li, const char *src, int off)
+static int compare_term (struct lex_info *li, const char *src, size_t off)
{
size_t len=strlen(src);
- if (li->lex_len == len && !memcmp (li->lex_buf+off, src, len-off))
+ if (li->lex_len == len+off && !memcmp (li->lex_buf+off, src, len-off))
return 1;
return 0;
}
else
{
oident attrid;
+ int oid[OID_SIZE];
attrid.proto = PROTO_Z3950;
attrid.oclass = CLASS_ATTSET;
attrid.value = attr_set[i];
zapt->attributeList[i]->attributeSet =
- odr_oiddup (o, oid_getoidbyent (&attrid));
+ odr_oiddup (o, oid_ent_to_oid (&attrid, oid));
}
zapt->attributeList[i]->which = Z_AttributeValue_numeric;
zapt->attributeList[i]->value.numeric = &attr_tmp[2*i+1];
}
}
else
- zapt->attributeList = ODR_NULLVAL;
+ zapt->attributeList = odr_nullval();
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
{
case 'a':
zo->which = Z_Operator_and;
- zo->u.and = ODR_NULLVAL;
+ zo->u.and = odr_nullval();
break;
case 'o':
zo->which = Z_Operator_or;
- zo->u.and = ODR_NULLVAL;
+ zo->u.and = odr_nullval();
break;
case 'n':
zo->which = Z_Operator_and_not;
- zo->u.and = ODR_NULLVAL;
+ zo->u.and = odr_nullval();
break;
case 'p':
zo->which = Z_Operator_prox;
if (num_attr >= max_attr)
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
- (cp-li->lex_buf) > li->lex_len)
+ (size_t) (cp-li->lex_buf) > li->lex_len)
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);
oid_value attr_set[512];
oid_value topSet = VAL_NONE;
oident oset;
+ int oid[OID_SIZE];
zq = odr_malloc (o, sizeof(*zq));
lex (li);
oset.oclass = CLASS_ATTSET;
oset.value = topSet;
- zq->attributeSetId = odr_oiddup (o, oid_getoidbyent (&oset));
+ zq->attributeSetId = odr_oiddup (o, oid_ent_to_oid (&oset, oid));
if (!(zq->RPNStructure = rpn_structure (li, o, proto, 0, 512,
attr_array, attr_set)))
const char *cp;
oid_value topSet = VAL_NONE;
oident oset;
+ int oid[OID_SIZE];
lex (li);
if (li->query_look == 'r')
oset.oclass = CLASS_ATTSET;
oset.value = topSet;
- *attributeSetP = odr_oiddup (o, oid_getoidbyent (&oset));
+ *attributeSetP = odr_oiddup (o, oid_ent_to_oid (&oset, oid));
while (li->query_look == 'l')
{
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
- (cp-li->lex_buf) > li->lex_len)
+ (size_t) (cp-li->lex_buf) > li->lex_len)
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);