Commit 346fcc6a authored by Emmanuel Quevillon's avatar Emmanuel Quevillon

Merge branch 'develop' of https://github.com/kjolley/BIGSdb into develop

parents 37b96ac9 6903b2df
......@@ -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'
......
......@@ -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;
}
......
......@@ -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);
qq(<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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment