Skip to content

Commit

Permalink
Merge pull request #40 from bento-platform/qa/v3.7
Browse files Browse the repository at this point in the history
v3.7.3 rc-1
  • Loading branch information
brouillette authored Feb 8, 2023
2 parents ca96b8e + e51dae1 commit 0d12297
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 31 deletions.
29 changes: 2 additions & 27 deletions src/api/mvc/variants/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,20 +202,6 @@ func VariantsIngest(c echo.Context) error {
}
// -----

// create temporary directory for unzipped vcfs
vcfTmpPath := fmt.Sprintf("%s/tmp", vcfPath)
_, err = os.Stat(vcfTmpPath)
if os.IsNotExist(err) {
fmt.Printf("VCF %s folder does not exist -- creating...", vcfTmpPath)
err = os.Mkdir(vcfTmpPath, 0755)
if err != nil {
fmt.Println(err)

// TODO: create a standard response object
return err
}
}

// ingest vcf
responseDtos := []ingest.IngestResponseDTO{}
for _, fileName := range fileNames {
Expand Down Expand Up @@ -259,9 +245,9 @@ func VariantsIngest(c echo.Context) error {
reqStat.State = ingest.Running
ingestionService.IngestRequestChan <- reqStat

// --- decompress vcf.gz
// --- open vcf.gz

fmt.Printf("Decompressing %s !\n", gzippedFileName)
fmt.Printf("Opening %s !\n", gzippedFileName)
var separator string
if strings.HasPrefix(gzippedFileName, "/") {
separator = ""
Expand Down Expand Up @@ -390,17 +376,6 @@ func VariantsIngest(c echo.Context) error {

return
}
// TODO: implement (below temporarily disabled -- too risky this way)
// // ---- remove temporarily relative paths if they are empty
// if files, err := ioutil.ReadDir(fullTmpDir); err == nil {
// if len(files) == 0 {
// if err = os.Remove(fullTmpDir); err != nil {
// panic(err)
// }
// }
// } else {
// panic(err)
// }

defer r.Close()

Expand Down
4 changes: 0 additions & 4 deletions src/api/workflows/vcf_gz.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,4 @@ task vcf_gz_gohan {
fi
done
}
output {
File txt_output = stdout()
File err_output = stderr()
}
}

0 comments on commit 0d12297

Please sign in to comment.