remove duplicate code

TriticeaeToolbox · Mar 30, 2017 · 5339981 · 5339981
1 parent 4c05f4d
commit 5339981
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2,056 deletions.
diff --git a/analyze/histo.php b/analyze/histo.php
@@ -17,7 +17,7 @@
 
 require_once 'config.php';
 require $config['root_dir'].'includes/bootstrap.inc';
-require $config['root_dir'] . 'downloads/downloads_class2.php';
+require $config['root_dir'] . 'downloads/downloads_class.php';
 
 $mysqli = connecti();
 
@@ -26,9 +26,7 @@
 
 /** Using a PHP class to display histogram
  *
- * @category PHP
- * @package  T3
- * @author   Clay Birkett <[email protected]>
+ * @author   Clay Birkett <[email protected]>
  * @license  http://triticeaetoolbox.org/wheat/docs/LICENSE Berkeley-based
  * @link     http://triticeaetoolbox.org/wheat/histo.php
  *
@@ -199,9 +197,12 @@ private function runHisto()
             fclose($h);
         }
         if (file_exists("/tmp/tht/$filename4")) {
-                  print "<img src=\"/tmp/tht/$filename4\" /><br>";
+            print "<img src=\"/tmp/tht/$filename4\"/>";
+            print "<form method=\"get\" action=\"/tmp/tht/$filename4\">";
+            print "<button type=\"submit\">Download Image</button>";
+            print "</form>";
         } else {
-                  echo "Error in R script R/GShisto.R<br>\n";
+            echo "Error in R script R/GShisto.R<br>\n";
         }
     }
 

diff --git a/analyze/outlier.php b/analyze/outlier.php
@@ -13,7 +13,7 @@
 
 require_once 'config.php';
 require $config['root_dir'] . 'includes/bootstrap2.inc';
-require $config['root_dir'] . 'downloads/downloads_class2.php';
+require $config['root_dir'] . 'downloads/downloads_class.php';
 
 $mysqli = connecti();
 

diff --git a/analyze/training.php b/analyze/training.php
@@ -14,7 +14,7 @@
 require_once 'config.php';
 require $config['root_dir'] . 'includes/bootstrap2.inc';
 require $config['root_dir'] . 'downloads/marker_filter.php';
-require $config['root_dir'] . 'downloads/downloads_class2.php';
+require $config['root_dir'] . 'downloads/downloads_class.php';
 set_time_limit(0);
 
 $mysqli = connecti();
@@ -238,6 +238,7 @@ private function type1Checksession()
               <option value="AOPT"> AOPT
               </select>
             </table>
+            <img alt="spinner" id="spinner" src="images/ajax-loader.gif" style="display:none;" />
             </div>
             <?php
         } elseif (isset($_SESSION['selected_lines'])) {
@@ -365,9 +366,9 @@ private function type1Session()
         $dtype = "qtlminer";
         $h = fopen("$dir/$filename", "w");
         if ($typeGE == "true") {
-            $output = type4BuildMarkersDownload($experiment_uid, $min_maf, $max_missing, $dtype, $h);
+            type4BuildMarkersDownload($experiment_uid, $min_maf, $max_missing, $dtype, $h);
         } else {
-            $output = $dObj->type3BuildMarkersDownload($lines, $markers, $dtype, $h);
+            $dObj->type3BuildMarkersDownload($lines, $markers, $dtype, $h);
         }
         fclose($h);
         $estimate = count($lines) + count($markers);

diff --git a/downloads/downloads.php b/downloads/downloads.php
@@ -32,4 +32,8 @@
 require_once $config['root_dir'].'downloads/vcf_class.php';
 require 'downloads_class.php';
 
-new Downloads($_GET['function']);
+if (isset($_GET['function'])) {
+    new Downloads($_GET['function']);
+} else {
+    new Downloads("web");
+}
diff --git a/downloads/downloads_class.php b/downloads/downloads_class.php
@@ -86,7 +86,7 @@ public function __construct($function = null)
             case 'verifyLines':
                 $this->verifyLines();
                 break;
-            default:
+            case 'web':
                 $this->type1Select();
                 break;
         }
@@ -1050,7 +1050,7 @@ private function cmp($a, $b) {
      * 
      * @return NULL
      */
-    function type1_build_traits_download($experiments, $traits, $datasets)
+    public function type1_build_traits_download($experiments, $traits, $datasets)
     {
         global $mysqli;
         $delimiter = "\t";
@@ -1133,7 +1133,7 @@ function type1_build_traits_download($experiments, $traits, $datasets)
      * @param string $dtype
      * @return string
      */
-    private function type1_build_tassel_traits_download($experiments, $traits, $datasets, $subset, $dtype)
+    public function type1_build_tassel_traits_download($experiments, $traits, $datasets, $subset, $dtype)
     {
         global $mysqli;
         $delimiter = "\t";