Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
23abce49
Commit
23abce49
authored
Feb 12, 2015
by
Peter van 't Hof
Browse files
Change name checkExecutable to preProcesExecutable
parent
e5e03434
Changes
4
Hide whitespace changes
Inline
Side-by-side
public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala
View file @
23abce49
...
...
@@ -57,7 +57,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
* Set default output file, threads and vmem for current job
*/
override
def
freezeFieldValues
()
{
check
Executable
preProces
Executable
beforeGraph
if
(
jobOutputFile
==
null
)
jobOutputFile
=
new
File
(
firstOutput
.
getParent
+
"/."
+
firstOutput
.
getName
+
"."
+
configName
+
".out"
)
...
...
@@ -77,7 +77,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
/**
* Checks executable. Follow full CanonicalPath, checks if it is existing and do a md5sum on it to store in job report
*/
protected
[
core
]
def
check
Executable
{
protected
[
core
]
def
preProces
Executable
{
if
(!
BiopetCommandLineFunctionTrait
.
executableMd5Cache
.
contains
(
executable
))
{
try
if
(
executable
!=
null
)
{
if
(!
BiopetCommandLineFunctionTrait
.
executableCache
.
contains
(
executable
))
{
...
...
@@ -119,7 +119,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
* executes checkExecutable method and fill job report
*/
final
protected
def
preCmdInternal
{
check
Executable
preProces
Executable
beforeCmd
...
...
@@ -170,7 +170,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
/** Get version from cache otherwise execute the version command */
def
getVersion
:
String
=
{
if
(!
BiopetCommandLineFunctionTrait
.
executableCache
.
contains
(
executable
))
check
Executable
preProces
Executable
if
(!
BiopetCommandLineFunctionTrait
.
versionCache
.
contains
(
executable
))
BiopetCommandLineFunctionTrait
.
versionCache
+=
executable
->
getVersionInternal
return
BiopetCommandLineFunctionTrait
.
versionCache
(
executable
)
...
...
public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
View file @
23abce49
...
...
@@ -71,7 +71,7 @@ trait BiopetQScript extends Configurable with GatkLogging {
}
for
(
function
<-
functions
)
function
match
{
case
f
:
BiopetCommandLineFunctionTrait
=>
{
f
.
check
Executable
f
.
preProces
Executable
f
.
beforeGraph
f
.
commandLine
}
...
...
public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala
View file @
23abce49
...
...
@@ -49,7 +49,7 @@ class Fastqc(val root: Configurable) extends BiopetCommandLineFunction {
override
val
defaultThreads
=
4
override
def
beforeGraph
{
this
.
check
Executable
this
.
preProces
Executable
val
fastqcDir
=
new
File
(
executable
).
getParent
...
...
public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/conifer/ConiferExport.scala
View file @
23abce49
...
...
@@ -29,7 +29,7 @@ class ConiferExport(val root: Configurable) extends Conifer {
var
output
:
File
=
_
override
def
beforeGraph
{
this
.
check
Executable
this
.
preProces
Executable
}
override
def
cmdLine
=
super
.
cmdLine
+
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment