/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
- * Revision 1.17 1997-11-24 11:33:57 adam
+ * Revision 1.20 1998-03-31 15:13:20 adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.19 1998/03/05 08:09:03 adam
+ * Minor change to make C++ happy.
+ *
+ * Revision 1.18 1998/02/11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.17 1997/11/24 11:33:57 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set);
-static int query_oid_getvalbyname (struct lex_info *li)
+static enum oid_value query_oid_getvalbyname (struct lex_info *li)
{
char buf[32];
Z_AttributesPlusTerm *zapt;
Odr_oct *term_octet;
Z_Term *term;
+ Z_AttributeElement **elements;
- zapt = odr_malloc (o, sizeof(*zapt));
- term_octet = odr_malloc (o, sizeof(*term_octet));
- term = odr_malloc (o, sizeof(*term));
+ zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
+ term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
+ term = (Z_Term *)odr_malloc (o, sizeof(*term));
- zapt->num_attributes = num_attr;
- if (num_attr)
+ if (!num_attr)
+ elements = (Z_AttributeElement**)odr_nullval();
+ else
{
int i;
int *attr_tmp;
- zapt->attributeList = odr_malloc (o, num_attr *
- sizeof(*zapt->attributeList));
+ elements = (Z_AttributeElement**)
+ odr_malloc (o, num_attr * sizeof(*elements));
- attr_tmp = odr_malloc (o, num_attr * 2 * sizeof(int));
+ attr_tmp = (int *)odr_malloc (o, num_attr * 2 * sizeof(int));
memcpy (attr_tmp, attr_list, num_attr * 2 * sizeof(int));
for (i = 0; i < num_attr; i++)
{
- zapt->attributeList[i] =
- odr_malloc (o,sizeof(**zapt->attributeList));
- zapt->attributeList[i]->attributeType = &attr_tmp[2*i];
+ elements[i] =
+ (Z_AttributeElement*)odr_malloc (o,sizeof(**elements));
+ elements[i]->attributeType = &attr_tmp[2*i];
#ifdef Z_95
if (attr_set[i] == VAL_NONE)
- zapt->attributeList[i]->attributeSet = 0;
+ elements[i]->attributeSet = 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_ent_to_oid (&attrid, oid));
+ elements[i]->attributeSet =
+ 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];
+ elements[i]->which = Z_AttributeValue_numeric;
+ elements[i]->value.numeric = &attr_tmp[2*i+1];
#else
- zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1];
+ elements[i]->attributeValue = &attr_tmp[2*i+1];
#endif
}
}
- else
- zapt->attributeList = odr_nullval();
+#ifdef ASN_COMPILED
+ zapt->attributes = (Z_AttributeList *)
+ odr_malloc (o, sizeof(*zapt->attributes));
+ zapt->attributes->num_attributes = num_attr;
+ zapt->attributes->attributes = elements;
+#else
+ zapt->num_attributes = num_attr;
+ zapt->attributeList = elements;
+#endif
+
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
- term_octet->buf = odr_malloc (o, li->lex_len);
+ term_octet->buf = (unsigned char *)odr_malloc (o, li->lex_len);
term_octet->size = term_octet->len = li->lex_len;
memcpy (term_octet->buf, li->lex_buf, li->lex_len);
return zapt;
{
Z_Operand *zo;
- zo = odr_malloc (o, sizeof(*zo));
+ zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
switch (li->query_look)
{
case 't':
if (!li->query_look)
return NULL;
zo->which = Z_Operand_resultSetId;
- zo->u.resultSetId = odr_malloc (o, li->lex_len+1);
+ zo->u.resultSetId = (char *)odr_malloc (o, li->lex_len+1);
memcpy (zo->u.resultSetId, li->lex_buf, li->lex_len);
zo->u.resultSetId[li->lex_len] = '\0';
lex (li);
static Z_ProximityOperator *rpn_proximity (struct lex_info *li, ODR o)
{
- Z_ProximityOperator *p = odr_malloc (o, sizeof(*p));
+ Z_ProximityOperator *p = (Z_ProximityOperator *)odr_malloc (o, sizeof(*p));
if (!lex (li))
return NULL;
if (*li->lex_buf == '1')
{
- p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
+ p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 1;
}
else if (*li->lex_buf == '0')
{
- p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
+ p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 0;
}
else
if (!lex (li))
return NULL;
- p->distance = odr_malloc (o, sizeof(*p->distance));
+ p->distance = (int *)odr_malloc (o, sizeof(*p->distance));
*p->distance = atoi (li->lex_buf);
if (!lex (li))
return NULL;
- p->ordered = odr_malloc (o, sizeof(*p->ordered));
+ p->ordered = (int *)odr_malloc (o, sizeof(*p->ordered));
*p->ordered = atoi (li->lex_buf);
if (!lex (li))
return NULL;
- p->relationType = odr_malloc (o, sizeof(*p->relationType));
+ p->relationType = (int *)odr_malloc (o, sizeof(*p->relationType));
*p->relationType = atoi (li->lex_buf);
if (!lex (li))
if (!lex (li))
return NULL;
- p->proximityUnitCode = odr_malloc (o, sizeof(*p->proximityUnitCode));
+#ifdef ASN_COMPILED
+ p->which = Z_ProximityOperator_known;
+ p->u.known = (int *)odr_malloc (o, sizeof(*p->u.known));
+ *p->u.known = atoi (li->lex_buf);
+#else
+ p->proximityUnitCode = (int *)odr_malloc (o, sizeof(*p->proximityUnitCode));
*p->proximityUnitCode = atoi (li->lex_buf);
-
+#endif
return p;
}
Z_Complex *zc;
Z_Operator *zo;
- zc = odr_malloc (o, sizeof(*zc));
- zo = odr_malloc (o, sizeof(*zo));
+ zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
+ zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
zc->roperator = zo;
switch (li->query_look)
{
Z_RPNStructure *sz;
const char *cp;
- sz = odr_malloc (o, sizeof(*sz));
+ sz = (Z_RPNStructure *)odr_malloc (o, sizeof(*sz));
switch (li->query_look)
{
case 'a':
oident oset;
int oid[OID_SIZE];
- zq = odr_malloc (o, sizeof(*zq));
+ zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
lex (li);
if (li->query_look == 'r')
{
projects / yaz-moved-to-github.git / blobdiff