|
@@ -998,11 +998,14 @@ class OBOImporter extends TripalImporter {
|
|
}
|
|
}
|
|
$ontology_results = drupal_json_decode($response->data);
|
|
$ontology_results = drupal_json_decode($response->data);
|
|
if ($ontology_results['error']) {
|
|
if ($ontology_results['error']) {
|
|
- throw new Exception(t('Cannot find the ontology via an EBI OLS lookup: !short_name. ' .
|
|
|
|
|
|
+
|
|
|
|
+ $this->logMessage(t('Cannot find the ontology via an EBI OLS lookup: !short_name. \n' .
|
|
|
|
+ 'We tried to access: !url'.
|
|
'EBI Reported: !message. ' .
|
|
'EBI Reported: !message. ' .
|
|
'Consider finding the OBO file for this ontology and manually loading it first.',
|
|
'Consider finding the OBO file for this ontology and manually loading it first.',
|
|
- ['!message' => $ontology_results['message'], '!short_name' => $short_name]));
|
|
|
|
|
|
+ ['!message' => $ontology_results['message'], '!short_name' => $short_name, '!url' => $full_url]), TRIPAL_WARNING);
|
|
}
|
|
}
|
|
|
|
+ //What should happen with this stuff?
|
|
$base_iri = $ontology_results['config']['baseUris'][0];
|
|
$base_iri = $ontology_results['config']['baseUris'][0];
|
|
$ontologyID = $ontology_results['ontologyId'];
|
|
$ontologyID = $ontology_results['ontologyId'];
|
|
$this->baseIRIs[$short_name] = [$ontologyID, $base_iri];
|
|
$this->baseIRIs[$short_name] = [$ontologyID, $base_iri];
|
|
@@ -1021,8 +1024,9 @@ class OBOImporter extends TripalImporter {
|
|
// If EBI sent an error message then throw an error.
|
|
// If EBI sent an error message then throw an error.
|
|
if ($results['error']) {
|
|
if ($results['error']) {
|
|
$this->logMessage('Cannot find the term via an EBI OLS lookup: !term. ' .
|
|
$this->logMessage('Cannot find the term via an EBI OLS lookup: !term. ' .
|
|
|
|
+ 'We tried to access: !url'.
|
|
'EBI Reported: !message. Consider finding the OBO file for this ontology and manually loading it first.',
|
|
'EBI Reported: !message. Consider finding the OBO file for this ontology and manually loading it first.',
|
|
- ['!message' => $results['message'], '!term' => $id], TRIPAL_WARNING);
|
|
|
|
|
|
+ ['!message' => $results['message'], '!term' => $id, '!url' => $full_url], TRIPAL_WARNING);
|
|
|
|
|
|
return FALSE;
|
|
return FALSE;
|
|
}
|
|
}
|