- return rpn_term (o, proto, num_attr, attr_list, attr_set);
+ return rpn_term (li, o, proto, num_attr, attr_list, attr_set);
+}
+
+Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
+ Odr_oid **attributeSetP,
+ const char *qbuf)
+{
+ struct lex_info li;
+
+ li.left_sep = "{\"";
+ li.right_sep = "}\"";
+ li.escape_char = '@';
+ li.query_buf = qbuf;
+
+ return p_query_scan_mk (&li, o, proto, attributeSetP, qbuf);