Subscription system improvements.

SubscriptionManager.cpp

@@ -4,13 +4,18 @@
 namespace core {
 
    SubscriptionManager::SubscriptionManager() {}
-
+	
+	int SubscriptionManager::add(Subscription &subscription) {
+		subscriptions.insert(std::make_pair(subscription.id, &subscription));
+		return 1;
+	}
+	
    int SubscriptionManager::removeSessionSubscriptions(TCPSession &session) {
       int countSubscribed = 0;
       int countPublished = 0;
       for(auto subscription = subscriptions.begin(); subscription != subscriptions.end();) {
          countSubscribed += (*subscription).second->unsubscribe(session);
-         if(&(*subscription).second->owner == &session) {
+         if((*subscription).second->owner == &session) {
             subscription = subscriptions.erase(subscription);
             delete (*subscription).second;
             ++countPublished;
@@ -24,19 +29,15 @@ namespace core {
    }
 
    int SubscriptionManager::processCommand(coreutils::ZString &request, TCPSession &session) {
-
-      coreutils::Log(coreutils::LOG_DEBUG_2) << "Processing subscription request: " << request << ".";
-
       if(request[0].equals("publish")) {
          Subscription *newSubscription = new Subscription(request[1].str(), session);
          subscriptions.insert(std::make_pair(request[1].str(), newSubscription));
-
 	      return 1;
       } else if(request[0].equals("catalog")) {
       	session.out << ":catalog:";
          for(auto const& [key, subscription] : subscriptions) {
 	  	      session.out << subscription->id << "|";
-            subscription->processCommand(request, session);
+//            subscription->processCommand(request, session);
      	      session.out << (";");
          }
  	      session.out << std::endl;
@@ -53,7 +54,7 @@ namespace core {
          } else if(request[0].equals("unsubscribe")) {
 	         subscription->unsubscribe(session);
          } else if(request[0].equals("event")) {
-            if(&subscription->owner == &session) {
+            if(subscription->owner == &session) {
                std::stringstream out;
                subscription->process(request, out);
 	            subscription->event(out);