Skip to content
Permalink
Browse files

Export/Upload fix

  • Loading branch information
csw11004 committed Sep 22, 2015
1 parent 2bf102c commit 727ad029afc99abda38bf29d2e3eb93c1e963508
Showing with 5 additions and 9 deletions.
  1. +3 −7 VQI_GenomeBrowser.js
  2. +2 −2 dynamic_loading.php
@@ -553,9 +553,9 @@ function VQI_GenomeBrowser(id, serviceURL) {
if(name !== undefined){
var trackName = name+" "+genome;
}
trackInfo.push({name: trackName, type: "bed", fileHandle: CurrentFileHandle});
trackInfo.push({name: trackName, type: "bed", args: {fileHandle: CurrentFileHandle, exportable: true}});
updateRecentTrackDropDown();
self.addTrack([] , trackName , "bed" , trackInfo[i].args);
self.addTrack([] , trackName , "bed" , {fileHandle: CurrentFileHandle, exportable: true});
}).error(function (req, status, error) {
$("body").append(status + ": " + error);
});
@@ -1277,8 +1277,6 @@ function VQI_GenomeBrowser(id, serviceURL) {

}).success(function (returnData) {
drawTrack(returnData[name]);

data = returnData;
LoadingText.remove();
}
).error(function (req, status, error) {
@@ -1550,8 +1548,6 @@ function VQI_GenomeBrowser(id, serviceURL) {
drawTrack(returnData[name]);
else
drawTrack(returnData[name][0], returnData[name][1]);

data = returnData;
LoadingText.remove();
}
).error(function (req, status, error) {
@@ -1604,6 +1600,7 @@ function VQI_GenomeBrowser(id, serviceURL) {
}
}).success(function (returnData) {
data = returnData;
data.unshift(["CHROM","CHROM_START","CHROM_END","GENESYMBOL","SCORE","STRAND"]);
}).error(function (req, status, error) {
$("body").append(status + ": " + error);
});
@@ -1746,7 +1743,6 @@ function VQI_GenomeBrowser(id, serviceURL) {
data[i] = [data[i], xStart + i]
}
drawTrack(data);
data = returnData;
LoadingText.remove();
}).error(function (req, status, error) {
$("body").append(status + ": " + error);
@@ -524,13 +524,13 @@ function getFullTrackData($fileHandles){
$db_name = $GLOBALS['db_name'];
$link = $GLOBALS['DBlink'];
$sql = "SELECT `CHROM`, `CHROM_START`, `CHROM_END`, `GENESYMBOL`, `SCORE` FROM {$db_name}.{$fileHandle}";
$sql = "SELECT `CHROM`, `CHROM_START`, `CHROM_END`, `GENESYMBOL`, `SCORE`, `STRAND` FROM {$db_name}.{$fileHandle}";
$sql .= " ORDER BY LENGTH(`CHROM`), `CHROM`, `CHROM_START` * 1 ASC";
$res = mysqli_query ($link,$sql);
while($row = mysqli_fetch_row($res)){
array_push($returnArray, [$row[0],$row[1],$row[2],$row[3],$row[4]]);
array_push($returnArray, [$row[0],$row[1],$row[2],$row[3],$row[4],$row[5]]);
}
}
return $returnArray;

0 comments on commit 727ad02

Please sign in to comment.
You can’t perform that action at this time.