* Copyright (c) 1998-2001, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.32 2002-08-28 13:01:41 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.36 2002-10-09 12:50:26 adam Exp $
*/
#include <assert.h>
#include <time.h>
#include <yaz/log.h>
-#include <yaz++/yaz-proxy.h>
+#include <yaz++/proxy.h>
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
Yaz_Z_Assoc(the_PDU_Observable)
if (m_client->m_last_ok && m_client->m_last_query &&
m_client->m_last_query->match(this_query) &&
+ !strcmp(m_client->m_last_resultSetId, sr->resultSetName) &&
m_client->m_last_databases.match(this_databases))
{
delete this_query;
return new_apdu;
}
else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
- m_client->m_last_resultCount == 0)
+ m_client->m_last_resultCount <= 0)
{
// large set. Return pseudo-search response immediately
yaz_log (LOG_LOG, "Optimizing search for large set");
delete m_client->m_last_query;
m_client->m_last_query = this_query;
m_client->m_last_ok = 0;
+
+ xfree (m_client->m_last_resultSetId);
+ m_client->m_last_resultSetId = xstrdup (sr->resultSetName);
+
m_client->m_last_databases.set(sr->num_databaseNames,
(const char **) sr->databaseNames);
}
{
if (m_client->m_init_flag)
{
- Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
+ Z_APDU *apdu = m_client->m_initResponse;
+ apdu->u.initResponse->otherInfo = 0;
if (m_client->m_cookie)
set_otherInformationString(apdu, VAL_COOKIE, 1,
m_client->m_cookie);
if (m_next)
m_next->m_prev = m_prev;
m_waiting = 2; // for debugging purposes only.
+ odr_destroy(m_init_odr);
delete m_last_query;
+ xfree (m_last_resultSetId);
}
void Yaz_Proxy::timeoutNotify()
m_prev = 0;
m_init_flag = 0;
m_last_query = 0;
+ m_last_resultSetId = 0;
m_last_resultCount = 0;
m_last_ok = 0;
m_sr_transform = 0;
m_waiting = 0;
+ m_init_odr = odr_createmem (ODR_DECODE);
+ m_initResponse = 0;
}
const char *Yaz_Proxy::option(const char *name, const char *value)
m_waiting = 0;
yaz_log (LOG_LOG, "Receiving %s from %s", apdu_name(apdu),
get_hostname());
+ if (apdu->which == Z_APDU_initResponse)
+ {
+ NMEM nmem = odr_extract_mem (odr_decode());
+ odr_reset (m_init_odr);
+ nmem_transfer (m_init_odr->mem, nmem);
+ m_initResponse = apdu;
+ nmem_destroy (nmem);
+ }
if (apdu->which == Z_APDU_searchResponse)
{
m_last_resultCount = *apdu->u.searchResponse->resultCount;