In create_presentResponse, set status to failure for errors

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

diff --git a/src/util.cpp b/src/util.cpp
index fc304ca..38fd9e2 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-/* $Id: util.cpp,v 1.4 2006-01-13 15:09:35 adam Exp $
+/* $Id: util.cpp,v 1.8 2006-01-17 16:56:48 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -8,8 +8,10 @@
 
 #include <yaz/odr.h>
 #include <yaz/pquery.h>
+#include <yaz/otherinfo.h>
 #include "util.hpp"
 
+
 bool yp2::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) {
     YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
     
@@ -28,6 +30,123 @@ 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)
+{
+    int cat;
+    for (cat = 1; ; cat++)
+    {
+        // check virtual host
+        const char *vhost =
+            yaz_oi_get_string_oidval(otherInformation,
+                                     VAL_PROXY, 
+                                     cat /* categoryValue */,
+                                     remove_flag /* delete flag */);
+        if (!vhost)
+            break;
+        vhosts.push_back(std::string(vhost));
+    }
+    --cat;
+    return cat;
+}
+
+void yp2::util::split_zurl(std::string zurl, std::string &host,
+                           std::list<std::string> &db)
+{
+    const char *zurl_cstr = zurl.c_str();
+    const char *sep = strchr(zurl_cstr, '/');
+    
+    if (sep)
+    {
+        host = std::string(zurl_cstr, sep - zurl_cstr);
+
+        const char *cp1 = sep+1;
+        while(1)
+        {
+            const char *cp2 = strchr(cp1, '+');
+            if (cp2)
+                db.push_back(std::string(cp1, cp2 - cp1));
+            else
+            {
+                db.push_back(std::string(cp1));
+                break;
+            }
+            cp1 = cp2+1;
+        }
+    }
+    else
+    {
+        host = zurl;
+    }
+}
+
+bool yp2::util::set_databases_from_zurl(ODR odr, std::string zurl,
+                                        int *db_num, char ***db_strings)
+{
+    std::string host;
+    std::list<std::string> dblist;
+
+    split_zurl(zurl, host, dblist);
+   
+    if (dblist.size() == 0)
+        return false;
+    *db_num = dblist.size();
+    *db_strings = (char **) odr_malloc(odr, sizeof(char*) * (*db_num));
+
+    std::list<std::string>::const_iterator it = dblist.begin();
+    for (int i = 0; it != dblist.end(); it++, i++)
+        (*db_strings)[i] = odr_strdup(odr, it->c_str());
+    return true;
+}
+
 yp2::odr::odr(int type)
 {
     m_odr = odr_createmem(type);
@@ -127,6 +246,7 @@ Z_APDU *yp2::odr::create_presentResponse(Z_APDU *in_apdu,
         rec->which = Z_Records_NSD;
         rec->u.nonSurrogateDiagnostic =
             zget_DefaultDiagFormat(m_odr, error, addinfo);
+        *apdu->u.presentResponse->presentStatus = Z_PresentStatus_failure;
     }
     return apdu;
 }