GVOHub send url containing get_fits method. It detects http get_fits method call…

… and returning is ont he way

GVOHub send url containing get_fits method. It detects http get_fits method call…
… and returning is ont he way
Thierry Louge
1 parent 4f7282d6
Showing 1 changed file with 35 additions and 28 deletions
src/vo/GVOHub.cpp
@@ -430,11 +430,33 @@ void GVOHub::handle_request(const socklen_t&amp; sock)
     // Extract response into an XML object
     GXml   xml;
+    size_t start_html = message.find("GET /get_fits");
+    if (start_html != std::string::npos) {
+         #if defined(G_CONSOLE_DUMP)
+         std::cout << "get_fits called " << std::endl;
+         #endif
+	 //Form and send here the html message containing fits file data
+	 std::string msg ="";
+	 msg.append("HTTP/1.1 200 OK\n");
+	 msg.append("Connection: open\n");
+         msg.append("Content-Type: multipart/form-data\n");
+	 //Fixed length for tests
+         msg.append("Content-Length: 364\n");
+	 //Fixed filename for tests
+	 msg.append("Content-Disposition: form-data; name=\"Gammalib_fits\";filename=\"/root/Skw+_Fermi_5.fits\"\n");
+	 post_string(msg, sock);
+         #if defined(G_CONSOLE_DUMP)
+         std::cout <<msg << std::endl;
+         #endif
+	// Return
+        return;
+    }
+    
     size_t start = message.find("<?xml");
     if (start != std::string::npos) {
         xml = GXml(message.substr(start, std::string::npos));
     }
-
+    
     // Get methodName value
     std::string method_called;
     const GXmlNode* node = xml.element("methodCall > methodName");
@@ -1146,13 +1168,10 @@ void GVOHub::broadcast(const GXml&amp; xml, const socklen_t&amp; sock)
     // Get message mtype
     std::string mtype = get_mtype(xml);
     #if defined(G_CONSOLE_DUMP)
-    std::cout<<"mtype is: " +mtype + "i value: " + gammalib::str(i)<<std::endl;
+    std::cout<<"mtype is: " +mtype + " i value: " + gammalib::str(i)<<std::endl;
     #endif
     // Continue only if index is valid
-    if (i != -1) {
-         #if defined(G_CONSOLE_DUMP)
-	 std::cout<<"i not negative"<<std::endl;
-         #endif
+    //if (i != -1) {
         // Post void message
         post_samp_void(sock);
 	if (mtype == "image.load.fits") {
@@ -1169,7 +1188,7 @@ void GVOHub::broadcast(const GXml&amp; xml, const socklen_t&amp; sock)
 			       m_clients[i].reference,xml);
 	}
-    } // endif: valid client found
+	//} // endif: valid client found
     #if defined(G_CONSOLE_DUMP)
     std::cout<<"Returning from broadcast function"<<std::endl;
     #endif
@@ -1720,15 +1739,9 @@ void GVOHub::send_notifications(const std::string&amp; method,
                 std::string msg = "";
                 if (method == "image.load.fits") {
-		   /*
-		     Example of message to send for VOTABLE message
-		     { "samp.mtype": "table.load.votable",
-		     "samp.params": {
-		     "name": "SDSS DR7",
-		     "table-id": "http://alasky.u-strasbg.fr/cats/SDSS-DR7",
-		     "url": "file://localhost/root/.aladin/.aladin.28999/sampSDSSDR71446626818775.xml" } }
-		   */
-		   
+		    #if defined(G_CONSOLE_DUMP)
+		    std::cout << "GVOHub:: Preparing broadcast message" << std::endl;
+                    #endif
 		   // Set response for image.load.fits
                     msg.append("<?xml version=\"1.0\"?>\n");
                     msg.append("<methodCall>\n");
@@ -1750,30 +1763,24 @@ void GVOHub::send_notifications(const std::string&amp; method,
                     msg.append("      <value><struct>\n");
                     msg.append("        <member>\n");
                     msg.append("          <name>name</name>\n");
-                    msg.append("          <value>");
-		    const GXmlNode* node = xml.element("methodCall > params > param[1] > value > struct > member[1] > value");
-		    if (node != NULL) {
-		      const GXmlText* text = static_cast<const GXmlText*>((*node)[0]);
-		      if (text != NULL) {
-			msg.append(text->text());
-		      }
-		    }
-		     msg.append("</value>\n");
+                    msg.append("          <value>Gammalib_shared_fits</value>\n");
                     msg.append("        </member>\n");
 		    msg.append("        <member>\n");
                     msg.append("          <name>image-id</name>\n");
-                    msg.append("          <value>IMAGE_ID</value>\n");
+                    msg.append("          <value>Gammalib_shared_fits_id</value>\n");
                     msg.append("        </member>\n");
 		    msg.append("        <member>\n");
                     msg.append("          <name>url</name>\n");
-                    msg.append("          <value>http://127.0.0.1:2526/</value>\n");
+                    msg.append("          <value>http://127.0.0.1:2526/get_fits</value>\n");
                     msg.append("        </member>\n");
                     msg.append("      </struct></value>\n");
                     msg.append("    </member>\n");
                     msg.append("  </struct></value></param>\n");
                     msg.append("</params>\n");
                     msg.append("</methodCall>\n");
-                        
+                    #if defined(G_CONSOLE_DUMP)
+		    std::cout << msg << std::endl;
+                    #endif   
                     // Post notification
                     notify(m_clients[i].url, msg);