fetching records correctly, honoring recordPacking = xml/string and

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

diff --git a/src/util.cpp b/src/util.cpp
index 941effc..e177410 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,7 +1,7 @@
-/* $Id: util.cpp,v 1.16 2006-06-09 14:12:13 adam Exp $
+/* $Id: util.cpp,v 1.19 2006-08-30 12:27:34 adam Exp $
    Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -191,7 +191,7 @@ void mp_util::get_init_diagnostics(
     }
 }
 
-int mp_util::get_vhost_otherinfo(
+int mp_util::get_or_remove_vhost_otherinfo(
     Z_OtherInformation **otherInformation,
     bool remove_flag,
     std::list<std::string> &vhosts)
@@ -213,6 +213,20 @@ int mp_util::get_vhost_otherinfo(
     return cat;
 }
 
+void mp_util::get_vhost_otherinfo(
+    Z_OtherInformation *otherInformation,
+    std::list<std::string> &vhosts)
+{
+    get_or_remove_vhost_otherinfo(&otherInformation, false, vhosts);
+}
+
+int mp_util::remove_vhost_otherinfo(
+    Z_OtherInformation **otherInformation,
+    std::list<std::string> &vhosts)
+{
+    return get_or_remove_vhost_otherinfo(otherInformation, true, vhosts);
+}
+
 void mp_util::set_vhost_otherinfo(
     Z_OtherInformation **otherInformation, ODR odr,
     const std::list<std::string> &vhosts)
@@ -296,8 +310,8 @@ mp::odr::operator ODR() const
     return m_odr;
 }
 
-Z_APDU *mp::odr::create_close(Z_APDU *in_apdu,
-                               int reason, const char *addinfo)
+Z_APDU *mp::odr::create_close(const Z_APDU *in_apdu,
+                              int reason, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_close, in_apdu);
     
@@ -307,20 +321,25 @@ Z_APDU *mp::odr::create_close(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *mp::odr::create_APDU(int type, Z_APDU *in_apdu)
+Z_APDU *mp::odr::create_APDU(int type, const Z_APDU *in_apdu)
 {
     return mp::util::create_APDU(m_odr, type, in_apdu);
 }
 
-Z_APDU *mp_util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
+Z_APDU *mp_util::create_APDU(ODR odr, int type, const Z_APDU *in_apdu)
 {
     Z_APDU *out_apdu = zget_APDU(odr, type);
+    transfer_referenceId(odr, in_apdu, out_apdu);
+    return out_apdu;
+}
 
-    Z_ReferenceId **id_to = mp::util::get_referenceId(out_apdu);
+void mp_util::transfer_referenceId(ODR odr, const Z_APDU *src, Z_APDU *dst)
+{
+    Z_ReferenceId **id_to = mp::util::get_referenceId(dst);
     *id_to = 0;
-    if (in_apdu)
+    if (src)
     {
-        Z_ReferenceId **id_from = mp::util::get_referenceId(in_apdu);
+        Z_ReferenceId **id_from = mp::util::get_referenceId(src);
         if (id_from && *id_from && id_to)
         {
             *id_to = (Z_ReferenceId*) odr_malloc (odr, sizeof(**id_to));
@@ -331,11 +350,10 @@ Z_APDU *mp_util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
         else if (id_to)
             *id_to = 0;
     }
-    return out_apdu;
 }
 
-Z_APDU *mp::odr::create_initResponse(Z_APDU *in_apdu,
-                                      int error, const char *addinfo)
+Z_APDU *mp::odr::create_initResponse(const Z_APDU *in_apdu,
+                                     int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_initResponse, in_apdu);
     if (error)
@@ -347,8 +365,8 @@ Z_APDU *mp::odr::create_initResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *mp::odr::create_searchResponse(Z_APDU *in_apdu,
-                                        int error, const char *addinfo)
+Z_APDU *mp::odr::create_searchResponse(const Z_APDU *in_apdu,
+                                       int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_searchResponse, in_apdu);
     if (error)
@@ -364,8 +382,8 @@ Z_APDU *mp::odr::create_searchResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *mp::odr::create_presentResponse(Z_APDU *in_apdu,
-                                         int error, const char *addinfo)
+Z_APDU *mp::odr::create_presentResponse(const Z_APDU *in_apdu,
+                                        int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_presentResponse, in_apdu);
     if (error)
@@ -381,8 +399,8 @@ Z_APDU *mp::odr::create_presentResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *mp::odr::create_scanResponse(Z_APDU *in_apdu,
-                                      int error, const char *addinfo)
+Z_APDU *mp::odr::create_scanResponse(const Z_APDU *in_apdu,
+                                     int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_scanResponse, in_apdu);
     Z_ScanResponse *res = apdu->u.scanResponse;
@@ -409,7 +427,7 @@ Z_APDU *mp::odr::create_scanResponse(Z_APDU *in_apdu,
 }
 
 Z_GDU *mp::odr::create_HTTP_Response(mp::Session &session,
-                                      Z_HTTP_Request *hreq, int code)
+                                     Z_HTTP_Request *hreq, int code)
 {
     const char *response_version = "1.0";
     bool keepalive = false;
@@ -441,7 +459,7 @@ Z_GDU *mp::odr::create_HTTP_Response(mp::Session &session,
     return gdu;
 }
 
-Z_ReferenceId **mp_util::get_referenceId(Z_APDU *apdu)
+Z_ReferenceId **mp_util::get_referenceId(const Z_APDU *apdu)
 {
     switch (apdu->which)
     {