Browse Source

Merge branch '7.x-3.x' of https://github.com/tripal/tripal into 7.x-3.x

Lacey Sanderson 7 years ago
parent
commit
79fb833f64

+ 3 - 0
tripal/api/tripal.importer.api.inc

@@ -123,6 +123,9 @@ function tripal_run_importer($import_id, TripalJob $job = NULL) {
     // Check for new fields and notify the user.
     tripal_tripal_cron_notification();
 
+    // Clear the Drpual chace
+    cache_clear_all();
+
   }
   catch (Exception $e) {
     $transaction->rollback();

+ 16 - 14
tripal_chado/includes/TripalFields/data__sequence_coordinates/data__sequence_coordinates.inc

@@ -89,20 +89,22 @@ class data__sequence_coordinates extends ChadoField {
 
     // Get the featureloc records that this feature is aligned to.
     $aligned = $feature->featureloc->feature_id;
-    foreach ($aligned as $index => $featureloc) {
-      $srcfeature = $featureloc->srcfeature_id->name;
-      $entity->{$field_name}['und'][0] = array(
-        'value' => array(
-          'data:3002' => $srcfeature,
-          'local:fmin' => $featureloc->fmin + 1,
-          'local:fmax' => $featureloc->fmax,
-          'data:2336' => $featureloc->phase,
-          'data:0853' => $featureloc->strand,
-        ),
-      );
-      $sentity_id = chado_get_record_entity_by_table('feature_id', $featureloc->srcfeature_id->feature_id);
-      if ($sentity_id) {
-        $entity->{$field_name}['und'][0]['value']['entity'] = 'TripalEntity:' . $sentity_id;
+    if ($aligned) {
+      foreach ($aligned as $index => $featureloc) {
+        $srcfeature = $featureloc->srcfeature_id->name;
+        $entity->{$field_name}['und'][0] = array(
+          'value' => array(
+            'data:3002' => $srcfeature,
+            'local:fmin' => $featureloc->fmin + 1,
+            'local:fmax' => $featureloc->fmax,
+            'data:2336' => $featureloc->phase,
+            'data:0853' => $featureloc->strand,
+          ),
+        );
+        $sentity_id = chado_get_record_entity_by_table('feature_id', $featureloc->srcfeature_id->feature_id);
+        if ($sentity_id) {
+          $entity->{$field_name}['und'][0]['value']['entity'] = 'TripalEntity:' . $sentity_id;
+        }
       }
     }
   }