diff --git a/VQI_GenomeBrowser.js b/VQI_GenomeBrowser.js index 6203909..e163096 100755 --- 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 name = [this.name]; + //var fileHandles = [fileHandle]; + var name = this.name; var LoadingText = group.append("g") LoadingText.append("rect") @@ -1268,7 +1268,7 @@ function VQI_GenomeBrowser(id, serviceURL) { dataType: "json", data: { "getTrackData": "", - "fileHandles": fileHandles, + "fileHandles": fileHandle, "name": name, "chrom": chrom, "start": start, @@ -1276,7 +1276,7 @@ function VQI_GenomeBrowser(id, serviceURL) { } }).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 name = [this.name]; + //var fileHandles = [fileHandle]; + var name = this.name; var LoadingText = group.append("g") LoadingText.append("rect") @@ -1536,7 +1536,7 @@ function VQI_GenomeBrowser(id, serviceURL) { dataType: "json", data: { "getTrackData": "", - "fileHandles": fileHandles, + "fileHandles": fileHandle, "name": name, "chrom": chrom, "start": start, @@ -1544,10 +1544,13 @@ function VQI_GenomeBrowser(id, serviceURL) { } }).success(function (returnData) { - if(returnData.length === 1) //if no exons exist - drawTrack(returnData[name]); - else - drawTrack(returnData[name][0], returnData[name][1]); + if(returnData.length == 2) {//exons exist + + drawTrack(returnData[0], returnData[1]); + } + else{ + drawTrack(returnData); + } LoadingText.remove(); } ).error(function (req, status, error) { diff --git a/dynamic_loading.php b/dynamic_loading.php index 89a3ef4..d2d37d2 100644 --- a/dynamic_loading.php +++ b/dynamic_loading.php @@ -442,23 +442,23 @@ return $resArray; } - function getTrackData($fileHandles,$name,$chrom,$start,$end){ - $returnArray = []; - foreach ($fileHandles as $key => $value) { + function getTrackData($fileHandle,$name,$chrom,$start,$end){ + + # code... - if ($name[$key] == "HG19"){ - $resArray = getHG19TrackData($fileHandles[$key],$chrom,$start,$end); - $returnArray["HG19"] = $resArray; - continue; - } - if ($name[$key] == "cpg"){ - $resArray = getCpgTrackData($fileHandles[$key],$chrom,$start,$end); - $returnArray["cpg"] = $resArray; - continue; - } + if ($name == "HG19"){ + $resArray = getHG19TrackData($fileHandle,$chrom,$start,$end); + return $resArray; - $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]; - $returnArray[$name[$key]] = $resArray; + // $resArray = [$resArray]; + // $returnArray[$name[$key]] = $resArray; + //$array = [$resArray]; + return $resArray; } - return $returnArray; } function getFullTrackData($fileHandles){