From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Nov 2015 11:48:53 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
X-Git-Tag: v1.6.4~6
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=0fc9351ebb1c463c711b8d33aaf9b478648e1b9d;hp=3265a1e5fe8f5d146ec62c835293d5f56d65d2de;p=yazpp-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
---

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 5f97d4f..a681bf0 100644
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -11,6 +11,7 @@
 #include <yaz/log.h>
 #include <yazpp/ir-assoc.h>
 #include <yaz/oid_db.h>
+#include <yaz/comstack.h>
 
 using namespace yazpp_1;
 
@@ -302,9 +303,10 @@ void IR_Assoc::client(const char *addr)
     delete [] m_host;
     m_host = new char[strlen(addr)+1];
     strcpy(m_host, addr);
-    const char *dbpart = strchr(m_host, '/');
-    if (dbpart)
-        set_databaseNames (dbpart+1, "+ ");
+    const char *dbpart = 0;
+    cs_get_host_args(m_host, &dbpart);
+    if (dbpart && *dbpart)
+        set_databaseNames (dbpart, "+ ");
     Z_Assoc::client(m_proxy ? m_proxy : m_host);
 }