- if (!(zq->RPNStructure = rpn_structure (o, 0, 512, attr_array)))
+ if (query_look == 'r')
+ {
+ lex ();
+ topSet = query_oid_getvalbyname ();
+ if (topSet == VAL_NONE)
+ return NULL;
+
+ lex ();
+ }
+ if (topSet == VAL_NONE)
+ topSet = p_query_dfset;
+ if (topSet == VAL_NONE)
+ topSet = VAL_BIB1;
+ oset.proto = proto;
+ oset.oclass = CLASS_ATTSET;
+ oset.value = topSet;
+
+ zq->attributeSetId = odr_oiddup (o, oid_getoidbyent (&oset));
+
+ if (!(zq->RPNStructure = rpn_structure (o, proto, 0, 512,
+ attr_array, attr_set)))