Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
BIGSdb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Emmanuel QUEVILLON
BIGSdb
Commits
346fcc6a
Commit
346fcc6a
authored
Jun 16, 2016
by
Emmanuel Quevillon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/kjolley/BIGSdb
into develop
parents
37b96ac9
6903b2df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
3 deletions
+3
-3
lib/BIGSdb/CombinationQueryPage.pm
lib/BIGSdb/CombinationQueryPage.pm
+1
-0
lib/BIGSdb/ConfigCheckPage.pm
lib/BIGSdb/ConfigCheckPage.pm
+1
-1
lib/BIGSdb/Plugins/SequenceExport.pm
lib/BIGSdb/Plugins/SequenceExport.pm
+1
-1
lib/BIGSdb/Scheme.pm
lib/BIGSdb/Scheme.pm
+0
-1
No files found.
lib/BIGSdb/CombinationQueryPage.pm
View file @
346fcc6a
...
...
@@ -405,6 +405,7 @@ sub _add_query_ordering {
$$qry_ref
.=
"
$profile_id_field
$dir
;
";
}
elsif
(
$self
->
{'
datastore
'}
->
is_locus
(
$order_field
)
)
{
my
$locus_info
=
$self
->
{'
datastore
'}
->
get_locus_info
(
$order_field
);
$order_field
=
$self
->
{'
datastore
'}
->
get_scheme_warehouse_locus_name
(
$scheme_id
,
$order_field
);
$order_field
=~
s/'/_PRIME_/gx
;
$$qry_ref
.=
$locus_info
->
{'
allele_id_format
'}
eq
'
integer
'
...
...
lib/BIGSdb/ConfigCheckPage.pm
View file @
346fcc6a
...
...
@@ -218,7 +218,7 @@ sub _check_scheme_databases {
}
say
q(</table></div></div>)
;
}
else
{
say
q(<p>No schemes with databases defined.</p>)
;
say
q(<p>No schemes with databases defined.</p>
</div>
)
;
}
return
;
}
...
...
lib/BIGSdb/Plugins/SequenceExport.pm
View file @
346fcc6a
...
...
@@ -257,7 +257,7 @@ sub _run_job_profiles {
if
(
$params
->
{'
align
'}
&&
@$ids
>
$limit
)
{
my
$message_html
=
q(<p class="statusbad">Please note that output is limited to the first $limit records.</p>\n)
;
q
q
(<p class="statusbad">Please note that output is limited to the first $limit records.</p>\n)
;
$self
->
{'
jobManager
'}
->
update_job_status
(
$job_id
,
{
message_html
=>
$message_html
}
);
}
my
$progress
=
0
;
...
...
lib/BIGSdb/Scheme.pm
View file @
346fcc6a
...
...
@@ -38,7 +38,6 @@ sub _initiate {
my
$sql
=
$self
->
{'
db
'}
->
prepare
('
SELECT locus,index FROM scheme_warehouse_indices WHERE scheme_id=?
');
if
(
$self
->
{'
dbase_table
'}
=~
/scheme_(\d+)$/x
)
{
my
$scheme_id
=
$
1
;
$logger
->
error
(
$scheme_id
);
eval
{
$sql
->
execute
(
$scheme_id
);
};
$logger
->
error
(
$@
)
if
$@
;
my
$data
=
$sql
->
fetchall_arrayref
;
...
...
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