Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ensembl
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
ensembl
Commits
28250ddd
Commit
28250ddd
authored
21 years ago
by
Graham McVicker
Browse files
Options
Downloads
Patches
Plain Diff
$keep_all flag no longer needed in generic_fetch; formatting
parent
f88dd36e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/Bio/EnsEMBL/DBSQL/BaseFeatureAdaptor.pm
+7
-12
7 additions, 12 deletions
modules/Bio/EnsEMBL/DBSQL/BaseFeatureAdaptor.pm
with
7 additions
and
12 deletions
modules/Bio/EnsEMBL/DBSQL/BaseFeatureAdaptor.pm
+
7
−
12
View file @
28250ddd
...
...
@@ -105,9 +105,6 @@ sub _straight_join {
as they are retrieved from the database
Arg [3] : (optional) Bio::EnsEMBL::Slice $slice
A slice that features should be remapped to
Arg [4] : (optional) boolean $keep_all
Set to 1 if all features, even ones entirely off slice,
should be kept
Example : $fts = $a->generic_fetch('contig_id in (1234, 1235)', 'Swall');
Description: Performs a database fetch and returns feature objects in
contig coordinates.
...
...
@@ -118,7 +115,7 @@ sub _straight_join {
=cut
sub
generic_fetch
{
my
(
$self
,
$constraint
,
$mapper
,
$slice
,
$keep_all
)
=
@_
;
my
(
$self
,
$constraint
,
$mapper
,
$slice
)
=
@_
;
my
@tabs
=
$self
->
_tables
;
my
$columns
=
join
('
,
',
$self
->
_columns
());
...
...
@@ -174,15 +171,12 @@ sub generic_fetch {
#append additional clauses which may have been defined
$sql
.=
"
\n
$final_clause
";
# (my $sql_debug = $sql ) =~s/\n/\n$$ /gm;
my
$START
=
time
();
# print STDERR "$$ $sql_debug\n";
my
$sth
=
$db
->
prepare
(
$sql
);
$sth
->
execute
;
# print STDERR "$$ ".(time()-$START)."\n";
my
$res
=
$self
->
_objs_from_sth
(
$sth
,
$mapper
,
$slice
,
$keep_all
);
# print STDERR "$$ ".(time()-$START)."\n\n";
# warn( $$," ", $self->db->dbname );
my
$res
=
$self
->
_objs_from_sth
(
$sth
,
$mapper
,
$slice
);
return
$res
;
}
...
...
@@ -717,7 +711,8 @@ sub _remap {
}
# maps to region outside desired area
next
if
(
$start
>
$slice_end
)
||
(
$end
<
$slice_start
)
||
(
$slice_seq_region
ne
$seq_region
);
next
if
(
$start
>
$slice_end
)
||
(
$end
<
$slice_start
)
||
(
$slice_seq_region
ne
$seq_region
);
#shift the feature start, end and strand in one call
if
(
$slice_strand
==
-
1
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment