tripal_organism.module 21 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651
  1. <?php
  2. require_once "api/tripal_organism.api.inc";
  3. require_once "includes/tripal_organism.admin.inc";
  4. require_once "includes/organism_sync.inc";
  5. /**
  6. * @file
  7. * @defgroup tripal_organism Organism Module
  8. * @ingroup tripal_modules
  9. */
  10. /**
  11. *
  12. * @ingroup tripal_organism
  13. */
  14. function tripal_organism_init() {
  15. // add the jGCharts JS and CSS
  16. drupal_add_css(drupal_get_path('module', 'tripal_organism') . '/theme/css/tripal_organism.css');
  17. drupal_add_js(drupal_get_path('module', 'tripal_organism') . '/theme/js/tripal_organism.js');
  18. }
  19. /**
  20. * Provide information to drupal about the node types that we're creating
  21. * in this module
  22. *
  23. * @ingroup tripal_organism
  24. */
  25. function tripal_organism_node_info() {
  26. $nodes = array();
  27. $nodes['chado_organism'] = array(
  28. 'name' => t('Organism'),
  29. 'base' => 'chado_organism',
  30. 'description' => t('An organism'),
  31. 'has_title' => FALSE,
  32. 'title_label' => t('Organism'),
  33. 'locked' => TRUE
  34. );
  35. return $nodes;
  36. }
  37. /**
  38. *
  39. * @ingroup tripal_organism
  40. */
  41. function tripal_organism_block_info() {
  42. $blocks['base']['info'] = t('Tripal Organism Details');
  43. $blocks['base']['cache'] = DRUPAL_NO_CACHE;
  44. $blocks['description']['info'] = t('Tripal Organism Description');
  45. $blocks['description']['cache'] = DRUPAL_NO_CACHE;
  46. $blocks['image']['info'] = t('Tripal Organism Image');
  47. $blocks['image']['cache'] = DRUPAL_NO_CACHE;
  48. return $blocks;
  49. }
  50. /**
  51. *
  52. * @ingroup tripal_organism
  53. */
  54. function tripal_organism_block_view($delta = '') {
  55. if (user_access('access chado_feature content') and arg(0) == 'node' and is_numeric(arg(1))) {
  56. $nid = arg(1);
  57. $node = node_load($nid);
  58. $block = array();
  59. switch ($delta) {
  60. case 'base':
  61. $block['subject'] = t('Organism Details');
  62. $block['content'] = theme('tripal_organism_base', $node);
  63. break;
  64. case 'description':
  65. $block['subject'] = t('Organism Description');
  66. $block['content'] = theme('tripal_organism_description', $node);
  67. break;
  68. case 'image':
  69. $block['subject'] = t('Organism Image');
  70. $block['content'] = theme('tripal_organism_image', $node);
  71. break;
  72. default:
  73. }
  74. return $block;
  75. }
  76. }
  77. /**
  78. * Menu items are automatically added for the new node types created
  79. * by this module to the 'Create Content' Navigation menu item. This function
  80. * adds more menu items needed for this module.
  81. *
  82. * @ingroup tripal_organism
  83. */
  84. function tripal_organism_menu() {
  85. $items = array();
  86. // the administative settings menu
  87. $items['admin/tripal/chado/tripal_organism'] = array(
  88. 'title' => 'Organisms',
  89. 'description' => 'Any living biological entity, such as an animal, plant, fungus, or bacterium.',
  90. 'page callback' => 'tripal_organism_admin_organism_view',
  91. 'access arguments' => array('adminster tripal organism'),
  92. 'type' => MENU_NORMAL_ITEM,
  93. );
  94. $items['admin/tripal/chado/tripal_organism/help'] = array(
  95. 'title' => 'Help',
  96. 'description' => "A description of the Tripal Organism module including a short description of it's usage.",
  97. 'page callback' => 'theme',
  98. 'page arguments' => array('tripal_organism_help'),
  99. 'access arguments' => array('adminster tripal organism'),
  100. 'type' => MENU_LOCAL_TASK,
  101. );
  102. $items['admin/tripal/chado/tripal_organism/configuration'] = array(
  103. 'title' => 'Settings',
  104. 'description' => 'Manage integration of Chado organisms including associated features',
  105. 'page callback' => 'drupal_get_form',
  106. 'page arguments' => array('tripal_organism_admin'),
  107. 'access arguments' => array('adminster tripal organism'),
  108. 'type' => MENU_LOCAL_TASK,
  109. );
  110. $items['admin/tripal/chado/tripal_organism/sync'] = array(
  111. 'title' => 'Sync',
  112. 'description' => 'Sync Chado organisms with Drupal',
  113. 'page callback' => 'drupal_get_form',
  114. 'page arguments' => array('tripal_organism_sync'),
  115. 'access arguments' => array('adminster tripal organism'),
  116. 'type' => MENU_LOCAL_TASK,
  117. );
  118. $items['admin/tripal/chado/tripal_organism/views/organisms/enable'] = array(
  119. 'title' => 'Enable Organism Administrative View',
  120. 'page callback' => 'tripal_views_admin_enable_view',
  121. 'page arguments' => array('tripal_organism_admin_organisms', 'admin/tripal/chado/tripal_organism'),
  122. 'access arguments' => array('administer tripal_bulk_loader'),
  123. 'type' => MENU_CALLBACK,
  124. );
  125. return $items;
  126. }
  127. /**
  128. * Implements hook_help()
  129. * Purpose: Adds a help page to the module list
  130. */
  131. function tripal_organism_help ($path, $arg) {
  132. if ($path == 'admin/help#tripal_organism') {
  133. return theme('tripal_organism_help', array());
  134. }
  135. }
  136. /**
  137. * We need to let drupal know about our theme functions and their arguments.
  138. * We create theme functions to allow users of the module to customize the
  139. * look and feel of the output generated in this module
  140. *
  141. * @ingroup tripal_organism
  142. */
  143. function tripal_organism_theme($existing, $type, $theme, $path) {
  144. $core_path = drupal_get_path('module', 'tripal_core');
  145. $items = array(
  146. 'node__chado_organism' => array(
  147. 'template' => 'node--chado-generic',
  148. 'render element' => 'node',
  149. 'base hook' => 'node',
  150. 'path' => "$core_path/theme",
  151. ),
  152. 'tripal_organism_base' => array(
  153. 'variables' => array('node' => NULL),
  154. 'template' => 'tripal_organism_base',
  155. 'path' => "$path/theme/tripal_organism",
  156. ),
  157. 'tripal_organism_description' => array(
  158. 'variables' => array('node' => NULL),
  159. 'template' => 'tripal_organism_description',
  160. 'path' => "$path/theme/tripal_organism",
  161. ),
  162. 'tripal_organism_image' => array(
  163. 'variables' => array('node' => NULL),
  164. 'template' => 'tripal_organism_image',
  165. 'path' => "$path/theme/tripal_organism",
  166. ),
  167. 'tripal_organism_teaser' => array(
  168. 'variables' => array('node' => NULL),
  169. 'template' => 'tripal_organism_teaser',
  170. 'path' => "$path/theme/tripal_organism",
  171. ),
  172. 'tripal_organism_help' => array(
  173. 'template' => 'tripal_organism_help',
  174. 'variables' => array(NULL),
  175. 'path' => "$path/theme",
  176. ),
  177. );
  178. return $items;
  179. }
  180. /**
  181. *
  182. * @param $node
  183. */
  184. function tripal_organism_node_presave($node) {
  185. switch ($node->type) {
  186. case 'chado_organism':
  187. // set the title for the node
  188. $node->title = "$node->genus $node->species";
  189. break;
  190. }
  191. }
  192. /**
  193. *
  194. * @ingroup tripal_feature
  195. */
  196. function tripal_organism_node_view($node, $view_mode, $langcode) {
  197. switch ($node->type) {
  198. case 'chado_organism':
  199. // Show feature browser and counts
  200. if ($view_mode == 'full') {
  201. $node->content['tripal_organism_base'] = array(
  202. '#value' => theme('tripal_organism_base', array('node' => $node)),
  203. );
  204. }
  205. break;
  206. }
  207. }
  208. /**
  209. * Set the permission types that the chado module uses. Essentially we
  210. * want permissionis that protect creation, editing and deleting of chado
  211. * data objects
  212. *
  213. *
  214. @ingroup tripal_organism
  215. */
  216. function tripal_organism_permission() {
  217. return array(
  218. 'access chado_organism content' => array(
  219. 'title' => t('View Organisms'),
  220. 'description' => t('Allow users to view organism pages.'),
  221. ),
  222. 'create chado_organism content' => array(
  223. 'title' => t('Create Organisms'),
  224. 'description' => t('Allow users to create new organism pages.'),
  225. ),
  226. 'delete chado_organism content' => array(
  227. 'title' => t('Delete Organisms'),
  228. 'description' => t('Allow users to delete organism pages.'),
  229. ),
  230. 'edit chado_organism content' => array(
  231. 'title' => t('Edit Organisms'),
  232. 'description' => t('Allow users to edit organism pages.'),
  233. ),
  234. 'adminster tripal organism' => array(
  235. 'title' => t('Administer Organisms'),
  236. 'description' => t('Allow users to administer all organisms.'),
  237. ),
  238. );
  239. }
  240. /**
  241. * Implements hook_views_api()
  242. * Purpose: Essentially this hook tells drupal that there is views support for
  243. * for this module which then includes tripal_db.views.inc where all the
  244. * views integration code is
  245. *
  246. * @ingroup tripal_organism
  247. */
  248. function tripal_organism_views_api() {
  249. return array(
  250. 'api' => 2.0,
  251. );
  252. }
  253. /**
  254. *
  255. *
  256. * @ingroup tripal_organism
  257. */
  258. function tripal_organism_job_describe_args($callback, $args) {
  259. $new_args = array();
  260. if ($callback == 'tripal_organism_sync_organisms') {
  261. $organism = tripal_core_chado_select('organism', array('genus', 'species'), array('organism_id' => $args[0]));
  262. $new_args['Organism'] = $organism[0]->genus . " " . $organism[0]->species;
  263. }
  264. return $new_args;
  265. }
  266. /**
  267. * Implement hook_access().
  268. *
  269. * This hook allows node modules to limit access to the node types they define.
  270. *
  271. * @param $node
  272. * The node on which the operation is to be performed, or, if it does not yet exist, the
  273. * type of node to be created
  274. *
  275. * @param $op
  276. * The operation to be performed
  277. *
  278. *
  279. * @param $account
  280. * A user object representing the user for whom the operation is to be performed
  281. *
  282. * @return
  283. * If the permission for the specified operation is not set then return FALSE. If the
  284. * permission is set then return NULL as this allows other modules to disable
  285. * access. The only exception is when the $op == 'create'. We will always
  286. * return TRUE if the permission is set.
  287. *
  288. * @ingroup tripal_organism
  289. */
  290. function chado_organism_node_access($node, $op, $account) {
  291. if ($op == 'create') {
  292. if (!user_access('create chado_organism content', $account)) {
  293. return FALSE;
  294. }
  295. return TRUE;
  296. }
  297. if ($op == 'update') {
  298. if (!user_access('edit chado_organism content', $account)) {
  299. return FALSE;
  300. }
  301. }
  302. if ($op == 'delete') {
  303. if (!user_access('delete chado_organism content', $account)) {
  304. return FALSE;
  305. }
  306. }
  307. if ($op == 'view') {
  308. if (!user_access('access chado_organism content', $account)) {
  309. return FALSE;
  310. }
  311. }
  312. return NULL;
  313. }
  314. /**
  315. * Implementation of hook_validate
  316. *
  317. * @param $node
  318. * @param $form
  319. * @param $form_state
  320. *
  321. * @ingroup tripal_organism
  322. */
  323. function chado_organism_validate($node, $form, &$form_state) {
  324. // remove any white space around values
  325. $node->genus = trim($node->genus);
  326. $node->species = trim($node->species);
  327. $node->abbreviation = trim($node->abbreviation);
  328. $node->common_name = trim($node->common_name);
  329. $node->description = trim($node->description);
  330. // if this is an update, we want to make sure that a different organism doesn't
  331. // already have this genus and speces
  332. if (property_exists($node, 'organism_id')) {
  333. $sql = "
  334. SELECT *
  335. FROM {organism} O
  336. WHERE
  337. genus = :genus AND
  338. species = :species AND NOT
  339. organism_id = :organism_id
  340. ";
  341. $args = array(':genus' => $node->genus, ':species' => $node->species, ':organism_id' => $node->organism_id);
  342. $result = chado_query($sql, $args)->fetchObject();
  343. if ($result) {
  344. form_set_error('genus', t("Update cannot proceed. The organism genus
  345. '$node->genus' and species '$node->species' is already present in the database."));
  346. watchdog('tripal_organism',
  347. 'Update organism: genus and species already exists: %values',
  348. array('%values' => "genus = $node->genus, species = $node->species"),
  349. WATCHDOG_WARNING);
  350. }
  351. }
  352. // if this is an insert then check to make sure the genus and species are unique
  353. else {
  354. $values = array(
  355. 'genus' => $node->genus,
  356. 'species' => $node->species,
  357. );
  358. $organism = tripal_core_chado_select('organism', array('organism_id'), $values);
  359. if (sizeof($organism) > 0) {
  360. form_set_error('genus', 'Cannot add the organism with this genus and species.
  361. The organism already exists.');
  362. watchdog('tripal_organism',
  363. 'Insert organism: genus and species already exists: %values',
  364. array('%values' => "genus = $node->genus, species = $node->species"),
  365. WATCHDOG_WARNING);
  366. }
  367. }
  368. }
  369. /**
  370. * When a new chado_organism node is created we also need to add information
  371. * to our chado_organism table. This function is called on insert of a new node
  372. * of type 'chado_organism' and inserts the necessary information.
  373. *
  374. * @ingroup tripal_organism
  375. */
  376. function chado_organism_insert($node) {
  377. // remove any white space around values
  378. $node->genus = trim($node->genus);
  379. $node->species = trim($node->species);
  380. $node->abbreviation = trim($node->abbreviation);
  381. $node->common_name = trim($node->common_name);
  382. $node->description = trim($node->description);
  383. // if there is an organism_id in the $node object then this must be a sync so
  384. // we can skip adding the organism as it is already there, although
  385. // we do need to proceed with the rest of the insert
  386. if (!property_exists($node,'organism_id')) {
  387. $values = array(
  388. 'genus' => $node->genus,
  389. 'species' => $node->species,
  390. 'abbreviation' => $node->abbreviation,
  391. 'common_name' => $node->common_name,
  392. 'comment' => $node->description
  393. );
  394. $organism = tripal_core_chado_insert('organism', $values);
  395. if (!$organism) {
  396. drupal_set_message(t('Unable to add organism.', 'warning'));
  397. watchdog('tripal_organism', 'Insert Organism: Unable to create organism where values:%values',
  398. array('%values' => print_r($values, TRUE)), WATCHDOG_ERROR);
  399. return;
  400. }
  401. $organism_id = $organism['organism_id'];
  402. }
  403. else {
  404. $organism_id = $node->organism_id;
  405. }
  406. // Make sure the entry for this organism doesn't already exist in the
  407. // chado_organism table if it doesn't exist then we want to add it.
  408. $check_org_id = chado_get_id_for_node('organism', $node->nid);
  409. if (!$check_org_id) {
  410. $record = new stdClass();
  411. $record->nid = $node->nid;
  412. $record->vid = $node->vid;
  413. $record->organism_id = $organism_id;
  414. drupal_write_record('chado_organism', $record);
  415. }
  416. // add the image
  417. chado_organism_add_image($node);
  418. }
  419. /**
  420. * Update organisms
  421. *
  422. * @ingroup tripal_organism
  423. */
  424. function chado_organism_update($node) {
  425. // remove any white space around values
  426. $node->genus = trim($node->genus);
  427. $node->species = trim($node->species);
  428. $node->abbreviation = trim($node->abbreviation);
  429. $node->common_name = trim($node->common_name);
  430. $node->description = trim($node->description);
  431. if ($node->revision) {
  432. // there is no way to handle revisions in Chado but leave
  433. // this here just to make not we've addressed it.
  434. }
  435. $match = array(
  436. 'organism_id' => chado_get_id_for_node('organism', $node->nid),
  437. );
  438. $values = array(
  439. 'genus' => $node->genus,
  440. 'species' => $node->species,
  441. 'abbreviation' => $node->abbreviation,
  442. 'common_name' => $node->common_name,
  443. 'comment' => $node->description
  444. );
  445. $org_status = tripal_core_chado_update('organism', $match, $values);
  446. // add the image
  447. chado_organism_add_image($node);
  448. }
  449. /**
  450. * Delete organism from both drupal and chado databases. Check dependency before
  451. * deleting from chado.
  452. *
  453. * @ingroup tripal_organism
  454. */
  455. function chado_organism_delete($node) {
  456. $organism_id = chado_get_id_for_node('organism', $node->nid);
  457. // if we don't have an organism id for this node then this isn't a node of
  458. // type chado_organism or the entry in the chado_organism table was lost.
  459. if (!$organism_id) {
  460. return;
  461. }
  462. // Remove data from the {chado_organism}, {node}, and {node_revisions} tables
  463. $sql_del = "DELETE FROM {chado_organism} WHERE nid = :nid AND vid = :vid";
  464. db_query($sql_del, array(':nid' => $node->nid, ':vid' => $node->vid));
  465. $sql_del = "DELETE FROM {node} WHERE nid = :nid AND vid = :vid";
  466. db_query($sql_del, array(':nid' => $node->nid, ':vid' => $node->vid));
  467. $sql_del = "DELETE FROM {node_revision} WHERE nid = ':nid' AND vid = ':vid'";
  468. db_query($sql_del, array(':nid' => $node->nid, ':vid' => $node->vid));
  469. // Test dependency before deleting from chado database. If a library or
  470. // feature depends on this organism, don't delete it
  471. $sql = "SELECT feature_id FROM {feature} WHERE organism_id = :organism_id";
  472. $check_feature = chado_query($sql, array(':organism_id' => $organism_id))->fetchObject();
  473. $sql = "SELECT library_id FROM {library} WHERE organism_id = :organism_id";
  474. $check_lib = chado_query($sql, array(':organism_id' => $organism_id))->fetchObject();
  475. if (!$check_lib && !$check_feature) {
  476. tripal_core_chado_delete('organism', array('organism_id' => $organism_id));
  477. }
  478. else {
  479. drupal_set_message(t("Organism deleted from drupal. Warning: at least one " .
  480. "library or feature depends on this organism. It was not removed from chado."));
  481. }
  482. }
  483. /**
  484. *
  485. *
  486. * @ingroup tripal_organism
  487. */
  488. function chado_organism_add_image($node) {
  489. // check to see if a file was uploaded. If so then copy it to the images
  490. // directory for display with the organism
  491. if (isset($_FILES['files']) &&
  492. $_FILES['files']['name']['organism_image'] &&
  493. is_uploaded_file($_FILES['files']['tmp_name']['organism_image'])) {
  494. // make sure the destination directory exists
  495. $dest = tripal_file_directory_path() . "/tripal_organism/images";
  496. file_prepare_directory($dest, FILE_CREATE_DIRECTORY);
  497. // now move the file
  498. $validators = array('file_validate_is_image' => array());
  499. $destination = "public://tripal/tripal_organism/images/";
  500. $file = file_save_upload('organism_image', $validators, $destination);
  501. if (!$file) {
  502. drupal_set_message(t("Organism image was not uploaded."));
  503. }
  504. else {
  505. file_move($file, $destination . "/" . $node->nid . ".jpg", FILE_EXISTS_REPLACE);
  506. }
  507. }
  508. }
  509. /**
  510. * When editing or creating a new node of type 'chado_organism' we need
  511. * a form. This function creates the form that will be used for this.
  512. *
  513. * @ingroup tripal_organism
  514. */
  515. function chado_organism_form($node, $form_state) {
  516. $form = array();
  517. // we have a file upload element on the form soe we need the multipart encoding type
  518. $form['#attributes']['enctype'] = 'multipart/form-data';
  519. // if the organism is part of the node object then we are editing. If not we are inserting
  520. if (property_exists($node, 'organism')) {
  521. $organism = $node->organism;
  522. // add in the comment since it is a text field and may not be included if too big
  523. $organism = tripal_core_expand_chado_vars($organism, 'field', 'organism.comment');
  524. // get form defaults
  525. $abbreviation = property_exists($node, 'abbreviation') ? property_exists($node, 'abbreviation') : $organism->abbreviation;
  526. $genus = property_exists($node, 'genus') ? property_exists($node, 'genus') : $organism->genus;
  527. $species = property_exists($node, 'species') ? property_exists($node, 'species') : $organism->species;
  528. $common_name = property_exists($node, 'common_name') ? property_exists($node, 'common_name') : $organism->common_name;
  529. $description = property_exists($node, 'description') ? property_exists($node, 'description') : $organism->comment;
  530. $organism_image = property_exists($node, 'organism_image') ? property_exists($node, 'organism_image') : '';
  531. // set the organism_id in the form
  532. $form['organism_id'] = array(
  533. '#type' => 'value',
  534. '#value' => $organism->organism_id,
  535. );
  536. }
  537. else {
  538. // get form defaults
  539. $abbreviation = property_exists($node, 'abbreviation') ? property_exists($node, 'abbreviation') : '';
  540. $genus = property_exists($node, 'genus') ? property_exists($node, 'genus') : '';
  541. $species = property_exists($node, 'species') ? property_exists($node, 'species') : '';
  542. $common_name = property_exists($node, 'common_name') ? property_exists($node, 'common_name') : '';
  543. $description = property_exists($node, 'description') ? property_exists($node, 'description') : '';
  544. $organism_image = property_exists($node, 'organism_image') ? property_exists($node, 'organism_image') : '';
  545. }
  546. $form['abbreviation']= array(
  547. '#type' => 'textfield',
  548. '#title' => t('Abbreviation'),
  549. '#required' => TRUE,
  550. '#default_value' => $abbreviation,
  551. );
  552. $form['genus']= array(
  553. '#type' => 'textfield',
  554. '#title' => t('Genus'),
  555. '#required' => TRUE,
  556. '#default_value' => $genus,
  557. );
  558. $form['species']= array(
  559. '#type' => 'textfield',
  560. '#title' => t('Species'),
  561. '#required' => TRUE,
  562. '#default_value' => $species,
  563. );
  564. $form['common_name']= array(
  565. '#type' => 'textfield',
  566. '#title' => t('Common Name'),
  567. '#required' => TRUE,
  568. '#default_value' => $common_name,
  569. );
  570. $form['description']= array(
  571. '#type' => 'textarea',
  572. '#rows' => 15,
  573. '#title' => t('Description'),
  574. '#default_value' => $description,
  575. );
  576. $form['organism_image']= array(
  577. '#type' => 'file',
  578. '#title' => t('Organism Image'),
  579. '#description' => 'Add an image for this organism',
  580. '#progress_indicator' => 'bar',
  581. );
  582. return $form;
  583. }
  584. /**
  585. * When a node is requested by the user this function is called to allow us
  586. * to add auxiliary data to the node object.
  587. *
  588. * @ingroup tripal_organism
  589. */
  590. function chado_organism_load($nodes) {
  591. foreach ($nodes as $nid => $node) {
  592. // find the organism and add in the details
  593. $organism_id = chado_get_id_for_node('organism', $nid);
  594. // build the organism variable
  595. $values = array('organism_id' => $organism_id);
  596. $organism = tripal_core_generate_chado_var('organism', $values);
  597. // add in the description field
  598. $organism = tripal_core_expand_chado_vars($organism, 'field', 'organism.comment');
  599. $nodes[$nid]->organism = $organism;
  600. }
  601. }