#include <yaz/oid_db.h>
#include "msg-thread.h"
+#if YAZ_VERSIONL >= 0x03001D
+#define YAZ_HAS_MK_SURROGATE 1
+#else
+#define YAZ_HAS_MK_SURROGATE 0
+#endif
+
using namespace yazpp_1;
#ifdef WIN32
return 0;
}
-static void yazproxy_encode_sru_surrogate(ODR o, Z_SRW_record *record, int pos,
- int code, const char *details)
+#if YAZ_HAS_MK_SURROGATE
+#else
+static void yazproxy_mk_sru_surrogate(ODR o, Z_SRW_record *record, int pos,
+ int code, const char *details)
{
const char *message = yaz_diag_srw_str(code);
int len = 200;
record->recordPosition = odr_intdup(o, pos);
record->recordSchema = odr_strdup(o, "info:srw/schema/1/diagnostics-v1.1");
}
-
+#endif
int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start)
{
Z_NamePlusRecord *npr = records->u.databaseOrSurDiagnostics->records[i];
if (npr->which != Z_NamePlusRecord_databaseRecord)
{
- yaz_log(YLOG_LOG, "Point 1");
- yazproxy_encode_sru_surrogate(
+#if YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
o, srw_res->records + i, i+start,
YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
continue;
}
Z_External *r = npr->u.databaseRecord;
}
else
{
- yaz_log(YLOG_LOG, "Point 2");
- yazproxy_encode_sru_surrogate(
+#if YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
o, srw_res->records + i, i+start,
YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
}
}
}
int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
int num_diagnostics)
{
+ int http_status = 404;
Yaz_ProxyConfig *cfg = check_reconfigure();
if (cfg)
{
int len;
char *b = cfg->get_explain_doc(odr_encode(), 0 /* target */,
- m_s2z_database, &len);
+ m_s2z_database, &len, &http_status);
if (b)
{
Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response);
return send_srw_response(res);
}
}
- return send_http_response(404);
+ return send_http_response(http_status);
}
int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu)