Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest const *sr_req)
{
+#ifdef Z_SRW_query_type_cql
if ((sr_req->query_type == Z_SRW_query_type_cql && !sr_req->query.cql))
{
yaz_add_srw_diagnostic(odr_en,
"PQF query is empty");
return false;
}
+#else
+ if (!sr_req->query)
+ {
+ yaz_add_srw_diagnostic(odr_en,
+ &(sru_pdu_res->u.response->diagnostics),
+ &(sru_pdu_res->u.response->num_diagnostics),
+ YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED,
+ "query");
+ yaz_add_srw_diagnostic(odr_en,
+ &(sru_pdu_res->u.response->diagnostics),
+ &(sru_pdu_res->u.response->num_diagnostics),
+ YAZ_SRW_QUERY_SYNTAX_ERROR,
+ "CQL query is empty");
+ return false;
+ }
+#endif
return true;
}
else
os << " -";
+#ifdef Z_SRW_query_type_cql
switch (sr->query_type){
case Z_SRW_query_type_cql:
os << " CQL";
os << " " << sr->query.pqf;
break;
}
+#else
+ os << " " << (sr->queryType ? sr->queryType : "cql")
+ << " " << sr->query;
+#endif
}
}
break;