X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fpquery.c;h=f842788a6664768b313a754610936d9aeede2a7d;hp=f2b0d4facd78bc7dfa5b68f8f8eb0d3d32875052;hb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;hpb=fd5d2db3eb371d4af60e2d50d1c7e6fb2d4e64c3 diff --git a/util/pquery.c b/util/pquery.c index f2b0d4f..f842788 100644 --- a/util/pquery.c +++ b/util/pquery.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: pquery.c,v $ - * Revision 1.3 1995-06-14 11:06:35 adam + * Revision 1.6 1995-09-27 15:03:03 quinn + * Modified function heads & prototypes. + * + * Revision 1.5 1995/06/15 12:31:02 quinn + * *** empty log message *** + * + * Revision 1.4 1995/06/15 07:45:19 quinn + * Moving to v3. + * + * Revision 1.3 1995/06/14 11:06:35 adam * Bug fix: Attributes wasn't interpreted correctly! * * Revision 1.2 1995/05/26 08:56:11 adam @@ -115,7 +124,13 @@ static Z_AttributesPlusTerm *rpn_term (ODR o, int num_attr, int *attr_list) zapt->attributeList[i] = odr_malloc (o,sizeof(**zapt->attributeList)); zapt->attributeList[i]->attributeType = &attr_tmp[2*i]; +#ifdef Z_95 + zapt->attributeList[i]->attributeSet = 0; + zapt->attributeList[i]->which = Z_AttributeValue_numeric; + zapt->attributeList[i]->value.numeric = &attr_tmp[2*i+1]; +#else zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1]; +#endif } } else @@ -233,7 +248,7 @@ static Z_RPNStructure *rpn_structure (ODR o, int num_attr, int max_attr, return sz; } -Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf) +Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf) { Z_RPNQuery *zq; int attr_array[1024]; @@ -247,7 +262,7 @@ Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf) return zq; } -Z_AttributesPlusTerm *p_query_scan (ODR o, const char *qbuf) +Z_AttributesPlusTerm MDF *p_query_scan (ODR o, const char *qbuf) { int attr_list[1024]; int num_attr = 0;