Merge branch '7.x-2.x' of git.drupal.org:sandbox/spficklin/1337878 into 7.x-2.x

tripal_core/api/tripal_core.database_references.api.inc

@@ -132,7 +132,7 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
     '#prefix' => "<div id='addtl-dbxrefs-fieldset'>",
     '#suffix' => '</div>'
   );
-  
+
   // this form element is a tree, so that we don't puke all of the values into then node variable
   // it is set as a tree, and keeps them in the $form_state['values']['dbxref_table'] heading.
   $form['addtl_dbxrefs']['dbxref_table'] = array(
@@ -142,19 +142,19 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
     '#suffix' => '</div>',
     '#theme' => 'tripal_core_additional_dbxrefs_form_table'
   );
-  
+
   /* DBxrefs can come to us in two ways:
-   * 
-   * 1) In the form state in the $form_state['addtl_dbxrefs']. Data is in this field
+   *
+   * 1) In the form state in the $form_state['chado_additional_dbxrefs']. Data is in this field
    *    when an AJAX call updates the form state or a validation error.
-   *     
+   *
    * 2) Directly from the database if the record already has dbxref's associated.  This
    *    data is only used the first time the form is loaded. On AJAX calls or validation
-   *    errors the fields on the form are populated from the $form_state['addtl_dbxrefs']
+   *    errors the fields on the form are populated from the $form_state['chado_additional_dbxrefs']
    *    entry.
-   */ 
-  if (isset($form_state['addtl_dbxrefs'])) {
-    $existing_dbxrefs = $form_state['addtl_dbxrefs'];
+   */
+  if (isset($form_state['chado_additional_dbxrefs'])) {
+    $existing_dbxrefs = $form_state['chado_additional_dbxrefs'];
   }
   else {
     $existing_dbxrefs = chado_query(
@@ -167,10 +167,11 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
        array(':base_key_value' => $details['base_key_value'])
     );
   }
-  
-  /* The format of the $existing_dbxref's array is
-   * 
-   * $existing_dbxrefs = array(
+
+  /* The format of the $existing_dbxref's array is either:
+   *
+   * From the chado_additional_dbxrefs array:
+   * $form_state['chado_additional_dbxrefs'] = array(
    *   '[db_id]-[version]' => array(
    *     'db_id' => [the db.db_id value]
    *     'db_name' => [the db.name value]
@@ -179,12 +180,32 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
    *     'accession' => [the dbxref.accession value],
    *   ),
    * );
-   * 
-   * loop on the array elements of the $existing_dbxrefs array and add
+   *
+   * OR
+   * Populated from the database:
+   * $existing_dbxref = array(
+   *   0 => array(
+   *     'dbxref_id' => [the dbxref.dbxref_id value],
+   *     'db_name' => [the db.name value],
+   *     'db_id' => [the db.db_id value],
+   *     'accession' => [the dbxref.accession value],
+   *     'description' => [the dbxref.description value],
+   *     'version' => [the dbxref.versiion value],
+   *   ),
+   * );
+   *
+   * NOTE: The main difference is the key
+   *
+   * Loop on the array elements of the $existing_dbxrefs array and add
    * an element to the form for each one.
-   */ 
+   */
   foreach ($existing_dbxrefs as $dbxref) {
 
+    // Since the version is part of the key, when it is '' we need to use something
+    // in the key to indicate this case. Otherwise, you wouldn't be able to select
+    // those elements from the array (ie: $form['addtl_dbxrefs']['dbxref_table'][9999]['']
+    // doesn't work as expected whereas $form['addtl_dbxrefs']['dbxref_table'][9999][NONE]
+    // is much better)
     $version = (!empty($dbxref->version)) ? $dbxref->version : 'NONE';
 
     $form['addtl_dbxrefs']['dbxref_table'][$dbxref->db_id] = array(
@@ -238,8 +259,21 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
         'method'   => 'replace',
         'prevent'  => 'click'
       ),
+      // When this button is clicked, the form will be validated and submitted.
+      // Therefore, we set custom submit and validate functions to override the
+      // default node form submit.  In the validate function we validate only the
+      // additional dbxref fields and in the submit we remove the indicated dbxref
+      // from the chado_additional_dbxrefs array. In order to keep validate errors
+      // from the node form validate and Drupal required errors for non-dbxref fields
+      // preventing the user from removing dbxrefs we set the #limit_validation_errors below
       '#validate' => array('tripal_core_additional_dbxrefs_form_remove_button_validate'),
       '#submit' => array('tripal_core_additional_dbxrefs_form_remove_button_submit'),
+      // Limit the validation of the form upon clicking this button to the dbxref_table tree
+      // No other fields will be validated (ie: no fields from the main form or any other api
+      // added form).
+      '#limit_validation_errors' => array(
+        array('dbxref_table')  // Validate all fields within $form_state['values']['dbxref_table']
+      )
     );
   }
 
@@ -250,7 +284,7 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
     '#prefix' => '<span class="addtl-dbxrefs-add-new-dbxref">',
     '#suffix' => '</span>'
   );
- 
+
   // add in the existing databases
   $db_options = array(0 => 'Select a Database');
   $select = tripal_core_chado_select('db', array('db_id','name'), array(), array('order_by' => array('name' => 'ASC')));
@@ -284,13 +318,19 @@ function tripal_core_additional_dbxrefs_form(&$form, &$form_state, $details) {
     ),
     // When this button is clicked, the form will be validated and submitted.
     // Therefore, we set custom submit and validate functions to override the
-    // default form submit.  In the validate function we set the form_state
-    // to rebuild the form so the node form submit function never actually gets called,
-    // but we need it or Drupal will run the default validate anyway.
-    // we also set #limit_validation_errors to empty so fields that
-    // are required that don't have values won't generate warnings.
+    // default node form submit.  In the validate function we validate only the
+    // additional dbxref fields and in the submit we add them to the chado_additional_dbxrefs
+    // array. In order to keep validate errors from the node form validate and Drupal
+    // required errors for non-dbxref fields preventing the user from adding dbxrefs we
+    // set the #limit_validation_errors below
     '#validate' => array('tripal_core_additional_dbxrefs_form_add_button_validate'),
     '#submit' => array('tripal_core_additional_dbxrefs_form_add_button_submit'),
+    // Limit the validation of the form upon clicking this button to the dbxref_table tree
+    // No other fields will be validated (ie: no fields from the main form or any other api
+    // added form).
+    '#limit_validation_errors' => array(
+      array('dbxref_table')  // Validate all fields within $form_state['values']['dbxref_table']
+    )
   );
 
 }
@@ -305,18 +345,18 @@ function tripal_core_additional_dbxrefs_form_add_button_validate($form, &$form_s
   $db = tripal_core_chado_select(
     'db',
     array('db_id', 'name'),
-    array('db_id' => $form_state['input']['dbxref_table']['new']['db'])
+    array('db_id' => $form_state['values']['dbxref_table']['new']['db'])
   );
   if (!isset($db[0])) {
-    form_set_error('db', 'Please select a database before attempting to add a new database reference.');
+    form_set_error('dbxref_table][new][db', 'Please select a database before attempting to add a new database reference.');
   }
   else {
     $form_state['values']['dbxref_table']['new']['db_name'] = $db[0]->name;
   }
 
   // Ensure accession is supplied
-  if (empty($form_state['input']['dbxref_table']['new']['dbxref_accession'])) {
-    form_set_error('dbxref_accession','You must enter the accession before attempting to add a new database reference.');
+  if (empty($form_state['values']['dbxref_table']['new']['dbxref_accession'])) {
+    form_set_error('dbxref_table][new][dbxref_accession','You must enter the accession before attempting to add a new database reference.');
   }
 }
 
@@ -328,9 +368,9 @@ function tripal_core_additional_dbxrefs_form_add_button_validate($form, &$form_s
  */
 function tripal_core_additional_dbxrefs_form_add_button_submit(&$form, &$form_state) {
 
-  // if the addtl_dbxrefs array is not set then this is the first time modifying the
+  // if the chado_additional_dbxrefs array is not set then this is the first time modifying the
   // dbxref table. this means we need to include all the dbxrefs from the db
-  if (!isset($form_state['addtl_dbxrefs'])) {
+  if (!isset($form_state['chado_additional_dbxrefs'])) {
     tripal_core_additional_dbxrefs_form_create_dbxref_formstate_array($form, $form_state);
   }
 
@@ -342,7 +382,9 @@ function tripal_core_additional_dbxrefs_form_add_button_submit(&$form, &$form_st
     'version' => $form_state['values']['dbxref_table']['new']['dbxref_version'],
     'accession' => $form_state['values']['dbxref_table']['new']['dbxref_accession'],
   );
-  $form_state['addtl_dbxrefs'][] = (object) $dbxref;
+  $version = (!empty($dbxref['version'])) ? $dbxref['version'] : 'NONE';
+  $key = $dbxref['db_id'] . '-' . $version;
+  $form_state['chado_additional_dbxrefs'][$key] = (object) $dbxref;
 
   $form_state['rebuild'] = TRUE;
 }
@@ -363,17 +405,17 @@ function tripal_core_additional_dbxrefs_form_remove_button_validate($form, $form
  */
 function tripal_core_additional_dbxrefs_form_remove_button_submit(&$form, &$form_state) {
 
-  // if the addtl_dbxrefs array is not set then this is the first time modifying the
+  // if the chado_additional_dbxrefs array is not set then this is the first time modifying the
   // dbxref table. this means we need to include all the dbxrefs from the db
-  if (!isset($form_state['addtl_dbxrefs'])) {
+  if (!isset($form_state['chado_additional_dbxrefs'])) {
     tripal_core_additional_dbxrefs_form_create_dbxref_formstate_array($form, $form_state);
   }
 
   // remove the specified dbxref from the form dbxref table
   if(preg_match('/dbxref_remove-([^-]+-[^-]+)/',$form_state['triggering_element']['#name'],$match)) {
     $key = $match[1];
-    if (array_key_exists($key, $form_state['addtl_dbxrefs'])) {
-      unset($form_state['addtl_dbxrefs'][$key]);
+    if (array_key_exists($key, $form_state['chado_additional_dbxrefs'])) {
+      unset($form_state['chado_additional_dbxrefs'][$key]);
     }
   }
 
@@ -391,11 +433,21 @@ function tripal_core_additional_dbxrefs_form_ajax_update($form, $form_state) {
  * Creates an array in form_state containing the existing addtl_dbxrefs. This array is
  * then modified by the add/remove buttons and used as a source for rebuilding the form.
  * This function get's called at each button (add and remove) button submits the first
- * time one of the button's is clicked to instantiates the $form_state['addtl_dbxrefs'] array
+ * time one of the button's is clicked to instantiates the $form_state['chado_additional_dbxrefs'] array
+ *
+ * $form_state['chado_additional_dbxrefs'] = array(
+ *   '[db_id]-[version]' => array(
+ *     'db_id' => [the db.db_id value]
+ *     'db_name' => [the db.name value]
+ *     'dbxref_id' => [the dbxref.dbxref_id value, or NULL if it doesn't yet exists],
+ *     'version' => [the dbxref.version value],
+ *     'accession' => [the dbxref.accession value],
+ *   ),
+ * );
  */
 function tripal_core_additional_dbxrefs_form_create_dbxref_formstate_array($form, &$form_state) {
 
-  $form_state['addtl_dbxrefs'] = array();
+  $form_state['chado_additional_dbxrefs'] = array();
 
   foreach (element_children($form['addtl_dbxrefs']['dbxref_table']) as $db_id) {
     if ($db_id != 'new') {
@@ -410,7 +462,7 @@ function tripal_core_additional_dbxrefs_form_create_dbxref_formstate_array($form
           );
           $version = (!empty($dbxref['version'])) ? $dbxref['version'] : 'NONE';
           $key = $dbxref['db_id'] . '-' . $version;
-          $form_state['addtl_dbxrefs'][$key] = (object) $dbxref;
+          $form_state['chado_additional_dbxrefs'][$key] = (object) $dbxref;
       }
     }
   }

tripal_core/api/tripal_core.relationships.api.inc

@@ -157,7 +157,9 @@ function tripal_core_relationships_form(&$form, &$form_state, $details) {
     '#suffix' => '</div>'
   );
 
-  $form['relationships']['rel_table'] = array(
+  // this form element is a tree, so that we don't puke all of the values into then node variable
+  // it is set as a tree, and keeps them in the $form_state['values']['relationship_table'] heading.
+  $form['relationships']['relationship_table'] = array(
     '#type' => 'markup',
     '#tree' => TRUE,
     '#prefix' => '<div id="tripal-generic-edit-relationships-table">',
@@ -167,6 +169,16 @@ function tripal_core_relationships_form(&$form, &$form_state, $details) {
 
   // Add relationships already attached to the node
   //---------------------------------------------
+  /* Relationships can come to us in two ways:
+   *
+   * 1) In the form state in the $form_state['chado_relationships']. Data is in this field
+   *    when an AJAX call updates the form state or a validation error.
+   *
+   * 2) Directly from the database if the record already has _relationships associated.  This
+   *    data is only used the first time the form is loaded. On AJAX calls or validation
+   *    errors the fields on the form are populated from the $form_state['chado_relationships']
+   *    entry.
+   */
   if (isset($form_state['chado_relationships'])) {
     $existing_rels = $form_state['chado_relationships'];
   }
@@ -181,50 +193,86 @@ function tripal_core_relationships_form(&$form, &$form_state, $details) {
         array(':base_key_value' => $details['base_key_value'])
     );
   }
+
+  /* The format of the $existing_rels' array is either:
+   *
+   * From the chado_relationships array:
+   * $form_state['chado_relationships'] = array(
+   *   '[type_id]-[rank]' => array(
+   *     'object_id' => [the _relationship.object_id value],
+   *     'object_name' => [the base_table.uniquename value linked on base_foreign_key=object_id],
+   *     'subject_id' => [the _relationship.subject_id value],
+   *     'subject_name' => [the base_table.uniquename value linked on base_foreign_key=subject_id],
+   *     'type_id' => [the _relationship.type_id value],
+   *     'type_name' => [the cvterm.name value linked on type_id],
+   *     'rank' => [the _relationship.rank value],
+   *   ),
+   * );
+   *
+   * OR
+   * Populated from the database:
+   * $existing_rels = array(
+   *   0 => array(
+   *     'relationship_id' => [the _relationship.relationship_id value],
+   *     'object_id' => [the _relationship.object_id value],
+   *     'object_name' => [the base_table.uniquename value linked on base_foreign_key=object_id],
+   *     'subject_id' => [the _relationship.subject_id value],
+   *     'subject_name' => [the base_table.uniquename value linked on base_foreign_key=subject_id],
+   *     'type_id' => [the _relationship.type_id value],
+   *     'type_name' => [the cvterm.name value linked on type_id],
+   *     'rank' => [the _relationship.rank value],
+   *   ),
+   * );
+   *
+   * NOTE: The main difference is the key
+   *
+   * Loop on the array elements of the $existing_rels array and add
+   * an element to the form for each one.
+   */
   foreach ($existing_rels as $relationship) {
 
-    $form['relationships']['rel_table'][$relationship->type_id]['#type'] = 'markup';
-    $form['relationships']['rel_table'][$relationship->type_id]['#type'] = '';
+    $form['relationships']['relationship_table'][$relationship->type_id]['#type'] = 'markup';
+    $form['relationships']['relationship_table'][$relationship->type_id]['#type'] = '';
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['#type'] = 'markup';
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['#value'] = '';
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['#type'] = 'markup';
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['#value'] = '';
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['object_id'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['object_id'] = array(
       '#type' => 'hidden',
       '#value' => $relationship->object_id
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['subject_id'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['subject_id'] = array(
       '#type' => 'hidden',
       '#value' => $relationship->subject_id
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['type_id'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['type_id'] = array(
       '#type' => 'hidden',
       '#value' => $relationship->type_id
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['object_name'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['object_name'] = array(
       '#type' => 'markup',
       '#markup' => $relationship->object_name
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['type_name'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['type_name'] = array(
       '#type' => 'markup',
       '#markup' => $relationship->type_name
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['subject_name'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['subject_name'] = array(
       '#type' => 'markup',
       '#markup' => $relationship->subject_name
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['rank'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['rank'] = array(
       '#type' => 'markup',
       '#markup' => $relationship->rank
     );
 
-    $form['relationships']['rel_table'][$relationship->type_id][$relationship->rank]['rel_action'] = array(
+    $form['relationships']['relationship_table'][$relationship->type_id][$relationship->rank]['rel_action'] = array(
       '#type' => 'submit',
       '#value' => t('Remove'),
       '#name' => "rel_remove-".$relationship->type_id.'-'.$relationship->rank,
@@ -235,40 +283,53 @@ function tripal_core_relationships_form(&$form, &$form_state, $details) {
         'method'   => 'replace',
         'prevent'  => 'click'
       ),
+      // When this button is clicked, the form will be validated and submitted.
+      // Therefore, we set custom submit and validate functions to override the
+      // default node form submit.  In the validate function we validate only the
+      // relationship fields and in the submit we remove the indicated relationship
+      // from the chado_relationships array. In order to keep validate errors
+      // from the node form validate and Drupal required errors for non-relationship fields
+      // preventing the user from removing relationships we set the #limit_validation_errors below
       '#validate' => array('tripal_core_relationships_form_remove_button_validate'),
       '#submit' => array('tripal_core_relationships_form_remove_button_submit'),
+      // Limit the validation of the form upon clicking this button to the relationship_table tree
+      // No other fields will be validated (ie: no fields from the main form or any other api
+      // added form).
+      '#limit_validation_errors' => array(
+        array('relationship_table')  // Validate all fields within $form_state['values']['relationship_table']
+      )
     );
   }
 
-  $form['relationships']['rel_table']['new']['object_name'] = array(
+  $form['relationships']['relationship_table']['new']['object_name'] = array(
     '#type' => 'textfield',
   );
 
-  $form['relationships']['rel_table']['new']['object_is_current'] = array(
+  $form['relationships']['relationship_table']['new']['object_is_current'] = array(
     '#type' => 'checkbox',
     '#title' => t('Current '.$details['nodetype']),
   );
 
-  $form['relationships']['rel_table']['new']['type_name'] = array(
+  $form['relationships']['relationship_table']['new']['type_name'] = array(
     '#type' => 'select',
     '#options' => $type_options,
   );
 
-  $form['relationships']['rel_table']['new']['subject_name'] = array(
+  $form['relationships']['relationship_table']['new']['subject_name'] = array(
     '#type' => 'textfield',
   );
 
-  $form['relationships']['rel_table']['new']['subject_is_current'] = array(
+  $form['relationships']['relationship_table']['new']['subject_is_current'] = array(
     '#type' => 'checkbox',
     '#title' => t('Current '.$details['nodetype']),
   );
 
-  $form['relationships']['rel_table']['new']['rank'] = array(
+  $form['relationships']['relationship_table']['new']['rank'] = array(
     '#type' => 'markup',
     '#markup' => ''
   );
 
-  $form['relationships']['rel_table']['new']['rel_action'] = array(
+  $form['relationships']['relationship_table']['new']['rel_action'] = array(
     '#type' => 'submit',
     '#value' => t('Add'),
     '#name' => 'rel_add',
@@ -279,8 +340,21 @@ function tripal_core_relationships_form(&$form, &$form_state, $details) {
       'method'   => 'replace',
       'prevent'  => 'click'
     ),
+    // When this button is clicked, the form will be validated and submitted.
+    // Therefore, we set custom submit and validate functions to override the
+    // default node form submit.  In the validate function we validate only the
+    // relationship fields and in the submit we add them to the chado_relationships
+    // array. In order to keep validate errors from the node form validate and Drupal
+    // required errors for non-relationship fields preventing the user from adding relationships we
+    // set the #limit_validation_errors below
     '#validate' => array('tripal_core_relationships_form_add_button_validate'),
     '#submit' => array('tripal_core_relationships_form_add_button_submit'),
+    // Limit the validation of the form upon clicking this button to the relationship_table tree
+    // No other fields will be validated (ie: no fields from the main form or any other api
+    // added form).
+    '#limit_validation_errors' => array(
+      array('relationship_table')  // Validate all fields within $form_state['values']['relationship_table']
+    )
   );
 
 }
@@ -296,16 +370,16 @@ function tripal_core_relationships_form_add_button_validate($form, &$form_state)
   $details = unserialize($form_state['values']['rel_details']);
 
   // At least one of the participants must be the current node
-  if (!($form_state['values']['rel_table']['new']['subject_is_current'] OR $form_state['values']['rel_table']['new']['object_is_current'])) {
+  if (!($form_state['values']['relationship_table']['new']['subject_is_current'] OR $form_state['values']['relationship_table']['new']['object_is_current'])) {
     // If the checkbox isn't set then check to see if either has the same uniquename as the node
-    if ($form_state['values']['rel_table']['new']['subject_name'] == $form_state['values']['uniquename']) {
-      $form_state['values']['rel_table']['new']['subject_is_current'] = 1;
+    if ($form_state['values']['relationship_table']['new']['subject_name'] == $form_state['values']['uniquename']) {
+      $form_state['values']['relationship_table']['new']['subject_is_current'] = 1;
       form_set_error('subject_is_current', 'To set the current '.$details['nodetype'].', select the
         checkbox. You entered the unique name of the current '.$details['nodetype'].' as the subject,
         is this what you meant to do?');
     }
-    elseif ($form_state['values']['rel_table']['new']['subject_name'] == $form_state['values']['uniquename']) {
-      $form_state['values']['rel_table']['new']['object_is_current'] = 1;
+    elseif ($form_state['values']['relationship_table']['new']['subject_name'] == $form_state['values']['uniquename']) {
+      $form_state['values']['relationship_table']['new']['object_is_current'] = 1;
       form_set_error('subject_is_current', 'To set the current '.$details['nodetype'].', select the
         checkbox. You entered the unique name of the current '.$details['nodetype'].' as the subject,
         is this what you meant to do?');
@@ -318,50 +392,50 @@ function tripal_core_relationships_form_add_button_validate($form, &$form_state)
   }
 
   // The non-current uniquename must be exist in the base table (subject)
-  if (!($form_state['values']['rel_table']['new']['subject_is_current'])) {
+  if (!($form_state['values']['relationship_table']['new']['subject_is_current'])) {
     $result = tripal_core_chado_select(
       $details['base_table'],
       array($details['base_foreign_key']),
-      array('uniquename' => $form_state['values']['rel_table']['new']['subject_name'])
+      array('uniquename' => $form_state['values']['relationship_table']['new']['subject_name'])
     );
     if (!isset($result[0])) {
       form_set_error('subject_name', 'The subject must be the unique name of an
         existing '.$details['nodetype'].' unless the "Current '.$details['nodetype'].'" checkbox is selected');
     }
     else {
-      $form_state['values']['rel_table']['new']['subject_id'] = $result[0]->{$details['base_foreign_key']};
+      $form_state['values']['relationship_table']['new']['subject_id'] = $result[0]->{$details['base_foreign_key']};
     }
   }
 
   // The non-current uniquename must exist in the base table (object)
-  if (!($form_state['values']['rel_table']['new']['object_is_current'])) {
+  if (!($form_state['values']['relationship_table']['new']['object_is_current'])) {
     $result = tripal_core_chado_select(
       $details['base_table'],
       array($details['base_foreign_key']),
-      array('uniquename' => $form_state['values']['rel_table']['new']['object_name'])
+      array('uniquename' => $form_state['values']['relationship_table']['new']['object_name'])
     );
     if (!isset($result[0])) {
       form_set_error('object_name', 'The object must be the unique name of an
         existing '.$details['nodetype'].' unless the "Current '.$details['nodetype'].'" checkbox is selected');
     }
     else {
-      $form_state['values']['rel_table']['new']['object_id'] = $result[0]->{$details['base_foreign_key']};
+      $form_state['values']['relationship_table']['new']['object_id'] = $result[0]->{$details['base_foreign_key']};
     }
   }
 
   // The type must be a valid cvterm
-  if ($form_state['values']['rel_table']['new']['type_name']) {
-    $form_state['values']['rel_table']['new']['type_id'] = $form_state['values']['rel_table']['new']['type_name'];
+  if ($form_state['values']['relationship_table']['new']['type_name']) {
+    $form_state['values']['relationship_table']['new']['type_id'] = $form_state['values']['relationship_table']['new']['type_name'];
     $result = tripal_core_chado_select(
       'cvterm',
       array('name'),
-      array('cvterm_id' => $form_state['values']['rel_table']['new']['type_id'])
+      array('cvterm_id' => $form_state['values']['relationship_table']['new']['type_id'])
     );
     if (!isset($result[0])) {
       form_set_error('type_id', 'The select type is not a valid controlled vocabulary term.');
     }
     else {
-      $form_state['values']['rel_table']['new']['type_name'] = $result[0]->name;
+      $form_state['values']['relationship_table']['new']['type_name'] = $result[0]->name;
     }
   }
   else {
@@ -388,26 +462,26 @@ function tripal_core_relationships_form_add_button_submit(&$form, &$form_state)
   }
 
   // get details for the new relationship
-  if ($form_state['values']['rel_table']['new']['subject_is_current']) {
+  if ($form_state['values']['relationship_table']['new']['subject_is_current']) {
 
     $relationship = array(
-      'type_id' => $form_state['values']['rel_table']['new']['type_id'],
-      'object_id' => $form_state['values']['rel_table']['new']['object_id'],
+      'type_id' => $form_state['values']['relationship_table']['new']['type_id'],
+      'object_id' => $form_state['values']['relationship_table']['new']['object_id'],
       'subject_id' => $form_state['values'][ $details['base_foreign_key'] ],
-      'type_name' => $form_state['values']['rel_table']['new']['type_name'],
-      'object_name' => $form_state['values']['rel_table']['new']['object_name'],
+      'type_name' => $form_state['values']['relationship_table']['new']['type_name'],
+      'object_name' => $form_state['values']['relationship_table']['new']['object_name'],
       'subject_name' => $form_state['values']['uniquename'],
       'rank' => '0'
     );
   }
   else {
     $relationship = array(
-      'type_id' => $form_state['values']['rel_table']['new']['type_id'],
+      'type_id' => $form_state['values']['relationship_table']['new']['type_id'],
       'object_id' => $form_state['values'][ $details['base_foreign_key'] ],
-      'subject_id' => $form_state['values']['rel_table']['new']['subject_id'],
-      'type_name' => $form_state['values']['rel_table']['new']['type_name'],
+      'subject_id' => $form_state['values']['relationship_table']['new']['subject_id'],
+      'type_name' => $form_state['values']['relationship_table']['new']['type_name'],
       'object_name' => $form_state['values']['uniquename'],
-      'subject_name' => $form_state['values']['rel_table']['new']['subject_name'],
+      'subject_name' => $form_state['values']['relationship_table']['new']['subject_name'],
       'rank' => '0'
     );
   }
@@ -474,23 +548,35 @@ function tripal_core_relationships_form_remove_button_submit(&$form, &$form_stat
  * @ingroup tripal_relationships_api
  */
 function tripal_core_relationships_form_ajax_update($form, $form_state) {
-  return $form['relationships']['rel_table'];
+  return $form['relationships']['relationship_table'];
 }
 
 /**
  * Creates an array in form_state containing the existing relationships. This array is
  * then modified by the add/remove buttons and used as a source for rebuilding the form.
  *
+ * $form_state['chado_relationships'] = array(
+ *   '[type_id]-[rank]' => array(
+ *     'object_id' => [the _relationship.object_id value],
+ *     'object_name' => [the base_table.uniquename value linked on base_foreign_key=object_id],
+ *     'subject_id' => [the _relationship.subject_id value],
+ *     'subject_name' => [the base_table.uniquename value linked on base_foreign_key=subject_id],
+ *     'type_id' => [the _relationship.type_id value],
+ *     'type_name' => [the cvterm.name value linked on type_id],
+ *     'rank' => [the _relationship.rank value],
+ *   ),
+ * );
+ *
  * @ingroup tripal_relationships_api
  */
 function tripal_core_relationships_form_create_relationship_formstate_array($form, &$form_state) {
 
   $form_state['chado_relationships'] = array();
 
-  foreach (element_children($form['relationships']['rel_table']) as $type_id) {
+  foreach (element_children($form['relationships']['relationship_table']) as $type_id) {
     if ($type_id != 'new') {
-      foreach (element_children($form['relationships']['rel_table'][$type_id]) as $rank) {
-          $element = $form['relationships']['rel_table'][$type_id][$rank];
+      foreach (element_children($form['relationships']['relationship_table'][$type_id]) as $rank) {
+          $element = $form['relationships']['relationship_table'][$type_id][$rank];
           $rel = array(
             'type_id' => $element['type_id']['#value'],
             'object_id' => $element['object_id']['#value'],