Clean up checks for YAZ version in code MP-609

[metaproxy-moved-to-github.git] / src / sru_util.cpp

diff --git a/src/sru_util.cpp b/src/sru_util.cpp
index d9e8730..1e3090e 100644 (file)
--- a/src/sru_util.cpp
+++ b/src/sru_util.cpp
@@ -275,40 +275,6 @@ mp_util::check_sru_query_exists(mp::Package &package,
                                 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,
-                               &(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;
-    }
-    if ((sr_req->query_type == Z_SRW_query_type_xcql && !sr_req->query.xcql))
-    {
-        yaz_add_srw_diagnostic(odr_en,
-                               &(sru_pdu_res->u.response->diagnostics),
-                               &(sru_pdu_res->u.response->num_diagnostics),
-                               YAZ_SRW_QUERY_SYNTAX_ERROR,
-                               "XCQL query is empty");
-        return false;
-    }
-    if ((sr_req->query_type == Z_SRW_query_type_pqf && !sr_req->query.pqf))
-    {
-        yaz_add_srw_diagnostic(odr_en,
-                               &(sru_pdu_res->u.response->diagnostics),
-                               &(sru_pdu_res->u.response->num_diagnostics),
-                               YAZ_SRW_QUERY_SYNTAX_ERROR,
-                               "PQF query is empty");
-        return false;
-    }
-#else
     if (!sr_req->query)
     {
         yaz_add_srw_diagnostic(odr_en,
@@ -323,7 +289,6 @@ mp_util::check_sru_query_exists(mp::Package &package,
                                "CQL query is empty");
         return false;
     }
-#endif
     return true;
 }
 
@@ -375,27 +340,8 @@ std::ostream& std::operator<<(std::ostream& os, Z_SRW_PDU& srw_pdu)
                     os << " " << (sr->recordSchema);
                 else
                     os << " -";
-
-#ifdef Z_SRW_query_type_cql
-                switch (sr->query_type){
-                case Z_SRW_query_type_cql:
-                    os << " CQL";
-                    if (sr->query.cql)
-                        os << " " << sr->query.cql;
-                    break;
-                case Z_SRW_query_type_xcql:
-                    os << " XCQL";
-                    break;
-                case Z_SRW_query_type_pqf:
-                    os << " PQF";
-                    if (sr->query.pqf)
-                        os << " " << sr->query.pqf;
-                    break;
-                }
-#else
                 os << " " << (sr->queryType ? sr->queryType : "cql")
                    << " " << sr->query;
-#endif
             }
         }
         break;