From 068643d38f303fb621181346d89983a96154e87b Mon Sep 17 00:00:00 2001
From: Sebastian Piwell <sebastian.piwell@gmail.com>
Date: Tue, 17 May 2016 10:19:05 -0400
Subject: [PATCH] Removed a function

---
 modules/iswa/util/iswamanager.cpp | 37 +++++++++++++++----------------
 modules/iswa/util/iswamanager.h   |  1 -
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 157f84018b..d2f9734da3 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -440,28 +440,27 @@ void IswaManager::fillCygnetInfo(std::string jsonString){
     if(jsonString != ""){
         json j = json::parse(jsonString);
         
-        fillFromJSONArray(j["listOfPriorityCygnets"]);
-        fillFromJSONArray(j["listOfOKCygnets"]);
-        // fillFromJSONArray(j["listOfStaleCygnets"]);
-        // fillFromJSONArray(j["listOfInactiveCygnets"]);
-        
-    }
-}
+        std::set<std::string> lists  =  {"listOfPriorityCygnets", "listOfOKCygnets"
+                                        // ,"listOfStaleCygnets", "listOfInactiveCygnets",
+                                        };
 
-void IswaManager::fillFromJSONArray(json jsonList){
-    for(int i=0; i<jsonList.size(); i++){
-        json jCygnet = jsonList.at(i);
+        for(auto list : lists){
+            json jsonList = j[list];
+            for(int i=0; i<jsonList.size(); i++){
+            json jCygnet = jsonList.at(i);
 
-        std::string name = jCygnet["cygnetDisplayTitle"];
-        std::replace(name.begin(), name.end(),'.', ',');
+            std::string name = jCygnet["cygnetDisplayTitle"];
+            std::replace(name.begin(), name.end(),'.', ',');
 
-        CygnetInfo info = {
-            name,
-            jCygnet["cygnetDescription"],
-            jCygnet["cygnetUpdateInterval"],
-            false
-        };
-        _cygnetInformation[jCygnet["cygnetID"]] = std::make_shared<CygnetInfo>(info);
+            CygnetInfo info = {
+                name,
+                jCygnet["cygnetDescription"],
+                jCygnet["cygnetUpdateInterval"],
+                false
+            };
+            _cygnetInformation[jCygnet["cygnetID"]] = std::make_shared<CygnetInfo>(info);
+            }
+        }        
     }
 }
 
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index 48841f9a88..184ddfee17 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -104,7 +104,6 @@ private:
     void createSphere(std::shared_ptr<MetadataFuture> data);
 
     void fillCygnetInfo(std::string jsonString);
-    void fillFromJSONArray(nlohmann::json jsonList);
 
     std::map<std::string, std::string> _month;
     std::map<int, std::string> _type;