From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 24 Oct 2012 20:46:30 +0000 (+0200)
Subject: sru_z3950: map Z39.50 init diags to SRU response
X-Git-Tag: v1.3.50~17
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=d37c338745a7a18b7cb4a3d8b1a0f41a0ce64f80;p=metaproxy-moved-to-github.git

sru_z3950: map Z39.50 init diags to SRU response
---

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index 6590d4d..4f9618c 100644
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -433,6 +433,51 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
     release_frontend(package);
 }
 
+static void interpret_default_diag(int *error,
+                                   const char **addinfo,
+                                   Z_DefaultDiagFormat *r)
+{
+    *error = *r->condition;
+    *addinfo = r->u.v2Addinfo;
+}
+
+static void interpret_init_diag2(int *error,
+                                const char **addinfo,
+                                Z_DiagnosticFormat *diag)
+{
+    if (diag->num > 0)
+    {
+        Z_DiagnosticFormat_s *ds = diag->elements[0];
+        if (ds->which == Z_DiagnosticFormat_s_defaultDiagRec)
+            interpret_default_diag(error, addinfo, ds->u.defaultDiagRec);
+    }
+}
+
+static void interpret_init_diag(int *error,
+                                const char **addinfo,
+                                Z_InitResponse *initrs)
+{
+    Z_External *uif = initrs->userInformationField;
+    if (uif && uif->which == Z_External_userInfo1)
+    {
+        int i;
+        Z_OtherInformation *ui = uif->u.userInfo1;
+        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)
+            {
+                interpret_init_diag2(
+                    error, addinfo,
+                    unit->information.externallyDefinedInfo->u.diag1);
+            }
+        }
+    }
+}
+
 bool
 yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
                                          mp::odr &odr_en,
@@ -492,28 +537,26 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
     // send Z3950 package
     z3950_package.move();
 
-    // dead Z3950 backend detection
-    if (z3950_package.session().is_closed())
-    {
-        yaz_add_srw_diagnostic(odr_en,
-                               &(sru_pdu_res->u.response->diagnostics),
-                               &(sru_pdu_res->u.response->num_diagnostics),
-                               YAZ_SRW_SYSTEM_TEMPORARILY_UNAVAILABLE, 0);
-        return false;
-    }
-
     // check successful initResponse
     Z_GDU *z3950_gdu = z3950_package.response().get();
 
+    int error = YAZ_SRW_SYSTEM_TEMPORARILY_UNAVAILABLE;
+    const char *addinfo = 0;
     if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950
-        && z3950_gdu->u.z3950->which == Z_APDU_initResponse
-        && *z3950_gdu->u.z3950->u.initResponse->result)
-        return true;
-
+        && z3950_gdu->u.z3950->which == Z_APDU_initResponse)
+    {
+        Z_InitResponse *initrs = z3950_gdu->u.z3950->u.initResponse;
+        if (*initrs->result)
+            return true;
+        int z_error = 0;
+        interpret_init_diag(&error, &addinfo, initrs);
+        if (z_error)
+            error = yaz_diag_bib1_to_srw(z_error);
+    }
     yaz_add_srw_diagnostic(odr_en,
                            &(sru_pdu_res->u.response->diagnostics),
                            &(sru_pdu_res->u.response->num_diagnostics),
-                           YAZ_SRW_SYSTEM_TEMPORARILY_UNAVAILABLE, 0);
+                           error, addinfo);
     return false;
 }