remove nested array return

csw11004 · Oct 1, 2015 · 85705d5 · 85705d5
1 parent e845f71
commit 85705d5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/VQI_GenomeBrowser.js b/VQI_GenomeBrowser.js
@@ -1243,8 +1243,8 @@ function VQI_GenomeBrowser(id, serviceURL) {
             var start = (Math.round(xScale.domain()[0])).toString();
             var end = (Math.round(xScale.domain()[1])).toString();
             var chrom = chrom_curr;
-            var fileHandles = [fileHandle];
+            //var fileHandles = [fileHandle];
-            var name = [this.name];
+            var name = this.name;
 
             var LoadingText = group.append("g")
             LoadingText.append("rect")
@@ -1268,15 +1268,15 @@ function VQI_GenomeBrowser(id, serviceURL) {
                 dataType: "json",
                 data: {
                     "getTrackData": "",
-                    "fileHandles": fileHandles,
+                    "fileHandles": fileHandle,
                     "name": name,
                     "chrom": chrom,
                     "start": start,
                     "end": end
                 }
 
                 }).success(function (returnData) {
-                    drawTrack(returnData[name]);
+                    drawTrack(returnData);
                     LoadingText.remove();
                 }
                 ).error(function (req, status, error) {
@@ -1511,8 +1511,8 @@ function VQI_GenomeBrowser(id, serviceURL) {
             var start = (Math.round(xScale.domain()[0])).toString();
             var end = (Math.round(xScale.domain()[1])).toString();
             var chrom = chrom_curr;
-            var fileHandles = [fileHandle];
+            //var fileHandles = [fileHandle];
-            var name = [this.name];
+            var name = this.name;
 
             var LoadingText = group.append("g")
             LoadingText.append("rect")
@@ -1536,18 +1536,21 @@ function VQI_GenomeBrowser(id, serviceURL) {
                 dataType: "json",
                 data: {
                     "getTrackData": "",
-                    "fileHandles": fileHandles,
+                    "fileHandles": fileHandle,
                     "name": name,
                     "chrom": chrom,
                     "start": start,
                     "end": end
                 }
 
                 }).success(function (returnData) {
-                    if(returnData.length === 1) //if no exons exist
+                    if(returnData.length == 2) {//exons exist
-                        drawTrack(returnData[name]);
+
-                    else
+                        drawTrack(returnData[0], returnData[1]);
-                        drawTrack(returnData[name][0], returnData[name][1]);
+                    }
+                    else{
+                        drawTrack(returnData);
+                    }
                     LoadingText.remove();
                 }
                 ).error(function (req, status, error) {

diff --git a/dynamic_loading.php b/dynamic_loading.php
@@ -442,23 +442,23 @@
         return $resArray;
     }
 
-    function getTrackData($fileHandles,$name,$chrom,$start,$end){
+    function getTrackData($fileHandle,$name,$chrom,$start,$end){
-        $returnArray = [];
+
-        foreach ($fileHandles as $key => $value) {
+
             # code...
-            if ($name[$key] == "HG19"){
+        if ($name == "HG19"){
-                $resArray = getHG19TrackData($fileHandles[$key],$chrom,$start,$end);
+            $resArray = getHG19TrackData($fileHandle,$chrom,$start,$end);
-                $returnArray["HG19"] = $resArray;
+            return $resArray;
-                continue;
-            }
-            if ($name[$key] == "cpg"){
-                $resArray = getCpgTrackData($fileHandles[$key],$chrom,$start,$end);
-                $returnArray["cpg"] = $resArray;
-                continue;
-            }
 
-            $fileHandle = $value;
+        }
+        else if ($name == "cpg"){
+            $resArray = getCpgTrackData($fileHandle,$chrom,$start,$end);
+            return $resArray;
+        }
 
+
+        //$fileHandle = $value;
+        else{
             $db_name = $GLOBALS['db_name'];
             $link = $GLOBALS['DBlink'];
             $resArray = [];
@@ -517,10 +517,11 @@
                 array_push($resArray, $mergedRect);
 
             }
-            $resArray = [$resArray];
+            // $resArray = [$resArray];
-            $returnArray[$name[$key]] = $resArray;
+            // $returnArray[$name[$key]] = $resArray;
+            //$array = [$resArray];
+            return $resArray;
         }
-        return $returnArray;
     }
 
     function getFullTrackData($fileHandles){