- /* FIXME - Can we just skip this ??? */
- /*
- zebra_resultSetTerms (zh, r->setname, i,
- &count, &type, outbuf, &len);
- */
- sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements));
- sr->elements[i]->subqueryId = 0;
- sr->elements[i]->fullQuery = odr_malloc (r->stream,
- sizeof(bool_t));
- *sr->elements[i]->fullQuery = 0;
- sr->elements[i]->subqueryExpression =
+ const char *term_ref_id = 0;
+
+ zebra_result_set_term_info(zh, r->setname, i,
+ &count, &approx, outbuf, &len,
+ &term_ref_id);
+ se = sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements));
+ se->subqueryId = term_ref_id ?
+ odr_strdup(r->stream, term_ref_id) : 0;
+
+ se->fullQuery = odr_intdup(r->stream, 0);
+ se->subqueryExpression =