X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsru_util.cpp;h=cf620bc6a3ef3297a6781ffebf2344bde1835f83;hb=1be1a231bf51e92d9dd443282f9666ab7a0b4ca7;hp=8c10681d0fdbc99830f77012f359acc88c4fb167;hpb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;p=metaproxy-moved-to-github.git

diff --git a/src/sru_util.cpp b/src/sru_util.cpp
index 8c10681..cf620bc 100644
--- a/src/sru_util.cpp
+++ b/src/sru_util.cpp
@@ -251,10 +251,10 @@ Z_SRW_PDU * mp_util::decode_sru_request(mp::Package &package,
     // closing connection if we did not ...
     if (0 == yaz_sru_decode(http_req, &sru_pdu_req, soap,
                             odr_de, &charset,
-                            &(sru_pdu_res->u.response->diagnostics),
-                            &(sru_pdu_res->u.response->num_diagnostics)))
+                            &(sru_pdu_res->u.explain_response->diagnostics),
+                            &(sru_pdu_res->u.explain_response->num_diagnostics)))
     {
-        if (sru_pdu_res->u.response->num_diagnostics)
+        if (sru_pdu_res->u.explain_response->num_diagnostics)
         {
             //sru_pdu_res = sru_pdu_res_exp;
             package.session().close();
@@ -281,6 +281,7 @@ 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,
@@ -313,6 +314,22 @@ mp_util::check_sru_query_exists(mp::Package &package,
                                "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;
 }
 
@@ -365,6 +382,7 @@ std::ostream& std::operator<<(std::ostream& os, Z_SRW_PDU& srw_pdu)
                 else
                     os << " -";
 
+#ifdef Z_SRW_query_type_cql
                 switch (sr->query_type){
                 case Z_SRW_query_type_cql:
                     os << " CQL";
@@ -380,6 +398,10 @@ std::ostream& std::operator<<(std::ostream& os, Z_SRW_PDU& srw_pdu)
                         os << " " << sr->query.pqf;
                     break;
                 }
+#else
+                os << " " << (sr->queryType ? sr->queryType : "cql")
+                   << " " << sr->query;
+#endif
             }
         }
         break;