|
@@ -477,6 +477,7 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
|
|
// check to see if we have FASTA section, if so then set the variable
|
|
// check to see if we have FASTA section, if so then set the variable
|
|
// to start parsing
|
|
// to start parsing
|
|
if (preg_match('/^##FASTA/i', $line)) {
|
|
if (preg_match('/^##FASTA/i', $line)) {
|
|
|
|
+ print "Parsing FASTA portion...\n";
|
|
if ($remove) {
|
|
if ($remove) {
|
|
// we're done because this is a delete operation so break out of the loop.
|
|
// we're done because this is a delete operation so break out of the loop.
|
|
break;
|
|
break;
|
|
@@ -498,7 +499,7 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
|
|
$result = chado_query($sel_cvterm_sql, $query);
|
|
$result = chado_query($sel_cvterm_sql, $query);
|
|
$cvterm = $result->fetchObject();
|
|
$cvterm = $result->fetchObject();
|
|
if (!$cvterm) {
|
|
if (!$cvterm) {
|
|
- tripal_report_error('tripal_feature', TRIPAL_ERROR,
|
|
|
|
|
|
+ tripal_report_error('tripal_feature', TRIPAL_ERROR,
|
|
'cannot find feature type \'%landmark_type\' on line %line_num of the GFF file',
|
|
'cannot find feature type \'%landmark_type\' on line %line_num of the GFF file',
|
|
array('%landmark_type' => $landmark_type, '%line_num' => $line_num));
|
|
array('%landmark_type' => $landmark_type, '%line_num' => $line_num));
|
|
return '';
|
|
return '';
|
|
@@ -672,11 +673,6 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- if ($skip_line) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
// if neither name nor uniquename are provided then generate one
|
|
// if neither name nor uniquename are provided then generate one
|
|
if (!$attr_uniquename and !$attr_name) {
|
|
if (!$attr_uniquename and !$attr_name) {
|
|
// check if an alternate ID field is suggested, if so, then use
|
|
// check if an alternate ID field is suggested, if so, then use
|