Debugging fields

tripal_chado/includes/fields/chado_base__dbxref_id.inc

@@ -200,12 +200,12 @@ class chado_base__dbxref_id extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state)) {
-      $fk_val = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column);
-      $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--dbxref_id');
-      $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--db_id');
-      $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--accession');
-      $version = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--version');
-      $description = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--description');
+//       $fk_val = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column);
+//       $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--dbxref_id');
+//       $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--db_id');
+//       $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--accession');
+//       $version = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--version');
+//       $description = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column . '--description');
     }
 
     // If we are here because our parent was triggered in a form submit
@@ -223,7 +223,7 @@ class chado_base__dbxref_id extends TripalField {
     $schema = chado_get_schema('dbxref');
     $options = tripal_get_db_select_options();
 
-    $widget['#element_validate'] = array('chado_base__dbxref_id_widget_validate');
+    //$widget['#element_validate'] = array('chado_base__dbxref_id_widget_validate');
     $widget['#theme'] = 'chado_base__dbxref_id_widget';
     $widget['#prefix'] =  "<span id='$field_name-dbxref--db-id'>";
     $widget['#suffix'] =  "</span>";
@@ -375,12 +375,12 @@ function chado_base__dbxref_id_widget_validate($element, &$form_state) {
   }
 
   // Get the field values.
-  $fk_value = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column);
-  $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--dbxref_id');
-  $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--db_id');
-  $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--accession');
-  $version = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--version');
-  $description = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--description');
+//   $fk_value = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__' . $field_column);
+//   $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--dbxref_id');
+//   $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--db_id');
+//   $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--accession');
+//   $version = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--version');
+//   $description = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--description');
 
   // Make sure that if a database ID is provided that an accession is also
   // provided.  Here we use the form_set_error function rather than the
@@ -428,8 +428,8 @@ function chado_base__dbxref_id_widget_form_ajax_callback($form, $form_state) {
   $field_column = $field['settings']['chado_column'];
   $field_prefix = $field_table . '__' . $field_column;
 
-  $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--db_id');
-  $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--accession');
+//   $db_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--db_id');
+//   $accession = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_prefix . '--accession');
   if ($db_id and $accession) {
     $values = array(
       'db_id' => $db_id,

tripal_chado/includes/fields/chado_base__organism_id.inc

@@ -224,7 +224,7 @@ class chado_base__organism_id extends TripalField {
       '#required' => $element['#required'],
       '#weight' => isset($element['#weight']) ? $element['#weight'] : 0,
       '#delta' => $delta,
-      '#element_validate' => array('chado_base__organism_id_widget_validate'),
+//      '#element_validate' => array('chado_base__organism_id_widget_validate'),
     );
   }
 
@@ -386,7 +386,7 @@ function chado_base__organism_id_widget_validate($element, &$form_state) {
   if ($form_state['build_info']['form_id'] =='field_ui_field_edit_form') {
     return;
   }
-  $organism_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__organism_id');
+  //$organism_id = tripal_chado_get_field_form_values($field_name, $form_state, 0, $field_table . '__organism_id');
 
   if (!$organism_id) {
     form_error($element, t("Please specify an organism."));

tripal_chado/includes/fields/chado_feature__md5checksum.inc

@@ -182,7 +182,7 @@ class chado_feature__md5checksum  extends TripalField {
       $md5checksum = $items[0]['feature__md5checksum'];
     }
     if (array_key_exists('values', $form_state)) {
-      $md5checksum = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__md5checksum');
+      //$md5checksum = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__md5checksum');
     }
 
     $widget['value'] = array(
@@ -192,7 +192,7 @@ class chado_feature__md5checksum  extends TripalField {
     $widget['feature__md5checksum'] = array(
       '#type' => 'value',
       '#value' => $md5checksum,
-      '#element_validate' => array('chado_feature__md5checksum_widget_validate'),
+//      '#element_validate' => array('chado_feature__md5checksum_widget_validate'),
     );
   }
 
@@ -212,7 +212,7 @@ function chado_feature__md5checksum_widget_validate($element, &$form_state) {
 
   // Calculate the md5 checksum for the sequence only if md5 box is checked and
   // the residues exist.
-  $residues = tripal_chado_get_field_form_values('feature__residues', $form_state, 0, 'feature__residues');
+  //$residues = tripal_chado_get_field_form_values('feature__residues', $form_state, 0, 'feature__residues');
   if ($residues) {
     $residues = preg_replace('/\s/', '', $residues);
     tripal_chado_set_field_form_values($field_name, $form_state, md5($residues), 0, 'feature__md5checksum');

tripal_chado/includes/fields/chado_feature__residues.inc

@@ -196,7 +196,7 @@ class chado_feature__residues extends TripalField {
       $residues = $items[0]['feature__residues'];
     }
     if (array_key_exists('values', $form_state)) {
-      $residues = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__residues');
+      //$residues = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__residues');
     }
 
     $widget['value'] = array(
@@ -210,7 +210,7 @@ class chado_feature__residues extends TripalField {
       '#weight' => isset($element['#weight']) ? $element['#weight'] : 0,
       '#default_value' => $residues,
       '#delta' => $delta,
-      '#element_validate' => array('chado_feature__residues_widget_validate'),
+//      '#element_validate' => array('chado_feature__residues_widget_validate'),
       '#cols' => 30,
     );
   }
@@ -688,7 +688,7 @@ function chado_feature__residues_widget_validate($element, &$form_state) {
   $field_name = $element['#parents'][0];
 
   // Remove any white spaces.
-  $residues = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__residues');
+  //$residues = tripal_chado_get_field_form_values($field_name, $form_state, 0, 'feature__residues');
   if ($residues) {
     $residues = preg_replace('/\s/', '', $residues);
     tripal_chado_set_field_form_values($field_name, $form_state, $residues, 0, 'feature__residues');

tripal_chado/includes/fields/chado_feature__seqlen.inc

@@ -182,7 +182,7 @@ class chado_feature__seqlen extends TripalField {
       '#description' => $element['#description'],
       '#weight' => isset($element['#weight']) ? $element['#weight'] : 0,
       '#delta' => $delta,
-      '#element_validate' => array('chado_feature__seqlen_widget_validate'),
+//      '#element_validate' => array('chado_feature__seqlen_widget_validate'),
     );
   }
 
@@ -195,7 +195,7 @@ function chado_feature__seqlen_widget_validate($element, &$form_state) {
   $field_name = $element['#parents'][0];
 
   // Get the residues so we can calculate teh length.
-  $residues = tripal_chado_get_field_form_values('feature__residues', $form_state, 0, 'feature__residues');
+  //$residues = tripal_chado_get_field_form_values('feature__residues', $form_state, 0, 'feature__residues');
   // Remove any white spaces.
   if ($residues) {
     $residues = preg_replace('/\s/', '', $residues);

tripal_chado/includes/fields/chado_linker__cvterm.inc

@@ -180,10 +180,10 @@ class chado_linker__cvterm extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
-      $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name);
-      $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
-      $is_not = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_not');
-      $cvterm_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--cvterm__name');
+//       $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name);
+//       $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
+//       $is_not = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_not');
+//       $cvterm_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--cvterm__name');
     }
 
     if ($cvterm_name) {
@@ -374,11 +374,11 @@ function chado_linker__cvterm_widget_validate($element, &$form_state) {
   }
 
   // Get the field values.
-  $cvterm_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__cvterm_id');
-  $cv_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '--cvterm__cv_id--cv__cv_id');
-  $cvterm_name = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '--cvterm__name');
-  $cvterm_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__cvterm_id');
-  $pub_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__pub_id');
+//   $cvterm_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__cvterm_id');
+//   $cv_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '--cvterm__cv_id--cv__cv_id');
+//   $cvterm_name = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '--cvterm__name');
+//   $cvterm_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__cvterm_id');
+//   $pub_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__pub_id');
 
   // If the user provided a cv_id and a name then we want to set the
   // foreign key value to be the chado_record_idd

tripal_chado/includes/fields/chado_linker__cvterm_adder.inc

@@ -200,7 +200,7 @@ function chado_linker__cvterm_adder_widget_validate($element, &$form_state) {
     $base_table = $field['settings']['base_table'];
 
     // Get the vocabulary.
-    $cvterm_class_adder = tripal_chado_get_field_form_values($field_name, $form_state);
+    //$cvterm_class_adder = tripal_chado_get_field_form_values($field_name, $form_state);
     $cv = chado_generate_var('cv', array('cv_id' => $cvterm_class_adder));
 
     if (!$cv) {

tripal_chado/includes/fields/chado_linker__dbxref.inc

@@ -234,13 +234,13 @@ class chado_linker__dbxref extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
-      $record_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $pkey);
-      $fkey_value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $fkey);
-      $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id');
-      $db_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--db_id');
-      $accession = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--accession');
-      $version = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--version');
-      $description = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--description');
+//       $record_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $pkey);
+//       $fkey_value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $fkey);
+//       $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id');
+//       $db_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--db_id');
+//       $accession = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--accession');
+//       $version = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--version');
+//       $description = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id--description');
     }
 
     $schema = chado_get_schema('dbxref');
@@ -442,11 +442,11 @@ function chado_linker__dbxref_widget_validate($element, &$form_state) {
   }
 
   // Get the field values.
-  $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id');
-  $db_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--db_id');
-  $accession = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--accession');
-  $version = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--version');
-  $description = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--description');
+//   $dbxref_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__dbxref_id');
+//   $db_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--db_id');
+//   $accession = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--accession');
+//   $version = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--version');
+//   $description = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_prefix . '--description');
 
   // Make sure that if a database ID is provided that an accession is also
   // provided.  Here we use the form_set_error function rather than the

tripal_chado/includes/fields/chado_linker__prop.inc

@@ -202,10 +202,10 @@ class chado_linker__prop extends TripalField {
     // If we don't have a property value then we need to set all other fields
     // to be empty so that when the module tries to save the field on the
     // entity it won't try to save a partial record.
-    $pkey_val = tripal_chado_get_field_form_values($field_name, $form_state, $delta);
-    $prop_value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . "__value");
-    $fk_val = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__' . $lfkey_field);
-    $type_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__type_id');
+//     $pkey_val = tripal_chado_get_field_form_values($field_name, $form_state, $delta);
+//     $prop_value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . "__value");
+//     $fk_val = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__' . $lfkey_field);
+//     $type_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $table_name . '__type_id');
 
     if (!$prop_value) {
       tripal_chado_set_field_form_values($field_name, $form_state, '', $delta, $table_name . '__' . $lfkey_field);

tripal_chado/includes/fields/chado_linker__prop_adder.inc

@@ -201,7 +201,7 @@ function chado_linker__prop_adder_widget_validate($element, &$form_state) {
         $base_table = $field['settings']['base_table'];
 
         // Get the term for the property
-        $kvproperty = tripal_chado_get_field_form_values($field_name, $form_state);
+        //$kvproperty = tripal_chado_get_field_form_values($field_name, $form_state);
         $term = chado_generate_var('cvterm', array('name' => $kvproperty), $options = array('return_array' => TRUE));
 
         if (count($term) == 1) {

tripal_chado/includes/fields/chado_linker__pub.inc

@@ -212,10 +212,10 @@ class chado_linker_pub extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
-      $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $pkey);
-      $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
-      $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
-      $title = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__title');
+//       $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $pkey);
+//       $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
+//       $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
+//       $title = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__title');
     }
 
     $schema = chado_get_schema('pub');
@@ -334,9 +334,9 @@ function chado_linker__pub_widget_validate($element, &$form_state) {
   }
 
   // Get the field values.
-  $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
-  $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
-  $uname = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--pub__uniquename');
+//   $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
+//   $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
+//   $uname = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--pub__uniquename');
 
   // If the user provided a uniquename then we want to set the
   // foreign key value to be the chado_record_idd

tripal_chado/includes/fields/chado_linker__relationship.inc

@@ -278,15 +278,15 @@ class chado_linker__relationship extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
-      $record_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $pkey);
-      $subject_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__subject_id');
-      $subject_uniquename = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'subject_name');
-      $type_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__type_id');
-      $type = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'type_name');
-      $object_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__object_id');
-      $object_uniquename = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'object_name');
-      $value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__value');
-      $rank = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__rank');
+//       $record_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__' . $pkey);
+//       $subject_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__subject_id');
+//       $subject_uniquename = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'subject_name');
+//       $type_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__type_id');
+//       $type = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'type_name');
+//       $object_id = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__object_id');
+//       $object_uniquename = tripal_chado_get_field_form_values($field_name, $form_state, $delta, 'object_name');
+//       $value = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__value');
+//       $rank = tripal_chado_get_field_form_values($field_name, $form_state, $delta, $field_table . '__rank');
     }
 
     $widget['#table_name'] = $chado_table;
@@ -343,8 +343,6 @@ class chado_linker__relationship extends TripalField {
 
     // Set up available cvterms for selection
     $vocs = tripal_get_cv_select_options();
-    $form['#prefix'] = '<div id="chado-linker--relationship-widget-terms">';
-    $form['#suffix'] = '</div>';
     $widget['vocabulary'] = array(
       '#type' => 'select',
       '#title' => t('Vocabulary'),
@@ -353,7 +351,7 @@ class chado_linker__relationship extends TripalField {
       '#default_value' => $type_id,
       '#ajax' => array(
         'callback' => "chado_linker__relationship_widget_form_ajax_callback",
-        'wrapper' => "chado-linker--relationship-widget-terms",
+        'wrapper' => "$chado_table-$delta",
         'effect' => 'fade',
         'method' => 'replace'
       ),
@@ -368,7 +366,7 @@ class chado_linker__relationship extends TripalField {
         '#autocomplete_path' => "admin/tripal/storage/chado/auto_name/cvterm/$cv_id"
       );
     }
-    
+
     $widget['object_name'] = array(
       '#type' => 'textfield',
       '#title' => t('Object'),
@@ -887,5 +885,9 @@ function theme_chado_linker__relationship_widget($variables) {
  * An Ajax callback for the dbxref widget.
  */
 function chado_linker__relationship_widget_form_ajax_callback(&$form, $form_state) {
-  return $form['instance']['default_value_widget'];
+  // Get the triggering element
+  $form_element_name = $form_state['triggering_element']['#name'];
+  dpm($form);
+  dpm($form_state);
+  return $form['instance']['default_value_widget']['organism_relationship'];
 }

tripal_chado/includes/fields/chado_linker__synonym.inc

@@ -210,14 +210,14 @@ class chado_linker__synonym extends TripalField {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
-      $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $pkey);
-      $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
-      $synonym_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id');
-      $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
-      $is_current = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_current');
-      $is_internal = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_internal');
-      $syn_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id--name');
-      $syn_type = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id--type_id');
+//       $record_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $pkey);
+//       $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
+//       $synonym_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id');
+//       $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
+//       $is_current = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_current');
+//       $is_internal = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_internal');
+//       $syn_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id--name');
+//       $syn_type = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id--type_id');
     }
 
     // Get the synonym type terms.  There shouldn't be too many.
@@ -230,7 +230,7 @@ class chado_linker__synonym extends TripalField {
 
     $widget['#table_name'] = $table_name;
     $widget['#fkey_field'] = $fkey;
-    $widget['#element_validate'] = array('chado_linker__synonym_widget_validate');
+//    $widget['#element_validate'] = array('chado_linker__synonym_widget_validate');
     $widget['#theme'] = 'chado_linker__synonym_widget';
     $widget['#prefix'] =  "<span id='$table_name-$delta'>";
     $widget['#suffix'] =  "</span>";
@@ -395,13 +395,13 @@ function chado_linker__synonym_widget_validate($element, &$form_state) {
   }
 
   // Get the field values.
-  $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
-  $synonym_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id');
-  $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
-  $is_current = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_current');
-  $is_internal = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_internal');
-  $syn_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--synonym__name');
-  $syn_type = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--synonym__type_id');
+//   $fkey_value = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__' . $fkey);
+//   $synonym_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__synonym_id');
+//   $pub_id = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__pub_id');
+//   $is_current = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_current');
+//   $is_internal = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '__is_internal');
+//   $syn_name = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--synonym__name');
+//   $syn_type = tripal_chado_get_field_form_values($table_name, $form_state, $delta, $table_name . '--synonym__type_id');
 
   // Make sure that if a synonym is provided that a type is also
   // provided.