Extract proper xmlrpc path information from .samp lockfile and use this informat…

…ion to post messages.

Extract proper xmlrpc path information from .samp lockfile and use this informat…
…ion to post messages.
Jürgen Knödlseder
1 parent b7e54819
Showing 4 changed files with 29 additions and 12 deletions
ChangeLog
NEWS
include/GVOClient.hpp
src/vo/GVOClient.cpp
-2015-01-07  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2015-01-12  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+
+        * Bug fix version 0.9.2 released
+        ================================
+
+        Use URL path informtion in GVOClient connection to Hub
+
         * Bug fix version 0.9.1 released
         ================================
-New Features and Important Changes in GammaLib 00-09-01
+New Features and Important Changes in GammaLib 00-09-02
 Author(s) : Juergen Knoedlseder
-7 January 2015
+12 January 2015
 1. Introduction
@@ -78,7 +78,9 @@ None
 15. VO module
 -------------
-None
+The XMLRPC path name as found in the .samp lockfile is now used to compose
+the http POST message. This solves a problem when trying to connect to some
+VO tool hubs.
 16. Xspec module
@@ -103,8 +105,7 @@ None
 20. CTA interface
 -----------------
-Corrected bug #1383 that led to a unit test failure for the CTA energy dispersion
-computation on recent gcc compiler versions.
+None
 21. COMPTEL interface
@@ -98,6 +98,7 @@ protected:
     std::string m_hub_url;     //!< The XML-RPC endpoint for communication with the hub
     std::string m_hub_host;    //!< Hub host (extracted from XML-RPC endpoint)
     std::string m_hub_port;    //!< Hub port (extracted from XML-RPC endpoint)
+    std::string m_hub_path;    //!< Hub path (extracted from XML-RPC endpoint)
     std::string m_version;     //!< The version of the SAMP Standard Profile implemented by the hub
     std::string m_client_key;  //!< Private client key
     std::string m_hub_id;      //!< Hub identifier
@@ -291,8 +291,9 @@ std::string GVOClient::print(const GChatter&amp; chatter) const
         if (has_hub()) {
             result.append("\n"+gammalib::parformat("Hub key")+m_secret);
             result.append("\n"+gammalib::parformat("Hub URL")+m_hub_url);
-            result.append("\n"+gammalib::parformat("Hub host (port)"));
-            result.append(m_hub_host+" ("+m_hub_port+")");
+            result.append("\n"+gammalib::parformat("Hub host")+m_hub_host);
+            result.append("\n"+gammalib::parformat("Hub port")+m_hub_port);
+            result.append("\n"+gammalib::parformat("Hub path")+m_hub_path);
             result.append("\n"+gammalib::parformat("SAMP protocol version"));
             result.append(m_version);
             result.append("\n"+gammalib::parformat("Hub connection"));
@@ -340,6 +341,7 @@ void GVOClient::init_members(void)
     m_hub_url.clear();
     m_hub_host.clear();
     m_hub_port.clear();
+    m_hub_path.clear();
     m_version.clear();
     m_client_key.clear();
     m_hub_id.clear();
@@ -364,6 +366,7 @@ void GVOClient::copy_members(const GVOClient&amp; client)
     m_hub_url    = client.m_hub_url;
     m_hub_host   = client.m_hub_host;
     m_hub_port   = client.m_hub_port;
+    m_hub_path   = client.m_hub_path;
     m_version    = client.m_version;
     m_client_key = client.m_client_key;
     m_hub_id     = client.m_hub_id;
@@ -463,11 +466,12 @@ bool GVOClient::find_hub(void)
             // Close SAMP lockfile
             fclose(fptr);
-            // Extract host and port from Hub URL
+            // Extract host, port and path from Hub URL
             if (m_hub_url.compare(0, 7, "http://") == 0) {
                 size_t length;
                 size_t start = 7;
                 size_t stop  = m_hub_url.find(":", start);
+                size_t end   = std::string::npos;
                 if (stop != std::string::npos) {
                     length = stop - start;
                 }
@@ -476,8 +480,8 @@ bool GVOClient::find_hub(void)
                 }
                 m_hub_host = m_hub_url.substr(start, length);
                 if (stop != std::string::npos) {
-                    stop = stop + 1;
-                    size_t end = m_hub_url.find("/", stop);
+                    stop++;
+                    end  = m_hub_url.find("/", stop);
                     if (end != std::string::npos) {
                         length = end - stop;
                     }
@@ -486,6 +490,11 @@ bool GVOClient::find_hub(void)
                     }
                     m_hub_port = m_hub_url.substr(stop, length);
                 }
+                if (end != std::string::npos) {
+                    end++;
+                    length     = m_hub_url.length() - end;
+                    m_hub_path = m_hub_url.substr(end, length);
+                }
             }
             // Check for existence of mandatory tokens
@@ -850,7 +859,7 @@ void GVOClient::post_string(const std::string&amp; content) const
         int length = content.length();
         // Set prefix
-        std::string prefix = "POST /xmlrpc HTTP/1.0\n"
+        std::string prefix = "POST /"+m_hub_path+" HTTP/1.0\n"
                              "User-Agent: GammaLib\n"
                              "Content-Type: text/xml\n"
                              "Content-Length: "+gammalib::str(length)+"\n\n";