|
@@ -52,7 +52,7 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
$result = exec('python3 dna.py '.$this->var_name.' '.$dna->variable_name.' '.$this->file_name.' '.$dna->file_name); |
|
53
|
53
|
// $resultData = json_decode($result, true, 512, JSON_THROW_ON_ERROR); |
|
54
|
54
|
$resultData = json_decode($result, true); |
|
55
|
|
- // chmod(storage_path('/app/public/dna/output/shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_'.$this->file_name.'_'.$dna->file_name), 0777); |
|
|
55
|
+ // chmod(storage_path('/app/public/dna/output/shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_'.$this->file_name.'_'.$dna->file_name), 0777); |
|
56
|
56
|
|
|
57
|
57
|
$dm = new DM(); |
|
58
|
58
|
$dm->user_id = $user->id; |
|
@@ -63,7 +63,7 @@ discard block |
|
|
block discarded – undo |
|
63
|
63
|
// $dm->image = 'shared_dna_'.$this->var_name.'_'.$dna->variable_name.'.png'; |
|
64
|
64
|
// $dm->image = 'shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
|
65
|
65
|
$dm->image = env('APP_URL').'/storage/dna/output/shared_dna_'.$this->var_name.'_'. |
|
66
|
|
- $dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
|
|
66
|
+ $dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
|
67
|
67
|
// $dm->file1 = 'discordant_snps_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
|
68
|
68
|
$dm->file1 = 'discordant_snps_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
|
69
|
69
|
// $dm->file2 = 'shared_dna_one_chrom_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
Please login to merge, or discard this patch.
laravel-liberu /
genealogy
