Merge pull request #1492 from gluneau/CouchDB-getSubproject-and-getPr…

…oject replaced old methods of getting projectlist and subproject list
aces · Jan 22, 2016 · 76eef03 · 76eef03
2 parents 0cf4079 + cb9e8a2
commit 76eef03
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/tools/CouchDB_Import_Demographics.php b/tools/CouchDB_Import_Demographics.php
@@ -95,23 +95,17 @@ function __construct() {
 
     function _getSubproject($id) {
         $config = NDB_Config::singleton();
-        $subprojsXML = $config->getSetting("subprojects");
-        $subprojs = $subprojsXML['subproject'];
-        foreach($subprojs as $subproj) {
-            if($subproj['id'] == $id) {
-                return $subproj['title'];
-            }
+        $subprojs = $config->getSubprojectSettings($id);
+        if($subprojs['id'] == $id) {
+            return $subprojs['title'];
         }
     }
 
     function _getProject($id) {
         $config = NDB_Config::singleton();
-        $subprojsXML = $config->getSetting("Projects");
-        $subprojs = $subprojsXML['project'];
-        foreach($subprojs as $subproj) {
-            if($subproj['id'] == $id) {
-                return $subproj['title'];
-            }
+        $projs = $config->getProjectSettings($id);
+        if($projs['id'] == $id) {
+            return $projs['Name'];
         }
     }