Merge pull request #149 from statonlab/fix-empty-object-warning

Fix Warning: in tripal_bulk_loader_load

tripal_bulk_loader/includes/tripal_bulk_loader.chado_node.inc

@@ -189,6 +189,9 @@ function tripal_bulk_loader_load($nodes) {
   );
   foreach ($result as $record) {
     $record->num_inserted = sizeof(preg_split('/,/', $record->ids_inserted));
+    if(!isset($nodes[$record->nid]->inserted_records)) {
+      $nodes[$record->nid]->inserted_records = new stdClass();
+    }
     $nodes[$record->nid]->inserted_records->{$record->table_inserted_into} = $record;
   }
 

tripal_chado/api/modules/tripal_chado.organism.api.inc

@@ -145,7 +145,7 @@ function tripal_get_organism_select_options($syncd_only = TRUE) {
   if ($syncd_only) {
     $sql = "
       SELECT *
-      FROM {chado_organism} CO
+      FROM [chado_organism] CO
         INNER JOIN {organism} O ON O.organism_id = CO.organism_id
       ORDER BY O.genus, O.species
     ";