Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
3f3d6c82
Commit
3f3d6c82
authored
Apr 11, 2014
by
Leo Gordon
Browse files
went back to printing toString() when registering new Cacheable objects
parent
513dfa4e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
17 deletions
+18
-17
modules/Bio/EnsEMBL/Hive/Analysis.pm
modules/Bio/EnsEMBL/Hive/Analysis.pm
+1
-1
modules/Bio/EnsEMBL/Hive/AnalysisCtrlRule.pm
modules/Bio/EnsEMBL/Hive/AnalysisCtrlRule.pm
+2
-4
modules/Bio/EnsEMBL/Hive/Cacheable.pm
modules/Bio/EnsEMBL/Hive/Cacheable.pm
+2
-2
modules/Bio/EnsEMBL/Hive/DataflowRule.pm
modules/Bio/EnsEMBL/Hive/DataflowRule.pm
+11
-8
modules/Bio/EnsEMBL/Hive/ResourceClass.pm
modules/Bio/EnsEMBL/Hive/ResourceClass.pm
+1
-1
modules/Bio/EnsEMBL/Hive/ResourceDescription.pm
modules/Bio/EnsEMBL/Hive/ResourceDescription.pm
+1
-1
No files found.
modules/Bio/EnsEMBL/Hive/Analysis.pm
View file @
3f3d6c82
...
...
@@ -243,7 +243,7 @@ sub dataflow_rules_collection {
sub
toString
{
my
$self
=
shift
@_
;
return
(
'
Analysis
:
'
.
join
('
,
',
map
{
$_
.
'
="
'
.
$self
->
$_
()
.
'
"
'
}
qw(dbID logic_name module parameters)
))
;
return
'
Analysis
[
'
.
(
$self
->
dbID
//
'')
.
'
]:
'
.
$self
->
display_name
.
'
->(
'
.
join
('
,
',
$self
->
module
,
$self
->
parameters
,
$self
->
resource_class
->
name
)
.
'
)
'
;
}
1
;
...
...
modules/Bio/EnsEMBL/Hive/AnalysisCtrlRule.pm
View file @
3f3d6c82
...
...
@@ -153,11 +153,9 @@ sub toString {
my
$self
=
shift
;
return
join
('',
'
AnalysisCtrlRule
',
# '(dbID=', ($self->dbID || '?'), ')', # this object doesn't have a dbID
'
:
',
'
AnalysisCtrlRule:
',
$self
->
condition_analysis_url
,
'
-|
',
'
--
-|
',
$self
->
ctrled_analysis
->
logic_name
,
);
}
...
...
modules/Bio/EnsEMBL/Hive/Cacheable.pm
View file @
3f3d6c82
...
...
@@ -50,8 +50,6 @@ sub add_new_or_update {
}
else
{
warn
"
Found a matching
$class
(
"
.
Dumper
(
\
%unikey_pairs
)
.
"
)
\n
";
}
}
else
{
warn
"
Creating a new
$class
(
"
.
Dumper
(
\
%unikey_pairs
)
.
"
)
\n
";
}
}
else
{
warn
"
$class
doesn't redefine unikey(), so unique objects cannot be identified
";
...
...
@@ -60,8 +58,10 @@ sub add_new_or_update {
unless
(
$self
)
{
if
(
$class
->
can
('
new
')
)
{
$self
=
$class
->
new
(
@
_
);
warn
"
Created a new
"
.
$self
->
toString
.
"
\n
";
}
else
{
$self
=
{
@
_
};
warn
"
Created a new naked entry
"
.
stringify
(
$self
)
.
"
\n
";
}
$class
->
collection
()
->
add
(
$self
);
...
...
modules/Bio/EnsEMBL/Hive/DataflowRule.pm
View file @
3f3d6c82
...
...
@@ -192,19 +192,22 @@ sub to_analysis {
=cut
sub
toString
{
my
$self
=
shift
;
my
$self
=
shift
@_
;
my
$short
=
shift
@_
;
return
join
('',
'
DataflowRule(dbID=
',
(
$self
->
dbID
||
'
?
'),
(
$self
->
funnel_dataflow_rule_id
?
'
--||
'
.
$self
->
funnel_dataflow_rule_id
:
''),
'
): [#
',
$short
?
()
:
(
'
DataflowRule[
',
(
$self
->
dbID
//
''),
'
]:
',
$self
->
from_analysis
->
logic_name
,
),
'
--#
',
$self
->
branch_code
,
'
]
',
$self
->
from_analysis
->
logic_name
,
'
->
',
'
-->
',
$self
->
to_analysis_url
,
(
$self
->
input_id_template
?
('
WITH TEMPLATE:
'
.
$self
->
input_id_template
)
:
''),
(
$self
->
funnel_dataflow_rule
?
'
---|| (
'
.
$self
->
funnel_dataflow_rule
->
toString
(
1
)
.
'
)
'
:
''),
);
}
...
...
modules/Bio/EnsEMBL/Hive/ResourceClass.pm
View file @
3f3d6c82
...
...
@@ -60,7 +60,7 @@ sub name {
sub
toString
{
my
$self
=
shift
@_
;
return
(
'
ResourceClass
:
'
.
join
('
,
',
map
{
$_
.
'
="
'
.
$self
->
$_
()
.
'
"
'
}
qw(dbID name)
))
;
return
'
ResourceClass
[
'
.
(
$self
->
dbID
//
'')
.
'
]:
'
.
$self
->
name
;
}
1
;
...
...
modules/Bio/EnsEMBL/Hive/ResourceDescription.pm
View file @
3f3d6c82
...
...
@@ -89,7 +89,7 @@ sub worker_cmd_args {
sub
toString
{
my
$self
=
shift
@_
;
return
(
'
ResourceDescription:
'
.
join
('
,
',
map
{
$_
.
'
="
'
.
$self
->
$_
()
.
'
"
'
}
qw(resource_class_id meadow_type
submission_cmd_args
worker_cmd_args
)
))
;
return
'
ResourceDescription:
(
'
.
$self
->
resource_class
->
name
.
'
,
'
.
$self
->
meadow_type
.
'
)->("
'
.
$self
->
submission_cmd_args
.
'
", "
'
.
$self
->
worker_cmd_args
.
'
")
'
;
}
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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