From 1427e9bf4f85823164b4573a3bcf1ba3ba6b04d0 Mon Sep 17 00:00:00 2001
From: ziejd2
Date: Wed, 24 Feb 2021 15:19:03 -0600
Subject: Moving final GENENET8 version to master

---
 sourcecodes/bn_after_upload_gom.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'sourcecodes/bn_after_upload_gom.php')

diff --git a/sourcecodes/bn_after_upload_gom.php b/sourcecodes/bn_after_upload_gom.php
index 11a92650..f9427435 100644
--- a/sourcecodes/bn_after_upload_gom.php
+++ b/sourcecodes/bn_after_upload_gom.php
@@ -18,7 +18,7 @@ include("input_validate.php");
 //$searchID="";
 $searchID="YES";
 $UploadValue="NO";
-$TextFile=$_FILES["MyFile"]["name"];
+$TextFile=$HTTP_POST_FILES["MyFile"]["name"];
 
 
 /////////////Generate a random key/////////////////////
@@ -45,9 +45,9 @@ $TextFile=$_FILES["MyFile"]["name"];
 //$TextinFile=$dir.$sid."_orig.txt";
 
 
-if(isset($_POST["searchkey"]))
+if(isset($HTTP_POST_VARS["searchkey"]))
 {
-   $searchID=$_POST["searchkey"];
+   $searchID=$HTTP_POST_VARS["searchkey"];
 
 }
 
@@ -67,15 +67,15 @@ if($searchID=="")
 }
 
 
-if(isset($_POST["MyUpload"]))
+if(isset($HTTP_POST_VARS["MyUpload"]))
 {
-   $UploadValue=$_POST["MyUpload"];
+   $UploadValue=$HTTP_POST_VARS["MyUpload"];
    if ($UploadValue=="YES")
    {
         if($TextFile!="")
         {
 	  //	  $TextFile = valid_input($TextFile);
-            $sta=move_uploaded_file($_FILES['MyFile']['tmp_name'],$TextinFile);
+            $sta=move_uploaded_file($HTTP_POST_FILES['MyFile']['tmp_name'],$TextinFile);
             if(!$sta)
             {
                  echo "<script type='text/javascript'> window.alert ('Sorry, error uploading $TextFile.')</script>";
@@ -135,7 +135,7 @@ if($searchID!="")
   //$keyval = valid_keyval($keyval);
   //shell_exec('./run_scripts/run_prep_input '.$keyval);
   $keyval=valid_keyval($_GET["My_key"]);
-  $input_table_file="/var/lib/genenet/bnw/".$keyval."input_table.txt";
+  $input_table_file="./data/".$keyval."input_table.txt";
   $parent_number=4;
   $k_number=1;
   $runtime=exe_time($keyval,$parent_number,$k_number);
@@ -156,16 +156,11 @@ if($searchID!="")
 <br>
 <p><h3>The uploaded data file has the following properties:
 <br></h3>
-<?php
-$table_text = json_encode(file("file://".$input_table_file));
-?>
   <div class="d3_table" id="table_div1">
   <script type="text/javascript">
-   d3.text("", function(error, raw_temp){
-       var dsv = d3.dsvFormat("\t");
-         var data1 = <?php echo $table_text;?>;
-         var data2 = data1.join("");
-	 var data = dsv.parse(data2);
+   d3.text("<?php print($input_table_file);?>", function(error, raw){
+       var dsv = d3.dsvFormat("\t")
+	 var data = dsv.parse(raw)
 	 var caption_text = data.pop();
        if (error) throw error;
        tabulate_caption("#table_div1",data,caption_text.Variable);
-- 
cgit 1.4.1