Browse Source

Fixed bug when loading remote OBO

Stephen Ficklin 11 years ago
parent
commit
11ba833e63
2 changed files with 9 additions and 9 deletions
  1. 5 5
      tripal_cv/api/tripal_cv.api.inc
  2. 4 4
      tripal_cv/includes/tripal_cv.obo_loader.inc

+ 5 - 5
tripal_cv/api/tripal_cv.api.inc

@@ -779,9 +779,9 @@ function tripal_submit_obo_job($obo) {
 
   // Set Defaults
   $obo['obo_id'] = (isset($obo['obo_id'])) ? $obo['obo_id'] : NULL;
-  $obo['name'] = (isset($obo['name'])) ? $obo['name'] : NULL;
-  $obo['url'] = (isset($obo['url'])) ? $obo['url'] : NULL;
-  $obo['file'] = (isset($obo['file'])) ? $obo['file'] : NULL;
+  $obo['name']   = (isset($obo['name']))   ? $obo['name']   : NULL;
+  $obo['url']    = (isset($obo['url']))    ? $obo['url']    : NULL;
+  $obo['file']   = (isset($obo['file']))   ? $obo['file']   : NULL;
 
   if ($obo['obo_id']) {
     $sql = "SELECT * FROM {tripal_cv_obo} WHERE obo_id = :obo_id";
@@ -794,12 +794,12 @@ function tripal_submit_obo_job($obo) {
   else {
     if ($obo['url']) {
       $args = array($obo['name'], $obo['url']);
-      return tripal_add_job("Load OBO $obo_name", 'tripal_cv',
+      return tripal_add_job("Load OBO " . $obo['name'], 'tripal_cv',
         "tripal_cv_load_obo_v1_2_url", $args, $user->uid);
     }
     elseif ($obo['file']) {
       $args = array($obo['name'], $obo['file']);
-      return tripal_add_job("Load OBO $obo_name", 'tripal_cv',
+      return tripal_add_job("Load OBO " . $obo['name'], 'tripal_cv',
         "tripal_cv_load_obo_v1_2_file", $args, $user->uid);
     }
   }

+ 4 - 4
tripal_cv/includes/tripal_cv.obo_loader.inc

@@ -114,10 +114,10 @@ function tripal_cv_obo_form($form, &$form_state) {
  * @ingroup tripal_obo_loader
  */
 function tripal_cv_obo_form_submit($form, &$form_state) {
-  $obo_id =  $form_state['values']['obo_id'];
-  $obo_name =  $form_state['values']['obo_name'];
-  $obo_url =  $form_state['values']['obo_url'];
-  $obo_file  = $form_state['values']['obo_file'];
+  $obo_id    = $form_state['values']['obo_id'];
+  $obo_name  = trim($form_state['values']['obo_name']);
+  $obo_url   = trim($form_state['values']['obo_url']);
+  $obo_file  = trim($form_state['values']['obo_file']);
 
   tripal_cv_submit_obo_job($obo_id, $obo_name, $obo_url, $obo_file);
 }