X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.cpp;h=4a3d4781fde7ba7c00b2c847f2da6ee2ba403535;hb=b8d5728fc9d3461f5bfd7d79f415512822c38dcc;hp=245bf479977911f92778b7b60b01d5b2ae88c7a7;hpb=73f37c91c144b070020df2f27472c09b62367acf;p=metaproxy-moved-to-github.git

diff --git a/src/util.cpp b/src/util.cpp
index 245bf47..4a3d478 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) 2005-2013 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -163,6 +163,26 @@ std::string mp_util::database_name_normalize(const std::string &s)
 
 }
 
+Z_RecordComposition *mp_util::piggyback_to_RecordComposition(
+    ODR odr, Odr_int result_set_size, Z_SearchRequest *sreq)
+{
+    Z_RecordComposition *comp = 0;
+    Odr_int present_dummy;
+    const char *element_set_name = 0;
+    mp::util::piggyback_sr(sreq, result_set_size,
+                           present_dummy, &element_set_name);
+    if (element_set_name)
+    {
+        comp  = (Z_RecordComposition *) odr_malloc(odr, sizeof(*comp));
+        comp->which = Z_RecordComp_simple;
+        comp->u.simple = (Z_ElementSetNames *)
+            odr_malloc(odr, sizeof(Z_ElementSetNames));
+        comp->u.simple->which = Z_ElementSetNames_generic;
+        comp->u.simple->u.generic = odr_strdup(odr, element_set_name);
+    }
+    return comp;
+}
+
 void mp_util::piggyback_sr(Z_SearchRequest *sreq,
                            Odr_int result_set_size,
                            Odr_int &number_to_present,
@@ -316,33 +336,11 @@ void mp_util::get_default_diag(Z_DefaultDiagFormat *r,
 void mp_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)
-                        mp::util::get_default_diag(ds->u.defaultDiagRec,
-                                                    error_code, addinfo);
-                }
-            }
-        }
-    }
+    Z_DefaultDiagFormat *df = yaz_decode_init_diag(0, initrs);
+
+    if (df)
+        get_default_diag(df, error_code, addinfo);
 }
 
 int mp_util::get_or_remove_vhost_otherinfo(