From 9f3588839795eddc764c08c13bd4f230fa635e2c Mon Sep 17 00:00:00 2001
From: Thierry Louge <tlouge@irap.omp.eu>
Date: Tue, 17 Mar 2015 10:06:48 +0100
Subject: [PATCH] Revert "Hub is functionning, pb with visibility of list of apps"

---
 registrations.txt |  3 +++
 src/vo/GVOHub.cpp | 15 +++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/registrations.txt b/registrations.txt
index 1c22c51..6f829ba 100644
--- a/registrations.txt
+++ b/registrations.txt
@@ -490,6 +490,7 @@ GXmlElement::name
   GXmlText::samp.hub.disconnectGXmlElement::name
   GXmlText::table.load.votableGXmlElement::name
   GXmlText::samp.hub.event.unregisterGXmlElement::name
+<<<<<<< HEAD
   GXmlText::script.aladin.sendGXmlElement::name
   GXmlText::samp.hub.event.registerGXmlElement::name
   GXmlText::table.select.rowListGXmlElement::name
@@ -538,4 +539,6 @@ GXmlElement::name
   GXmlText::samp.hub.disconnectGXmlElement::name
   GXmlText::table.load.votableGXmlElement::name
   GXmlText::samp.hub.event.unregisterGXmlElement::name
+=======
+>>>>>>> parent of a9b1ce3... Hub is functionning, pb with visibility of list of apps
   GXmlText::script.aladin.send
\ No newline at end of file
diff --git a/src/vo/GVOHub.cpp b/src/vo/GVOHub.cpp
index 43eab28..3fc06f2 100644
--- a/src/vo/GVOHub.cpp
+++ b/src/vo/GVOHub.cpp
@@ -251,6 +251,7 @@ std::cout << m_connected_apps.size()<< std::endl;
     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;
+<<<<<<< HEAD
     */
 
     /*
@@ -259,6 +260,8 @@ std::cout << m_connected_apps.size()<< std::endl;
       std::cout << m_connected_apps[i].print() << std::endl;
     }
     */
+=======
+>>>>>>> parent of a9b1ce3... Hub is functionning, pb with visibility of list of apps
     for( i=0,q=m_connected_apps.begin(); i<m_connected_apps.size(); i++,q++ ) {
       std::cout << "Displaying element of applications list:" << std::endl;
       content = (q)->print();
@@ -385,7 +388,7 @@ void GVOHub::declare_subscriptions(const GXml& xml,const socklen_t& sock)
         }
     }
     
-    std::cout<< "Searching object for this application... Nb. of current applications registered:" << 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(); i<m_connected_apps.size(); i++,q++ ) {
       std::cout << "Displaying element of applications list:" << std::endl;
@@ -899,14 +902,14 @@ std::list<std::string> 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