Thierry Louge / gammalib

Commit a9b1ce3fa9726af3d5bfe37619717e68516ede66

Authored by Thierry Louge
1 parent 6f0f0ebc

Hub is functionning, pb with visibility of list of apps

Inline Side-by-side
Showing 2 changed files with 43 additions and 6 deletions
registrations.txt
  View file @a9b1ce3
... ... @@ -490,4 +490,40 @@ GXmlElement::name
490 490 GXmlText::samp.hub.disconnectGXmlElement::name
491 491 GXmlText::table.load.votableGXmlElement::name
492 492 GXmlText::samp.hub.event.unregisterGXmlElement::name
  493 + GXmlText::script.aladin.sendGXmlElement::name
  494 + GXmlText::samp.hub.event.registerGXmlElement::name
  495 + GXmlText::table.select.rowListGXmlElement::name
  496 + GXmlText::table.highlight.rowGXmlElement::name
  497 + GXmlText::table.load.fitsGXmlElement::name
  498 + GXmlText::samp.app.pingGXmlElement::name
  499 + GXmlText::coord.pointAt.skyGXmlElement::name
  500 + GXmlText::samp.hub.event.shutdownGXmlElement::name
  501 + GXmlText::image.load.fitsGXmlElement::name
  502 + GXmlText::samp.hub.disconnectGXmlElement::name
  503 + GXmlText::table.load.votableGXmlElement::name
  504 + GXmlText::samp.hub.event.unregisterGXmlElement::name
  505 + GXmlText::script.aladin.sendGXmlElement::name
  506 + GXmlText::samp.hub.event.registerGXmlElement::name
  507 + GXmlText::table.select.rowListGXmlElement::name
  508 + GXmlText::table.highlight.rowGXmlElement::name
  509 + GXmlText::table.load.fitsGXmlElement::name
  510 + GXmlText::samp.app.pingGXmlElement::name
  511 + GXmlText::coord.pointAt.skyGXmlElement::name
  512 + GXmlText::samp.hub.event.shutdownGXmlElement::name
  513 + GXmlText::image.load.fitsGXmlElement::name
  514 + GXmlText::samp.hub.disconnectGXmlElement::name
  515 + GXmlText::table.load.votableGXmlElement::name
  516 + GXmlText::samp.hub.event.unregisterGXmlElement::name
  517 + GXmlText::script.aladin.sendGXmlElement::name
  518 + GXmlText::samp.hub.event.registerGXmlElement::name
  519 + GXmlText::table.select.rowListGXmlElement::name
  520 + GXmlText::table.highlight.rowGXmlElement::name
  521 + GXmlText::table.load.fitsGXmlElement::name
  522 + GXmlText::samp.app.pingGXmlElement::name
  523 + GXmlText::coord.pointAt.skyGXmlElement::name
  524 + GXmlText::samp.hub.event.shutdownGXmlElement::name
  525 + GXmlText::image.load.fitsGXmlElement::name
  526 + GXmlText::samp.hub.disconnectGXmlElement::name
  527 + GXmlText::table.load.votableGXmlElement::name
  528 + GXmlText::samp.hub.event.unregisterGXmlElement::name
493 529 GXmlText::script.aladin.send
494 530 \ No newline at end of file
... ...
src/vo/GVOHub.cpp
  View file @a9b1ce3
... ... @@ -241,6 +241,7 @@ void GVOHub::register_service(const GXml& xml, const socklen_t& sock)
241 241 std::cout<< new_app->m_id << std::endl;
242 242 std::cout<< "Nb. of current applications registered:" << std::endl;
243 243 std::cout<< m_connected_apps.size()<< std::endl;
  244 +
244 245 for( i=0,q=m_connected_apps.begin(); i<m_connected_apps.size(); i++,q++ ) {
245 246 std::cout << "Displaying element of applications list:" << std::endl;
246 247 content = (*q)->print();
... ... @@ -367,7 +368,7 @@ void GVOHub::declare_subscriptions(const GXml&amp; xml,const socklen_t&amp; sock)
367 368 }
368 369 }
369 370  
370   - std::cout<< "Nb. of current applications registered:" << std::endl;
  371 + std::cout<< "Searching object for this application... Nb. of current applications registered:" << std::endl;
371 372 std::cout<< m_connected_apps.size()<< std::endl;
372 373 for( i=0,q=m_connected_apps.begin(); i<m_connected_apps.size(); i++,q++ ) {
373 374 std::cout << "Displaying element of applications list:" << std::endl;
... ... @@ -880,14 +881,14 @@ std::list&lt;std::string&gt; GVOHub::get_registrations(const GXml&amp; xml,
880 881 int num = node->elements("member");
881 882 for (int i = 0; i < num; ++i) {
882 883 std::cout << i << std::endl;
883   - std::cout << "Affichage du membre\n";
884   - std::cout << *(node->element("member", i)) << std::cout;
  884 + //std::cout << "Affichage du membre\n";
  885 + //std::cout << *(node->element("member", i)) << std::cout;
885 886 subnode = node->element("member", i);
886 887 subnode = subnode->element("name", 0);
887   - std::cout << "\nsubnode" << std::endl;
888   - std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout;
  888 + //std::cout << "\nsubnode" << std::endl;
  889 + //std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout;
889 890 value.push_front(node->element("member",i)->element("name", 0)->print(NORMAL,0));
890   - std::cout << "\nFin Affichage du membre\n";
  891 + //std::cout << "\nFin Affichage du membre\n";
891 892 }
892 893 }
893 894 }
... ...