From: miles Date: Thu, 11 Oct 2012 20:14:15 +0000 (+0000) Subject: species elimination working, must be known before heatmap is generated. X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=56d7235b0cbf1d7d72e9e677c40613a64119928d;p=old-jaiswallab-svn%2F.git species elimination working, must be known before heatmap is generated. next update hopefully will have checkboxes. ` svn path=/; revision=399 --- diff --git a/Personnel/miles/Web Page/Heatmap.jar b/Personnel/miles/Web Page/Heatmap.jar index a39e06f..afcfb49 100644 Binary files a/Personnel/miles/Web Page/Heatmap.jar and b/Personnel/miles/Web Page/Heatmap.jar differ diff --git a/Personnel/miles/Web Page/Main Page.html b/Personnel/miles/Web Page/Main Page.html index 6fabc80..c040e72 100644 --- a/Personnel/miles/Web Page/Main Page.html +++ b/Personnel/miles/Web Page/Main Page.html @@ -5,17 +5,21 @@ -Please enter all the gene IDs you would like the Heat Map to reference, -each on its own line. Click "Submit" when done: +Please enter all the gene IDs you would like the Heat Map to reference, each on its own line in the first box.
+In the second box, enter all species you would like excluded from the final Heat Map.
+Click "Submit" when done: +

diff --git a/Personnel/miles/Web Page/heatMap.php b/Personnel/miles/Web Page/heatMap.php index e3124c7..f539ce9 100644 --- a/Personnel/miles/Web Page/heatMap.php +++ b/Personnel/miles/Web Page/heatMap.php @@ -5,7 +5,7 @@ "; $input = ""; if (!isset($_POST["geneIDs"])) { echo "Heatmap "; @@ -18,8 +18,16 @@ if(!preg_match("/[a-zA-Z0-9\.]/", substr($input,-1))) { $input = substr_replace($input ,"",-1); } } -$finalInput = "webpage " . $input; -exec("java -Djava.awt.headless=true -jar Heatmap.jar " . $finalInput, $output); +$excludedSpecies = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", " ", $_POST["excludedSpecies"]); +if(!preg_match("/[a-zA-Z0-9\.]/", substr($excludedSpecies,-1))) { + $excludedSpecies = substr_replace($excludedSpecies ,"",-1); + } +echo $excludedSpecies . "
"; + +$excludedSpecies = trim($_POST["excludedSpecies"]); +$finalInput = "webpage " . $excludedSpecies . ";" . $input; +echo $finalInput . "
"; +exec("java -Djava.awt.headless=true -jar Heatmap.jar " . "\"" . $finalInput . "\"", $output); //main heatmap data parsing $tmp;