Skip to content

Commit

Permalink
Relase v2.0a for Tripal v2.0a
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Ficklin committed Feb 27, 2014
1 parent c5c0beb commit 0c549a6
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
22 changes: 11 additions & 11 deletions includes/tripal_analysis_blast.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ function tripal_analysis_blast_settings_form($form, &$form_state) {
$displayname = $form_state['values']['displayname'];
$gb_style_parser = $form_state['values']['gb_style_parser'];
if ($triggered_by == 'gb_style_parser' && $gb_style_parser) {
unset($form_state['values']['hit_id']);
unset($form_state['values']['hit_def']);
unset($form_state['values']['hit_accession']);
unset($form_state['values']['hit_organism_re']);
unset($form_state['values']['hit_organism']);
unset($form_state['input']['hit_id']);
unset($form_state['input']['hit_def']);
unset($form_state['input']['hit_accession']);
unset($form_state['input']['hit_organism_re']);
unset($form_state['input']['hit_organism']);
$read_only = 1;
unset($form_state['values']['hit_id']);
unset($form_state['values']['hit_def']);
unset($form_state['values']['hit_accession']);
unset($form_state['values']['hit_organism_re']);
unset($form_state['values']['hit_organism']);
unset($form_state['input']['hit_id']);
unset($form_state['input']['hit_def']);
unset($form_state['input']['hit_accession']);
unset($form_state['input']['hit_organism_re']);
unset($form_state['input']['hit_organism']);
$read_only = 1;
}

$hit_id = $form_state['values']['hit_id'];
Expand Down
2 changes: 1 addition & 1 deletion tripal_analysis_blast.info
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = Tripal Blast
description = An analysis sub-module for adding, editing, and displaying blast analysis results.
core = 7.x
version = 7.x-2.x-tripal_v2.x
version = 7.x-2.0a-tripal_v2.0a
project = tripal_analysis_blast
package = Tripal Extensions

Expand Down
44 changes: 22 additions & 22 deletions tripal_analysis_blast.install
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,33 @@ function tripal_analysis_blast_install() {
// Add trembl parser
$results = chado_query($sql_db, array(':name' => "%trembl%"));
foreach ($results AS $db) {
db_query(
$sql_parser,
array(
':db_id' => $db->db_id,
':displayname' => 'ExPASy TrEMBL',
':regex_hit_id' => '^.*?\|(.*?)\s.*?$',
':regex_hit_def' => '^.*?\|.*?\s(.*)$',
':regex_hit_accession' => '^(.*?)\|.*?\s.*?$',
':genbank_style' => 0,
':regex_hit_organism' => '^.*?OS=(.*?)\s\w\w=.*$')
);
db_query(
$sql_parser,
array(
':db_id' => $db->db_id,
':displayname' => 'ExPASy TrEMBL',
':regex_hit_id' => '^.*?\|(.*?)\s.*?$',
':regex_hit_def' => '^.*?\|.*?\s(.*)$',
':regex_hit_accession' => '^(.*?)\|.*?\s.*?$',
':genbank_style' => 0,
':regex_hit_organism' => '^.*?OS=(.*?)\s\w\w=.*$')
);
}

// Add NCBI genbank parser
$results = chado_query($sql_db, array(':name' => "%genbank%"));
foreach ($results AS $db) {
db_query(
$sql_parser,
array(
':db_id' => $db->db_id,
':displayname' => 'Genbank',
':regex_hit_id' => '',
':regex_hit_def' => '',
':regex_hit_accession' => '',
':genbank_style' => 1,
':regex_hit_organism' => '')
);
db_query(
$sql_parser,
array(
':db_id' => $db->db_id,
':displayname' => 'Genbank',
':regex_hit_id' => '',
':regex_hit_def' => '',
':regex_hit_accession' => '',
':genbank_style' => 1,
':regex_hit_organism' => '')
);
}
}

Expand Down

0 comments on commit 0c549a6

Please sign in to comment.