Info Choice Changes:

        -view ontology button now works for both box and cluster
searches

svn path=/; revision=450

diff --git a/Personnel/miles/Web Page/infoChoice.php b/Personnel/miles/Web Page/infoChoice.php
index 37adc831ca0ebbcec83b3b2621f0f1b54f120b1f..fa18081cb2d10999c210c7fc7726a39893aebcae 100644 (file)
--- a/Personnel/miles/Web Page/infoChoice.php
+++ b/Personnel/miles/Web Page/infoChoice.php
@@ -4,6 +4,12 @@
 <?php
 if($_POST["type"] == "cluster") {
 
+      echo "<form name=\"Branch\" method=\"post\" action=\"viewOntology.php\">\n";
+      echo "<input type=\"submit\" value=\"View Ontology\">\n";
+      echo "<input type=\"hidden\" name=\"param\" value=\"\">\n";
+      echo "</form>\n";
+      echo "<br> <br>\n";
+
       $username="inparanoid-read-user";
       $password="inparanoid-read-user_pw";
       $database="inparanoid_data";
@@ -30,8 +36,19 @@ if($_POST["type"] == "cluster") {
        $row = mysql_fetch_row($results);
        }
 
+      $query="select gene from super_clust where super_id=" . $info[0] . " order by gene";
+      $results=mysql_query($query);
+
+      $i = 0;
+      $genes;
+      while($row != null) {
+       $genes[$i] = $row[0];
+       $row = mysql_fetch_row($results);
+       }
+
       mysql_close($connection);
 
+
 } else if($_POST["type"] == "species") {
       $username="inparanoid-read-user";
       $password="inparanoid-read-user_pw";
@@ -145,8 +162,9 @@ mysql_close($connection);
 ?>
 
 <script type="text/javascript">
-if(<?php echo ($_POST["type"] == "box") ?> == 1) {
+if(<?php echo (($_POST["type"] == "box") || ($_POST["type"] == "cluster")) ?> == 1) {
   document.Branch.param.value = "<?php echo $genes ?>";
+  alert("<?php echo $genes ?>");
 }
 </script>
 

diff --git a/Personnel/miles/Web Page/viewOntology.php b/Personnel/miles/Web Page/viewOntology.php
index e2c04f82c161b3385d1115e9bacb818bd6b15d88..318fca3eced9684028ddce5e3253386138e876c8 100644 (file)
--- a/Personnel/miles/Web Page/viewOntology.php
+++ b/Personnel/miles/Web Page/viewOntology.php
@@ -62,16 +62,17 @@ for($i = 0; $i < sizeof($genes); $i++) {
 }
 
 $query = "select full_name,term_id,concat(acc, \"- \", name),evnum from (select full_name,term_id,count(*) as evnum from gene_product left join association on association.gene_product_id=gene_product.id " . $logic . "group by full_name,term_id order by full_name,term_id) as temp left join term on term.id=term_id order by full_name,acc";
+echo $query;
 $results=mysql_query($query);
 
 $t = 0;
 $g = -1;
 $cellData;
-
+$finalGenes;
+$fg = 0;
 for($row = mysql_fetch_row($results); $row != null; $row = mysql_fetch_row($results)) {
   if(($g == -1) || ($genes[$g] != $row[0])) {
     $g ++;
-    $genes[$g];
     for($t = 0; $t < sizeof($terms); $t++) {
       $cellData[$g][$t][0] = 0;
     }