From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Jan 2006 16:43:22 +0000 (+0000)
Subject: Implemented utilities get_init_diagnostics and  get_default_diag
X-Git-Tag: YP2.0.0.2~43
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=574ad8ce17a312c7396603e3ba3604ce52e75fb2;p=metaproxy-moved-to-github.git

Implemented utilities get_init_diagnostics and  get_default_diag
---

diff --git a/src/util.cpp b/src/util.cpp
index 4a533b1..26f1edb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-/* $Id: util.cpp,v 1.6 2006-01-17 13:34:51 adam Exp $
+/* $Id: util.cpp,v 1.7 2006-01-17 16:43:22 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -30,6 +30,53 @@ bool yp2::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) {
     return true;
 }
 
+void yp2::util::get_default_diag(Z_DefaultDiagFormat *r,
+                                 int &error_code, std::string &addinfo)
+{
+    error_code = *r->condition;
+    switch (r->which)
+    {
+    case Z_DefaultDiagFormat_v2Addinfo:
+        addinfo = std::string(r->u.v2Addinfo);
+        break;
+    case Z_DefaultDiagFormat_v3Addinfo:
+        addinfo = r->u.v3Addinfo;
+        break;
+    }
+}
+
+void yp2::util::get_init_diagnostics(Z_InitResponse *initrs,
+                                     int &error_code, std::string &addinfo)
+{
+    Z_External *uif = initrs->userInformationField;
+    
+    if (uif && uif->which == Z_External_userInfo1)
+    {
+        Z_OtherInformation *ui = uif->u.userInfo1;
+        int i;
+        for (i = 0; i < ui->num_elements; i++)
+        {
+            Z_OtherInformationUnit *unit = ui->list[i];
+            if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
+                unit->information.externallyDefinedInfo &&
+                unit->information.externallyDefinedInfo->which ==
+                Z_External_diag1) 
+            {
+                Z_DiagnosticFormat *diag = 
+                    unit->information.externallyDefinedInfo->u.diag1;
+
+                if (diag->num > 0)
+                {
+                    Z_DiagnosticFormat_s *ds = diag->elements[0];
+                    if (ds->which == Z_DiagnosticFormat_s_defaultDiagRec)
+                        yp2::util::get_default_diag(ds->u.defaultDiagRec,
+                                                    error_code, addinfo);
+                }
+            } 
+        }
+    }
+}
+
 int yp2::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                    bool remove_flag,
                                    std::list<std::string> &vhosts)
diff --git a/src/util.hpp b/src/util.hpp
index 93caa33..6d0d224 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,4 +1,4 @@
-/* $Id: util.hpp,v 1.6 2006-01-17 13:34:51 adam Exp $
+/* $Id: util.hpp,v 1.7 2006-01-17 16:43:29 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -26,6 +26,10 @@ namespace yp2 {
         int get_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                 bool remove_flag,
                                 std::list<std::string> &vhosts);
+        void get_init_diagnostics(Z_InitResponse *res,
+                                  int &error_code, std::string &addinfo);
+        void get_default_diag(Z_DefaultDiagFormat *r,
+                              int &error_code, std::string &addinfo);
     };
 
     class odr : public boost::noncopyable {