From a9b1ce3fa9726af3d5bfe37619717e68516ede66 Mon Sep 17 00:00:00 2001 From: Thierry Louge Date: Fri, 13 Mar 2015 15:33:45 +0100 Subject: [PATCH] Hub is functionning, pb with visibility of list of apps --- registrations.txt | 36 ++++++++++++++++++++++++++++++++++++ src/vo/GVOHub.cpp | 13 +++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/registrations.txt b/registrations.txt index 02a6f08..0b99066 100644 --- a/registrations.txt +++ b/registrations.txt @@ -490,4 +490,40 @@ GXmlElement::name GXmlText::samp.hub.disconnectGXmlElement::name GXmlText::table.load.votableGXmlElement::name GXmlText::samp.hub.event.unregisterGXmlElement::name + GXmlText::script.aladin.sendGXmlElement::name + GXmlText::samp.hub.event.registerGXmlElement::name + GXmlText::table.select.rowListGXmlElement::name + GXmlText::table.highlight.rowGXmlElement::name + GXmlText::table.load.fitsGXmlElement::name + GXmlText::samp.app.pingGXmlElement::name + GXmlText::coord.pointAt.skyGXmlElement::name + GXmlText::samp.hub.event.shutdownGXmlElement::name + GXmlText::image.load.fitsGXmlElement::name + GXmlText::samp.hub.disconnectGXmlElement::name + GXmlText::table.load.votableGXmlElement::name + GXmlText::samp.hub.event.unregisterGXmlElement::name + GXmlText::script.aladin.sendGXmlElement::name + GXmlText::samp.hub.event.registerGXmlElement::name + GXmlText::table.select.rowListGXmlElement::name + GXmlText::table.highlight.rowGXmlElement::name + GXmlText::table.load.fitsGXmlElement::name + GXmlText::samp.app.pingGXmlElement::name + GXmlText::coord.pointAt.skyGXmlElement::name + GXmlText::samp.hub.event.shutdownGXmlElement::name + GXmlText::image.load.fitsGXmlElement::name + GXmlText::samp.hub.disconnectGXmlElement::name + GXmlText::table.load.votableGXmlElement::name + GXmlText::samp.hub.event.unregisterGXmlElement::name + GXmlText::script.aladin.sendGXmlElement::name + GXmlText::samp.hub.event.registerGXmlElement::name + GXmlText::table.select.rowListGXmlElement::name + GXmlText::table.highlight.rowGXmlElement::name + GXmlText::table.load.fitsGXmlElement::name + GXmlText::samp.app.pingGXmlElement::name + GXmlText::coord.pointAt.skyGXmlElement::name + GXmlText::samp.hub.event.shutdownGXmlElement::name + GXmlText::image.load.fitsGXmlElement::name + GXmlText::samp.hub.disconnectGXmlElement::name + GXmlText::table.load.votableGXmlElement::name + GXmlText::samp.hub.event.unregisterGXmlElement::name GXmlText::script.aladin.send \ No newline at end of file diff --git a/src/vo/GVOHub.cpp b/src/vo/GVOHub.cpp index 00afe11..51a0f13 100644 --- a/src/vo/GVOHub.cpp +++ b/src/vo/GVOHub.cpp @@ -241,6 +241,7 @@ void GVOHub::register_service(const GXml& xml, const socklen_t& sock) std::cout<< new_app->m_id << std::endl; std::cout<< "Nb. of current applications registered:" << std::endl; std::cout<< m_connected_apps.size()<< std::endl; + for( i=0,q=m_connected_apps.begin(); iprint(); @@ -367,7 +368,7 @@ void GVOHub::declare_subscriptions(const GXml& xml,const socklen_t& sock) } } - std::cout<< "Nb. of current applications registered:" << std::endl; + std::cout<< "Searching object for this application... Nb. of current applications registered:" << std::endl; std::cout<< m_connected_apps.size()<< std::endl; for( i=0,q=m_connected_apps.begin(); i GVOHub::get_registrations(const GXml& xml, int num = node->elements("member"); for (int i = 0; i < num; ++i) { std::cout << i << std::endl; - std::cout << "Affichage du membre\n"; - std::cout << *(node->element("member", i)) << std::cout; + //std::cout << "Affichage du membre\n"; + //std::cout << *(node->element("member", i)) << std::cout; subnode = node->element("member", i); subnode = subnode->element("name", 0); - std::cout << "\nsubnode" << std::endl; - std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout; + //std::cout << "\nsubnode" << std::endl; + //std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout; value.push_front(node->element("member",i)->element("name", 0)->print(NORMAL,0)); - std::cout << "\nFin Affichage du membre\n"; + //std::cout << "\nFin Affichage du membre\n"; } } } -- libgit2 0.21.4