GVOHub and GVOCLient bugs vs. SAMP standard fixed

Thierry Louge
1 parent c6191011
Showing 2 changed files with 12 additions and 16 deletions
src/vo/GVOClient.cpp
src/vo/GVOHub.cpp
@@ -399,8 +399,9 @@ void GVOClient::publish(const GFitsHDU&amp; hdu)
     hub_command.append("<methodCall>\n");
     hub_command.append("  <methodName>samp.hub.notifyAll</methodName>\n");
     hub_command.append("  <params>\n");
-    hub_command.append("    <param><value>image.load.fits</value></param>\n");
-    hub_command.append("    <param><value>"+m_secret+"</value></param>\n");
+    //hub_command.append("    <param><value>image.load.fits</value></param>\n");
+    //hub_command.append("    <param><value>"+m_secret+"</value></param>\n");
+    hub_command.append("    <param><value>"+m_client_key+"</value></param>\n");
     hub_command.append("    <param><value><struct>\n");
     hub_command.append("      <member><name>samp.params</name><value><struct>\n");
     hub_command.append("        <member><name>name</name><value>"+extname+"</value></member>\n");
@@ -1125,7 +1125,7 @@ void GVOHub::request_notify_all(const GXml&amp; xml, const socklen_t&amp; sock)
 {
     // Header
     #if defined(G_CONSOLE_DUMP)
-    std::cout << "GVOHub::request_notify_all" << std::endl;
+    std::cout << "GVOHub::request_notify_all entrance" << std::endl;
     #endif
     // Get message type
@@ -2077,8 +2077,8 @@ void GVOHub::notify_image_load(const GVOHub::client&amp; client,
                                const GXml&           xml)
 {
 	// Get client response
-       const GXmlNode* node = xml.element("methodCall > params > param[2] > value > struct > member > value > struct");
-       //const GXmlNode* node = xml.element("methodCall > params > param[1] > value > struct > member > value > struct");
+       //const GXmlNode* node = xml.element("methodCall > params > param[2] > value > struct > member > value > struct");
+        const GXmlNode* node = xml.element("methodCall > params > param[1] > value > struct > member > value > struct");
     // Extract image information from client response
 	std::string name = get_response_value(node, "name");
 	std::string url  = get_response_value(node, "url");
@@ -2221,23 +2221,18 @@ std::string GVOHub::get_mtype(const GXml&amp; xml) const
 {
     // Header
     #if defined(G_CONSOLE_DUMP)
-    std::cout << "GVOHub::get_mtype entrance" << std::endl;
+    std::cout << "In GVOHub::get_mtype" << std::endl;
     #endif
     // Initialise response
     std::string client_key = "";
     // Get the client's private key
-    /*
-    #if defined(G_CONSOLE_DUMP)
-    std::cout << "GVOHub::get_mtype identifying node" << std::endl;
-    #endif
+    
     const GXmlNode* node = xml.element("methodCall > params > param[1] > value > struct ");
-    #if defined(G_CONSOLE_DUMP)
-    std::cout << "GVOHub::get_mtype calling get response value" << std::endl;
-    #endif
-    client_key = get_response_value(node, "name");
-    /**/
+    
+    client_key = get_response_value(node, "samp.mtype");
+    /*
     const GXmlNode* node = xml.element("methodCall > params > param > value");
     if (node != NULL) {
         const GXmlText* text = static_cast<const GXmlText*>((*node)[0]);
@@ -2245,7 +2240,7 @@ std::string GVOHub::get_mtype(const GXml&amp; xml) const
             client_key = text->text();
         }
     }
-    /* */
+    */
     // Return key
     return client_key;
 }