From: miles Date: Fri, 15 Mar 2013 22:42:37 +0000 (+0000) Subject: not sure if heatmap is working, wanted something to revert to X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=5ff50343131b2a4a099a5bbbb061e4c4cc6454a4;p=old-jaiswallab-svn%2F.git not sure if heatmap is working, wanted something to revert to svn path=/; revision=436 --- diff --git a/Personnel/miles/Web Page/heatMap.php b/Personnel/miles/Web Page/heatMap.php index c4e4154..ad0f06c 100644 --- a/Personnel/miles/Web Page/heatMap.php +++ b/Personnel/miles/Web Page/heatMap.php @@ -222,7 +222,7 @@ function drawMap(init) { scrolledTop = document.getElementById("scrollDiv").scrollTop - topScrollOffset +25; // NOTE the 25 accounts for the scrollbar offset allowing for scrolling up/left if(scrolledLeft > speciesCount*cellSize - maxCols*cellSize) { scrolledLeft = speciesCount*cellSize - maxCols*cellSize; - } + } //TODO examine this ^ if(scrolledLeft < 0) { scrolledLeft = 0; } diff --git a/Personnel/miles/Web Page/infoChoice.php b/Personnel/miles/Web Page/infoChoice.php index 0d0a694..5d87ce4 100644 --- a/Personnel/miles/Web Page/infoChoice.php +++ b/Personnel/miles/Web Page/infoChoice.php @@ -125,13 +125,22 @@ mysql_close($connection); echo "

\n"; $genes=""; + $first=true; $row = mysql_fetch_row($results); while($row != null) { + + echo "" . $row[0] . "
"; - $genes = $genes . $row[0] . ","; + if($first) { + $first = false; + $genes = $genes . $row[0]; + } else { + $genes = $genes . "," . $row[0]; + } $row = mysql_fetch_row($results); } mysql_close($connection); + echo $genes; } ?> diff --git a/Personnel/miles/Web Page/viewOntology.php b/Personnel/miles/Web Page/viewOntology.php index 1a8e4b6..cb2f557 100644 --- a/Personnel/miles/Web Page/viewOntology.php +++ b/Personnel/miles/Web Page/viewOntology.php @@ -25,15 +25,14 @@ $connection=mysql_connect($url,$username,$password); mysql_select_db($database); $logic = "where full_name like '"; -for($i = 0; $i + 1 < sizeof($genes); $i ++) { // note that the last parameter of $genes is an empty array +for($i = 0; $i < sizeof($genes); $i ++) { // note that the last parameter of $genes is an empty array $toAdd = $genes[$i] . "'"; - if($i + 2 < sizeof($genes)) { + if($i + 1 < sizeof($genes)) { $toAdd = $toAdd . " or full_name like '"; } $logic = $logic . $toAdd; } -echo "
logic: " . $logic . "
"; $query="select id from gene_product " . $logic . " order by id"; $results=mysql_query($query); @@ -43,11 +42,10 @@ for($row = mysql_fetch_row($results); $row != null; $row = mysql_fetch_row($resu $geneProductIDs[$i] = $row[0]; $i++; } - $logic = "where gene_product_id="; -for($i = 0; $i + 1 < sizeof($geneProductIDs); $i++) { +for($i = 0; $i < sizeof($geneProductIDs); $i++) { $toAdd = $geneProductIDs[$i]; - if($i + 2 < sizeof($geneProductIDs)) { + if($i + 1 < sizeof($geneProductIDs)) { $toAdd = $toAdd . " or gene_product_id="; } $logic = $logic . $toAdd; @@ -63,9 +61,9 @@ for($row = mysql_fetch_row($results); $row != null; $row = mysql_fetch_row($resu } $logic = "where id='"; -for($i = 0; $i + 1 < sizeof($termIDs); $i++) { +for($i = 0; $i < sizeof($termIDs); $i++) { $toAdd = $termIDs[$i] . "'"; - if($i + 2 < sizeof($termIDs)) { + if($i + 1 < sizeof($termIDs)) { $toAdd = $toAdd . " or id='"; } $logic = $logic . $toAdd; @@ -80,6 +78,47 @@ for($row = mysql_fetch_row($results); $row != null; $row = mysql_fetch_row($resu $i++; } + +$cellData; +//TODO this part needs the most optimization. It's really bad. +//theoretically this should return a two-dimensional array of booleans, representing whether or not each gene is referenced to each term +for($i = 0; $i < sizeof($genes); $i++) { + $query="select id from gene_product where full_name='" . $genes[$i] . "'"; + $results=mysql_query($query); + $row = mysql_fetch_row($results); + $productID = $row[0]; + + $query="select term_id from association where gene_product_id='" . $productID . "'"; + $results=mysql_query($query); + + $k = 0; + $geneTerms; + for($row = mysql_fetch_row($results); $row != null; $row = mysql_fetch_row($results)) { + $geneTerms[$k] = $row[0]; + $k++; + } + for($j=0;$j
@@ -88,11 +127,19 @@ Your browser does not support the canvas element.
- +
- + +