Thierry Louge / gammalib

Commit 9f3588839795eddc764c08c13bd4f230fa635e2c

Authored by Thierry Louge
1 parent 0ebbbedc

Revert "Hub is functionning, pb with visibility of list of apps" 

This reverts commit a9b1ce3fa9726af3d5bfe37619717e68516ede66.

Conflicts:
	registrations.txt
	src/vo/GVOHub.cpp
Inline Side-by-side
Showing 2 changed files with 12 additions and 6 deletions
registrations.txt
  View file @9f35888
... ... @@ -490,6 +490,7 @@ 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 +<<<<<<< HEAD
493 494 GXmlText::script.aladin.sendGXmlElement::name
494 495 GXmlText::samp.hub.event.registerGXmlElement::name
495 496 GXmlText::table.select.rowListGXmlElement::name
... ... @@ -538,4 +539,6 @@ GXmlElement::name
538 539 GXmlText::samp.hub.disconnectGXmlElement::name
539 540 GXmlText::table.load.votableGXmlElement::name
540 541 GXmlText::samp.hub.event.unregisterGXmlElement::name
  542 +=======
  543 +>>>>>>> parent of a9b1ce3... Hub is functionning, pb with visibility of list of apps
541 544 GXmlText::script.aladin.send
542 545 \ No newline at end of file
... ...
src/vo/GVOHub.cpp
  View file @9f35888
... ... @@ -251,6 +251,7 @@ std::cout &lt;&lt; m_connected_apps.size()&lt;&lt; std::endl;
251 251 std::cout<< new_app->m_id << std::endl;
252 252 std::cout<< "Nb. of current applications registered:" << std::endl;
253 253 std::cout<< m_connected_apps.size()<< std::endl;
  254 +<<<<<<< HEAD
254 255 */
255 256  
256 257 /*
... ... @@ -259,6 +260,8 @@ std::cout &lt;&lt; m_connected_apps.size()&lt;&lt; std::endl;
259 260 std::cout << m_connected_apps[i].print() << std::endl;
260 261 }
261 262 */
  263 +=======
  264 +>>>>>>> parent of a9b1ce3... Hub is functionning, pb with visibility of list of apps
262 265 for( i=0,q=m_connected_apps.begin(); i<m_connected_apps.size(); i++,q++ ) {
263 266 std::cout << "Displaying element of applications list:" << std::endl;
264 267 content = (q)->print();
... ... @@ -385,7 +388,7 @@ void GVOHub::declare_subscriptions(const GXml&amp; xml,const socklen_t&amp; sock)
385 388 }
386 389 }
387 390  
388   - std::cout<< "Searching object for this application... Nb. of current applications registered:" << std::endl;
  391 + std::cout<< "Nb. of current applications registered:" << std::endl;
389 392 std::cout<< m_connected_apps.size()<< std::endl;
390 393 for( i=0,q=m_connected_apps.begin(); i<m_connected_apps.size(); i++,q++ ) {
391 394 std::cout << "Displaying element of applications list:" << std::endl;
... ... @@ -899,14 +902,14 @@ std::list&lt;std::string&gt; GVOHub::get_registrations(const GXml&amp; xml,
899 902 int num = node->elements("member");
900 903 for (int i = 0; i < num; ++i) {
901 904 std::cout << i << std::endl;
902   - //std::cout << "Affichage du membre\n";
903   - //std::cout << *(node->element("member", i)) << std::cout;
  905 + std::cout << "Affichage du membre\n";
  906 + std::cout << *(node->element("member", i)) << std::cout;
904 907 subnode = node->element("member", i);
905 908 subnode = subnode->element("name", 0);
906   - //std::cout << "\nsubnode" << std::endl;
907   - //std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout;
  909 + std::cout << "\nsubnode" << std::endl;
  910 + std::cout << node->element("member",i)->element("name", 0)->print(NORMAL,0) << std::cout;
908 911 value.push_front(node->element("member",i)->element("name", 0)->print(NORMAL,0));
909   - //std::cout << "\nFin Affichage du membre\n";
  912 + std::cout << "\nFin Affichage du membre\n";
910 913 }
911 914 }
912 915 }
... ...