Removed from TripalField::load() function

tripal/includes/TripalFields/TripalField.inc

@@ -217,7 +217,6 @@ class TripalField {
    * Loads the field values from the underlying data store.
    *
    * @param $entity
-   * @param $details
    *
    * @return
    *   An array of the following format:
@@ -241,7 +240,7 @@ class TripalField {
    *
    *
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
   }
 

tripal/includes/TripalFields/content_type/content_type.inc

@@ -22,7 +22,7 @@ class content_type extends TripalField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $bundle = tripal_load_bundle_entity(array('name' => $entity->bundle));
     $entity->{$this->field['field_name']}['und'][0]['value'] = $bundle->label;
   }

tripal/includes/TripalFields/rdfs__type/rdfs__type.inc

@@ -46,7 +46,7 @@ class rdfs__type extends TripalField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $bundle = tripal_load_bundle_entity(array('name' => $entity->bundle));
     $entity->{$this->field['field_name']}['und'][0]['value'] = $bundle->label;
   }

tripal_chado/includes/TripalFields/chado_linker__contact/chado_linker__contact.inc

@@ -62,8 +62,9 @@ class chado_linker__contact extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
+
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];
@@ -71,7 +72,7 @@ class chado_linker__contact extends ChadoField {
 
     // Get the FK that links to the base record.
     $schema = chado_get_schema($field_table);
-    $base_table = $details['record']->tablename;
+    $base_table = $entity->chado_table;
     $pkey = $schema['primary key'][0];
     if (!isset($schema['foreign keys'][$base_table]['columns'])) {
       return;

tripal_chado/includes/TripalFields/chado_linker__cvterm/chado_linker__cvterm.inc

@@ -55,7 +55,7 @@ class chado_linker__cvterm extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];

tripal_chado/includes/TripalFields/chado_linker__prop/chado_linker__prop.inc

@@ -59,7 +59,7 @@ class chado_linker__prop extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];

tripal_chado/includes/TripalFields/data__accession/data__accession.inc

@@ -47,9 +47,9 @@ class data__accession extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
-    $record = $details['record'];
+    $record = $entity->chado_record;
 
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];

tripal_chado/includes/TripalFields/data__protein_sequence/data__protein_sequence.inc

@@ -47,9 +47,9 @@ class data__protein_sequence extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $field_name = $this->field['field_name'];
-    $feature = $details['record'];
+    $feature = $entity->chado_record;
     $num_seqs = 0;
 
     // Look for Protein sequences

tripal_chado/includes/TripalFields/data__sequence/data__sequence.inc

@@ -46,9 +46,9 @@ class data__sequence extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $field_name = $this->field['field_name'];
-    $feature = $details['record'];
+    $feature = $entity->chado_record;
 
     // We don't want to get the sequence for traditionally large types. They are
     // too big,  bog down the web browser, take longer to load and it's not

tripal_chado/includes/TripalFields/data__sequence_coordinates/data__sequence_coordinates.inc

@@ -59,7 +59,7 @@ class data__sequence_coordinates extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
   }
 }

tripal_chado/includes/TripalFields/go__gene_expression/go__gene_expression.inc

@@ -64,8 +64,9 @@ class go__gene_expression extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+
+    $record = $entity->chado_record;
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];
@@ -73,7 +74,7 @@ class go__gene_expression extends ChadoField {
 
     // Get the FK that links to the base record.
     $schema = chado_get_schema($field_table);
-    $base_table = $details['record']->tablename;
+    $base_table = $entity->chado_table;
     $pkey = $schema['primary key'][0];
     $fkey_lcolumn = key($schema['foreign keys'][$base_table]['columns']);
     $fkey_rcolumn = $schema['foreign keys'][$base_table]['columns'][$fkey_lcolumn];

tripal_chado/includes/TripalFields/local__source_data/local__source_data.inc

@@ -59,8 +59,8 @@ class local__source_data extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $analysis = $details['record'];
+  public function load($entity) {
+    $analysis = $entity->chado_record;
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];

tripal_chado/includes/TripalFields/obi__organism/obi__organism.inc

@@ -65,9 +65,9 @@ class obi__organism extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
-    $record = $details['record'];
+    $record = $entity->chado_record;
     $settings = $this->instance['settings'];
 
     $field_name = $this->field['field_name'];

tripal_chado/includes/TripalFields/ogi__location_on_map/ogi__location_on_map.inc

@@ -59,8 +59,9 @@ class ogi__location_on_map extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+
+    $record = $entity->chado_record;
     $settings = $this->field['settings'];
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];

tripal_chado/includes/TripalFields/sbo__database_cross_reference/sbo__database_cross_reference.inc

@@ -61,8 +61,8 @@ class sbo__database_cross_reference extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
 
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];

tripal_chado/includes/TripalFields/sbo__phenotype/sbo__phenotype.inc

@@ -61,8 +61,8 @@ class sbo__phenotype extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];
@@ -70,7 +70,7 @@ class sbo__phenotype extends ChadoField {
 
     // Get the FK that links to the base record.
     $schema = chado_get_schema($field_table);
-    $base_table = $details['record']->tablename;
+    $base_table = $entity->chado_table;
     $pkey = $schema['primary key'][0];
     $fkey_lcolumn = key($schema['foreign keys'][$base_table]['columns']);
     $fkey_rcolumn = $schema['foreign keys'][$base_table]['columns'][$fkey_lcolumn];

tripal_chado/includes/TripalFields/sbo__relationship/sbo__relationship.inc

@@ -65,10 +65,10 @@ class sbo__relationship extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $settings = $this->field['settings'];
 
-    $record = $details['record'];
+    $record = $entity->chado_record;
 
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];

tripal_chado/includes/TripalFields/schema__additional_type/schema__additional_type.inc

@@ -49,8 +49,8 @@ class schema__additional_type extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
     $base_table = $this->instance['settings']['base_table'];
 
     $field_name = $this->field['field_name'];

tripal_chado/includes/TripalFields/schema__alternate_name/schema__alternate_name.inc

@@ -47,8 +47,8 @@ class schema__alternate_name extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
     $base_table = $this->instance['settings']['base_table'];
 
     $field_name = $this->field['field_name'];

tripal_chado/includes/TripalFields/schema__publication/schema__publication.inc

@@ -61,8 +61,8 @@ class schema__publication extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
 
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];

tripal_chado/includes/TripalFields/sio__references/sio__references.inc

@@ -59,7 +59,8 @@ class sio__references extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
+
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];

tripal_chado/includes/TripalFields/so__cds/so__cds.inc

@@ -46,9 +46,9 @@ class so__cds extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
     $field_name = $this->field['field_name'];
-    $feature = $details['record'];
+    $feature = $entity->chado_record;
     $num_seqs = 0;
 
     $feature = chado_expand_var($feature, 'table', 'featureloc', $options);

tripal_chado/includes/TripalFields/so__genotype/so__genotype.inc

@@ -60,8 +60,8 @@ class so__genotype extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];
@@ -69,7 +69,7 @@ class so__genotype extends ChadoField {
 
     // Get the FK that links to the base record.
     $schema = chado_get_schema($field_table);
-    $base_table = $details['record']->tablename;
+    $base_table = $entity->chado_table;
     $pkey = $schema['primary key'][0];
     $fkey_lcolumn = key($schema['foreign keys'][$base_table]['columns']);
     $fkey_rcolumn = $schema['foreign keys'][$base_table]['columns'][$fkey_lcolumn];

tripal_chado/includes/TripalFields/so__transcript/so__transcript.inc

@@ -59,9 +59,9 @@ class so__transcript extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
-    $record = $details['record'];
+    $record = $entity->chado_record;
     $field_name = $this->field['field_name'];
     $field_type = $this->field['type'];
     $field_table = $this->instance['settings']['chado_table'];

tripal_chado/includes/TripalFields/taxrank__infraspecific_taxon/taxrank__infraspecific_taxon.inc

@@ -58,8 +58,8 @@ class taxrank__infraspecific_taxon extends ChadoField {
    *
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
-    $record = $details['record'];
+  public function load($entity) {
+    $record = $entity->chado_record;
     $settings = $this->field['settings'];
 
     $field_name = $this->field['field_name'];

tripal_chado/includes/TripalFields/uo__unit/uo__unit.inc

@@ -38,9 +38,9 @@ class uo__unit extends ChadoField {
   /**
    * @see TripalField::load()
    */
-  public function load($entity, $details = array()) {
+  public function load($entity) {
 
-    $record = $details['record'];
+    $record = $entity->chado_record;
     $settings = $this->instance['settings'];
 
     $field_name = $this->field['field_name'];