View Ontology Changes

        - download tab delimited file button now only includes currently
          visible terms

svn path=/; revision=464

diff --git a/Personnel/miles/Web Page/infoChoice.php b/Personnel/miles/Web Page/infoChoice.php
index a9a3abf17abe1ee9f82a0117b78415c252db91b8..c36f65ceb6f085661909691c1c8c10f3ecaa4c8d 100644 (file)
--- a/Personnel/miles/Web Page/infoChoice.php
+++ b/Personnel/miles/Web Page/infoChoice.php
@@ -6,10 +6,10 @@ if($_POST["type"] == "cluster") {
 
       echo "<form name=\"viewOntology\" method=\"post\" action=\"viewOntology.php\">\n";
       echo "<p> Possible Ontologies: <br>";
-      echo "<input type=\"checkbox\" name=\"Anatomy\" value=\"Anatomy\">";
-      echo "Anatomy <br>";
-      echo "<input type=\"checkbox\" name=\"Growth\" value=\"Growth\">";
-      echo "Growth <br>";
+      echo "<input type=\"checkbox\" name=\"Anatomy\" value=\"Anatomy\" checked=\"true\">";
+      echo "Anatomy <br>\n";
+      echo "<input type=\"checkbox\" name=\"Growth\" value=\"Growth\" checked=\"true\">";
+      echo "Growth <br>\n";
       echo "<input type=\"submit\" value=\"View Ontology\" onClick=process()>\n";
       echo "<input type=\"hidden\" name=\"param\" value=\"null\">\n";
       echo "<input type=\"hidden\" name=\"ontologies\" value=\"\">\n";
@@ -156,9 +156,9 @@ mysql_close($connection);
 
       echo "<form name=\"viewOntology\" method=\"post\" action=\"viewOntology.php\">\n";
       echo "<p> Possible Ontologies: <br>";
-      echo "<input type=\"checkbox\" name=\"Anatomy\" value=\"Anatomy\">";
-      echo "Plant Ontology: Anatomy <br>";
-      echo "<input type=\"checkbox\" name=\"Growth\" value=\"Growth\">";
+      echo "<input type=\"checkbox\" name=\"Anatomy\" value=\"Anatomy\" checked=\"true\">";
+      echo "Plant Ontology: Anatomy <br>\n";
+      echo "<input type=\"checkbox\" name=\"Growth\" value=\"Growth\" checked=\"true\">";
       echo "Plant Ontology: Growth <br>";
       echo "<input type=\"submit\" value=\"View Ontology\" onClick=process()>\n";
       echo "<input type=\"hidden\" name=\"param\" value=\"null\">\n";

diff --git a/Personnel/miles/Web Page/viewOntology.php b/Personnel/miles/Web Page/viewOntology.php
index 3ca0b4f2d84cffa622a1c763f1a2f1f58a7694b9..39d2b9111e8726540c07ccaa6cafa7f583db7c70 100644 (file)
--- a/Personnel/miles/Web Page/viewOntology.php
+++ b/Personnel/miles/Web Page/viewOntology.php
@@ -537,7 +537,7 @@ function getGeneInfo(gene) {
 function downloadTabDem() {
   var size = 0;
   for(var i = 0; i < checkBoxes.length; i ++) {
-    if(checkBoxes[i]) size++;
+    if(checkBoxes[i] && isIn(terms[i][1],legalOntologies)) size++;
   }
   if(size == 0) {
     return;
@@ -548,7 +548,7 @@ function downloadTabDem() {
     toSend[g] = new Array(size);
     var j = 0;
     for(var t = 0; t < cellData[g].length; t ++) {
-      if(checkBoxes[t]) {
+      if(checkBoxes[t] && isIn(terms[t][1],legalOntologies)) {
        toSend[g][j] = cellData[g][t].join(",");
        j++;
       }
@@ -561,7 +561,7 @@ function downloadTabDem() {
   var sendTerms = new Array(size);
   j = 0;
   for(var i = 0; i < terms.length; i ++) {
-    if(checkBoxes[i]) {
+    if(checkBoxes[i] && isIn(terms[i][1],legalOntologies)) {
       sendTerms[j]=terms[i][0];
       j++;
     }