Skip to content

Commit

Permalink
fixed custom database
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe da Veiga Leprevost committed Sep 30, 2020
1 parent 9937778 commit 46b8fc6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
14 changes: 1 addition & 13 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
### Added
- A new Workspace option allows the use of a custom folder as a temporary folder.
- The Database now supports multiple database IDs (separate them with a comma).
- Support for the latest msconvert mzML format.
- Output prefix flag added to PTMProphet.

### Changed
- The parameter file was updated, and the terms were made more human-readable.
- The code compilation is now done with GO v1.15.
- PTMProphet updated to v6.0
- The Abacus memory footprint as significantly reduced.

### Fixed
- Small bugs and fixes.
- PSMs lists often contained observations mapping to proteins that did not pass the FDR filter.
- Bio quant was failing because of the unassigned database path.
- Some annotation files were being ignored.
- Added FASTA database file extension back again.
- Fixed issue with empty custom database.
13 changes: 10 additions & 3 deletions lib/dat/dat.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ func Run(m met.Data) met.Data {
}

} else {
db.UniProtDB = m.Database.Custom
dbPath, _ := filepath.Abs(m.Database.Custom)
db.UniProtDB = dbPath
db.DownloadedFiles = append(db.DownloadedFiles, dbPath)
}

logrus.Info("Processing decoys")
Expand Down Expand Up @@ -282,8 +284,13 @@ func (d *Base) Deploy(temp string) {
// Save fasta file to disk
func (d *Base) Save(home, temp, ids, tag string, isRev, hasIso, noD, Crap bool) string {

base := strings.Replace(ids, ",", "-", -1)
//base := filepath.Base(d.UniProtDB)
var base string

if len(ids) > 0 {
base = strings.Replace(ids, ",", "-", -1)
} else {
base = filepath.Base(d.UniProtDB)
}

t := time.Now()
stamp := fmt.Sprintf(t.Format("2006-01-02"))
Expand Down

0 comments on commit 46b8fc6

Please sign in to comment.