Proxy removes OtherInfo Proxy Address and Session ID. Other

[yazpp-moved-to-github.git] / src / yaz-proxy.cpp

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index a78e5d3..a61233e 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.6  1999-04-27 07:52:13  adam
+ * Revision 1.9  1999-09-13 12:53:44  adam
+ * Proxy removes OtherInfo Proxy Address and Session ID. Other
+ * Otherinfo remains untouched.
+ *
+ * Revision 1.8  1999/05/04 10:53:00  adam
+ * Changed the way the PROXY behaves when lost cookie is received.
+ *
+ * Revision 1.7  1999/04/28 13:31:17  adam
+ * Better result set optimisation for proxy.
+ *
+ * Revision 1.6  1999/04/27 07:52:13  adam
  * Improved proxy; added query match for result set re-use.
  *
  * Revision 1.5  1999/04/21 12:09:01  adam
@@ -68,7 +78,7 @@ char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo)
     assert (oid_ent_to_oid (&ent, oid));
 
     if (oid_ent_to_oid (&ent, oid) && 
-       (oi = update_otherInformation(otherInfo, 0, oid, 1)) &&
+       (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
        oi->which == Z_OtherInfo_characterInfo)
        return oi->information.characterInfo;
     return 0;
@@ -83,7 +93,7 @@ char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo)
     ent.oclass = CLASS_USERINFO;
     ent.value = (oid_value) VAL_PROXY;
     if (oid_ent_to_oid (&ent, oid) &&
-       (oi = update_otherInformation(otherInfo, 0, oid, 1)) &&
+       (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
        oi->which == Z_OtherInfo_characterInfo)
        return oi->information.characterInfo;
     return 0;
@@ -99,7 +109,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
     get_otherInfoAPDU(apdu, &oi);
     char *cookie = get_cookie(oi);
     logf (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie :
-         "<null>");
+         "null");
     if (cookie)
     {
        for (c = parent->m_clientPool; c; c = c->m_next)
@@ -109,11 +119,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
            if (!strcmp(cookie,c->m_cookie))
            {
                logf (LOG_LOG, "Yaz_Proxy::get_client cached");
-               break;
+               return c;
            }
        }
+       
     }
-    else if (!m_client)
+    if (!m_client)
     {
        logf (LOG_LOG, "Yaz_Proxy::get_client creating new");
        c = new Yaz_ProxyClient(m_PDU_Observable->clone());
@@ -154,11 +165,31 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
        m_client->m_last_query->match(this_query))
     {
        delete this_query;
-       if (*sr->smallSetUpperBound == 0)
+       if (m_client->m_last_resultCount > *sr->smallSetUpperBound &&
+           m_client->m_last_resultCount < *sr->largeSetLowerBound)
        {
-           Z_APDU *new_apdu;
-           logf (LOG_LOG, "query match");
-           new_apdu = create_Z_PDU(Z_APDU_searchResponse);
+           // medium Set
+           Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
+           Z_PresentRequest *pr = new_apdu->u.presentRequest;
+           pr->referenceId = sr->referenceId;
+           pr->resultSetId = sr->resultSetName;
+           pr->preferredRecordSyntax = sr->preferredRecordSyntax;
+           *pr->numberOfRecordsRequested = *sr->mediumSetPresentNumber;
+           if (sr->mediumSetElementSetNames)
+           {
+               pr->recordComposition = (Z_RecordComposition *)
+                   odr_malloc(odr_encode(), sizeof(Z_RecordComposition));
+               pr->recordComposition->which = Z_RecordComp_simple;
+               pr->recordComposition->u.simple = sr->mediumSetElementSetNames;
+           }
+           m_client->m_sr_transform = 1;
+           return new_apdu;
+       }
+       else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
+           m_client->m_last_resultCount == 0)
+       {
+           // large set
+           Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
            new_apdu->u.searchResponse->referenceId = sr->referenceId;
            new_apdu->u.searchResponse->resultCount =
                &m_client->m_last_resultCount;
@@ -167,7 +198,22 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
        }
        else
        {
-           logf (LOG_LOG, "query match (piggy back)");
+           // small set
+           Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
+           Z_PresentRequest *pr = new_apdu->u.presentRequest;
+           pr->referenceId = sr->referenceId;
+           pr->resultSetId = sr->resultSetName;
+           pr->preferredRecordSyntax = sr->preferredRecordSyntax;
+           *pr->numberOfRecordsRequested = m_client->m_last_resultCount;
+           if (sr->smallSetElementSetNames)
+           {
+               pr->recordComposition = (Z_RecordComposition *)
+                   odr_malloc(odr_encode(), sizeof(Z_RecordComposition));
+               pr->recordComposition->which = Z_RecordComp_simple;
+               pr->recordComposition->u.simple = sr->smallSetElementSetNames;
+           }
+           m_client->m_sr_transform = 1;
+           return new_apdu;
        }
     }
     else
@@ -191,9 +237,12 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     }
     m_client->m_server = this;
 
+#if 0
     Z_OtherInformation **oi;
     get_otherInfoAPDU(apdu, &oi);
     *oi = 0;
+#endif
+
     if (apdu->which == Z_APDU_initRequest)
     {
        if (m_client->m_init_flag)
@@ -278,15 +327,29 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
     m_init_flag = 0;
     m_last_query = 0;
     m_last_resultCount = 0;
+    m_sr_transform = 0;
 }
 
 void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
 {
     logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU");
-    if (m_cookie)
-       set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
     if (apdu->which == Z_APDU_searchResponse)
        m_last_resultCount = *apdu->u.searchResponse->resultCount;
+    if (apdu->which == Z_APDU_presentResponse && m_sr_transform)
+    {
+       m_sr_transform = 0;
+       Z_PresentResponse *pr = apdu->u.presentResponse;
+       Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
+       Z_SearchResponse *sr = new_apdu->u.searchResponse;
+       sr->referenceId = pr->referenceId;
+       *sr->resultCount = m_last_resultCount;
+       sr->records = pr->records;
+       sr->nextResultSetPosition = pr->nextResultSetPosition;
+       sr->numberOfRecordsReturned = pr->numberOfRecordsReturned;
+       apdu = new_apdu;
+    }
+    if (m_cookie)
+       set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
     if (m_server)
     {
        logf (LOG_LOG, "Yaz_Proxy::send_Z_PDU");