tripal_chado.schema.api.inc 20 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659
  1. <?php
  2. /**
  3. * @defgroup tripal_chado_schema_api Chado Schema API
  4. * @ingroup tripal_chado_api
  5. * @{
  6. * Provides an application programming interface (API) for describing Chado tables.
  7. * This API consists of a set of functions, one for each table in Chado. Each
  8. * function simply returns a Drupal style array that defines the table.
  9. *
  10. * Because Drupal 6 does not handle foreign key (FK) relationships, however FK
  11. * relationships are needed to for Tripal Views. Therefore, FK relationships
  12. * have been added to the schema defintitions below.
  13. *
  14. * The functions provided in this documentation should not be called as is, but if you need
  15. * the Drupal-style array definition for any table, use the following function
  16. * call:
  17. *
  18. * $table_desc = chado_get_schema($table)
  19. *
  20. * where the variable $table contains the name of the table you want to
  21. * retireve. The chado_get_schema function determines the appropriate version of
  22. * Chado and uses the Drupal hook infrastructure to call the appropriate
  23. * hook function to retrieve the table schema.
  24. * @}
  25. */
  26. /**
  27. * Check that any given Chado table exists.
  28. *
  29. * This function is necessary because Drupal's db_table_exists() function will
  30. * not look in any other schema but the one were Drupal is installed
  31. *
  32. * @return
  33. * TRUE/FALSE depending upon whether it exists
  34. *
  35. * @ingroup tripal_chado_schema_api
  36. */
  37. function chado_table_exists($table) {
  38. global $databases;
  39. $default_db = $databases['default']['default']['database'];
  40. $cached_obj = cache_get('chado_tables', 'cache');
  41. $cached_tables = $cached_obj->data;
  42. if (is_array($cached_tables) and array_key_exists($table, $cached_tables)) {
  43. return $cached_tables[$table]['exists'];
  44. }
  45. $sql = "
  46. SELECT 1
  47. FROM information_schema.tables
  48. WHERE
  49. table_name = :table_name AND
  50. table_schema = :chado AND
  51. table_catalog = :default_db
  52. ";
  53. $args = array(
  54. ':table_name' => $table,
  55. ':chado' => tripal_get_schema_name('chado'),
  56. ':default_db' => $default_db
  57. );
  58. $results = db_query($sql, $args);
  59. $exists = $results->fetchObject();
  60. if (!$exists) {
  61. $cached_tables[$table]['exists'] = FALSE;
  62. cache_set('chado_tables', $cached_tables, 'cache', CACHE_TEMPORARY);
  63. return FALSE;
  64. }
  65. $cached_tables[$table]['exists'] = TRUE;
  66. cache_set('chado_tables', $cached_tables, 'cache', CACHE_TEMPORARY);
  67. return TRUE;
  68. }
  69. /**
  70. * Check that any given column in a Chado table exists.
  71. *
  72. * This function is necessary because Drupal's db_field_exists() will not
  73. * look in any other schema but the one were Drupal is installed
  74. *
  75. * @param $table
  76. * The name of the chado table.
  77. * @param $column
  78. * The name of the column in the chado table.
  79. * @return
  80. * TRUE if the column exists for the table in the chado schema and
  81. * FALSE if it does not.
  82. *
  83. * @ingroup tripal_chado_schema_api
  84. */
  85. function chado_column_exists($table, $column) {
  86. global $databases;
  87. $default_db = $databases['default']['default']['database'];
  88. $cached_obj = cache_get('chado_table_columns', 'cache');
  89. $cached_cols = $cached_obj->data;
  90. if (is_array($cached_cols) and
  91. array_key_exists($table, $cached_cols) and
  92. array_key_Exists($column, $cached_cols[$table])) {
  93. return $cached_cols[$table][$column]['exists'];
  94. }
  95. $sql = "
  96. SELECT 1
  97. FROM information_schema.columns
  98. WHERE
  99. table_name = :table_name AND
  100. column_name = :column_name AND
  101. table_schema = :chado AND
  102. table_catalog = :default_db
  103. ";
  104. $args = array(
  105. ':table_name' => $table,
  106. ':column_name' => $column,
  107. ':chado' => tripal_get_schema_name('chado'),
  108. ':default_db' => $default_db
  109. );
  110. $results = db_query($sql, $args);
  111. $exists = $results->fetchField();
  112. if (!$exists) {
  113. $cached_cols[$table][$column]['exists'] = FALSE;
  114. cache_set('chado_table_columns', $cached_cols, 'cache', CACHE_TEMPORARY);
  115. return FALSE;
  116. }
  117. $cached_cols[$table][$column]['exists'] = TRUE;
  118. cache_set('chado_table_columns', $cached_cols, 'cache', CACHE_TEMPORARY);
  119. return TRUE;
  120. }
  121. /**
  122. * Check that any given column in a Chado table exists.
  123. *
  124. * This function is necessary because Drupal's db_field_exists() will not
  125. * look in any other schema but the one were Drupal is installed
  126. *
  127. * @param sequence
  128. * The name of the sequence
  129. * @return
  130. * TRUE if the seqeuence exists in the chado schema and FALSE if it does not.
  131. *
  132. * @ingroup tripal_chado_schema_api
  133. */
  134. function chado_sequence_exists($sequence) {
  135. global $databases;
  136. $default_db = $databases['default']['default']['database'];
  137. $cached_obj = cache_get('chado_sequences', 'cache');
  138. $cached_seqs = $cached_obj->data;
  139. if (is_array($cached_seqs) and array_key_exists($sequence, $cached_seqs)) {
  140. return $cached_seqs[$sequence]['exists'];
  141. }
  142. $sql = "
  143. SELECT 1
  144. FROM information_schema.sequences
  145. WHERE
  146. sequence_name = :sequence_name AND
  147. sequence_schema = :sequence_schema AND
  148. sequence_catalog = :sequence_catalog
  149. ";
  150. $args = array(
  151. ':sequence_name' => $sequence,
  152. ':sequence_schema' => tripal_get_schema_name('chado'),
  153. ':sequence_catalog' => $default_db
  154. );
  155. $results = db_query($sql, $args);
  156. $exists = $results->fetchField();
  157. if (!$exists) {
  158. $cached_seqs[$sequence]['exists'] = FALSE;
  159. cache_set('chado_sequences', $cached_seqs, 'cache', CACHE_TEMPORARY);
  160. return FALSE;
  161. }
  162. $cached_seqs[$sequence]['exists'] = FALSE;
  163. cache_set('chado_sequences', $cached_seqs, 'cache', CACHE_TEMPORARY);
  164. return TRUE;
  165. }
  166. /**
  167. * A Chado-aware replacement for the db_index_exists() function.
  168. *
  169. * @param $table
  170. * The table to be altered.
  171. * @param $name
  172. * The name of the index.
  173. */
  174. function chado_index_exists($table, $name) {
  175. global $databases;
  176. $indexname = $table . '_' . $name . '_idx';
  177. $default_db = $databases['default']['default']['database'];
  178. $sql = "
  179. SELECT 1 as exists
  180. FROM pg_indexes
  181. WHERE indexname = :indexname
  182. ";
  183. $result = db_query($sql, array(':indexname' => $indexname));
  184. $exists = $result->fetchObject();
  185. return $exists->exists;
  186. }
  187. /**
  188. * A Chado-aware wrapper for the db_add_index() function.
  189. *
  190. * @param $table
  191. * The table to be altered.
  192. * @param $name
  193. * The name of the index.
  194. * @param $fields
  195. * An array of field names.
  196. */
  197. function chado_add_index($table, $name, $fields) {
  198. $indexname = $table . '_' . $name . '_idx';
  199. $query = 'CREATE INDEX "' . $indexname . '" ON {' . $table . '} ';
  200. $query .= '(';
  201. $temp = array();
  202. foreach ($fields as $field) {
  203. if (is_array($field)) {
  204. $temp[] = 'substr(' . $field[0] . ', 1, ' . $field[1] . ')';
  205. }
  206. else {
  207. $temp[] = '"' . $field . '"';
  208. }
  209. }
  210. $query .= implode(', ', $temp);
  211. $query .= ')';
  212. return chado_query($query);
  213. }
  214. /**
  215. * Check that any given schema exists.
  216. *
  217. * @param $schema
  218. * The name of the schema to check the existence of
  219. *
  220. * @return
  221. * TRUE/FALSE depending upon whether or not the schema exists
  222. *
  223. * @ingroup tripal_chado_schema_api
  224. */
  225. function chado_dbschema_exists($schema) {
  226. $sql = "
  227. SELECT nspname
  228. FROM pg_namespace
  229. WHERE
  230. has_schema_privilege(nspname, 'USAGE') AND
  231. nspname = :nspname
  232. ORDER BY nspname
  233. ";
  234. $schema = db_query($sql, array(':nspname' => $schema))->fetchField();
  235. if ($schema) {
  236. return TRUE;
  237. }
  238. return FALSE;
  239. }
  240. /**
  241. * Check that the Chado schema exists within the local database
  242. *
  243. * @return
  244. * TRUE/FALSE depending upon whether it exists
  245. *
  246. * @ingroup tripal_chado_schema_api
  247. */
  248. function chado_is_local() {
  249. // This is postgresql-specific code to check the existence of the chado schema
  250. // @coder-ignore: acting on pg_catalog schema rather then drupal schema therefore, table prefixing does not apply
  251. $sql = "
  252. SELECT nspname
  253. FROM pg_namespace
  254. WHERE
  255. has_schema_privilege(nspname, 'USAGE') AND
  256. nspname = 'chado'
  257. ";
  258. $results = db_query($sql);
  259. $name = $results->fetchObject();
  260. if ($name) {
  261. variable_set('chado_schema_exists', FALSE);
  262. return TRUE;
  263. }
  264. else {
  265. variable_set('chado_schema_exists', TRUE);
  266. return FALSE;
  267. }
  268. }
  269. /**
  270. * Check whether chado is installed (either in the same or a different database)
  271. *
  272. * @return
  273. * TRUE/FALSE depending upon whether chado is installed.
  274. *
  275. * @ingroup tripal_chado_schema_api
  276. */
  277. function chado_is_installed() {
  278. global $databases;
  279. // first check if chado is in the $databases variable of the settings.php file
  280. if (array_key_exists('chado', $databases)) {
  281. return TRUE;
  282. }
  283. // check to make sure the chado schema exists
  284. return chado_is_local();
  285. }
  286. /**
  287. * Returns the version number of the currently installed Chado instance.
  288. * It can return the real or effective version. Note, this function
  289. * is executed in the hook_init() of the tripal_chado module which then
  290. * sets the $GLOBAL['exact_chado_version'] and $GLOBAL['chado_version']
  291. * variable. You can access these variables rather than calling this function.
  292. *
  293. * @param $exact
  294. * Set this argument to 1 to retrieve the exact version that is installed.
  295. * Otherwise, this function will set the version to the nearest 'tenth'.
  296. * Chado versioning numbers in the hundreds represent changes to the
  297. * software and not the schema. Changes in the tenth's represent changes
  298. * in the schema.
  299. *
  300. * @param $warn_if_unsupported
  301. * If the currently installed version of Chado is not supported by Tripal
  302. * this generates a Drupal warning.
  303. *
  304. * @returns
  305. * The version of Chado
  306. *
  307. * @ingroup tripal_chado_schema_api
  308. */
  309. function chado_get_version($exact = FALSE, $warn_if_unsupported = FALSE) {
  310. global $databases;
  311. $version = '';
  312. $is_local = 0;
  313. // check that Chado is installed if not return 'uninstalled as the version'
  314. $chado_exists = chado_is_local();
  315. if (!$chado_exists) {
  316. // if it's not in the drupal database check to see if it's specified in the $db_url
  317. // in the settings.php
  318. if (!array_key_exists('chado', $databases)) {
  319. // if it's not in the drupal database or specified in the $db_url then
  320. // return uninstalled as the version
  321. return 'not installed';
  322. }
  323. $is_local = 0;
  324. $previous_db = chado_set_active('chado');
  325. $prop_exists = chado_table_exists('chadoprop');
  326. chado_set_active($previous_db);
  327. }
  328. else {
  329. $is_local = 1;
  330. $prop_exists = chado_table_exists('chadoprop');
  331. }
  332. // if the table doesn't exist then we don't know what version but we know
  333. // it must be 1.11 or older.
  334. if (!$prop_exists) {
  335. $version = "1.11 or older";
  336. }
  337. else {
  338. $sql = "
  339. SELECT value
  340. FROM {chadoprop} CP
  341. INNER JOIN {cvterm} CVT on CVT.cvterm_id = CP.type_id
  342. INNER JOIN {cv} CV on CVT.cv_id = CV.cv_id
  343. WHERE CV.name = 'chado_properties' and CVT.name = 'version'
  344. ";
  345. if (!$is_local) {
  346. $previous_db = chado_set_active('chado');
  347. $results = db_query($sql);
  348. chado_set_active($previous_db);
  349. }
  350. else {
  351. $results = chado_query($sql);
  352. }
  353. $v = $results->fetchObject();
  354. // if we don't have a version in the chadoprop table then it must be
  355. // v1.11 or older
  356. if (!$v) {
  357. $version = "1.11 or older";
  358. }
  359. else {
  360. $version = $v->value;
  361. }
  362. }
  363. // next get the exact Chado version that is installed
  364. $exact_version = $version;
  365. // Tripal only supports v1.11 or newer.. really this is the same as v1.1
  366. // but at the time the v1.11 schema API was written we didn't know that so
  367. // we'll return the version 1.11 so the schema API will work.
  368. if (strcmp($exact_version, '1.11 or older') == 0) {
  369. $exact_version = "1.11";
  370. if ($warn_if_unsupported) {
  371. drupal_set_message(t("WARNING: Tripal does not fully support Chado version less than v1.11. If you are certain this is v1.11
  372. or if Chado was installed using an earlier version of Tripal then all is well. If not please upgrade to v1.11 or later"),
  373. 'warning');
  374. }
  375. }
  376. // if not returing an exact version, return the version to the nearest 10th.
  377. // return 1.2 for all versions of 1.2x
  378. $effective_version = $exact_version;
  379. if (preg_match('/^1\.2\d+$/', $effective_version)) {
  380. $effective_version = "1.2";
  381. }
  382. if ($warn_if_unsupported and ($effective_version < 1.11 and $effective_version != 'not installed')) {
  383. drupal_set_message(t("WARNING: The currently installed version of Chado, v$exact_version, is not fully compatible with Tripal."), 'warning');
  384. }
  385. // if the callee has requested the exact version then return it
  386. if ($exact) {
  387. return $exact_version;
  388. }
  389. return $effective_version;
  390. }
  391. /**
  392. * Retrieves the list of tables in the Chado schema. By default it only returns
  393. * the default Chado tables, but can return custom tables added to the
  394. * Chado schema if requested
  395. *
  396. * @param $include_custom
  397. * Optional. Set as TRUE to include any custom tables created in the
  398. * Chado schema. Custom tables are added to Chado using the
  399. * tripal_chado_chado_create_table() function.
  400. *
  401. * @returns
  402. * An associative array where the key and value pairs are the Chado table names.
  403. *
  404. * @ingroup tripal_chado_schema_api
  405. */
  406. function chado_get_table_names($include_custom = NULL) {
  407. // first get the chado version that is installed
  408. $v = $GLOBALS["chado_version"];
  409. $tables = array();
  410. if ($v == '1.3') {
  411. $tables_v1_3 = tripal_chado_chado_get_v1_3_tables();
  412. foreach ($tables_v1_3 as $table) {
  413. $tables[$table] = $table;
  414. }
  415. }
  416. if ($v == '1.2') {
  417. $tables_v1_2 = tripal_chado_chado_get_v1_2_tables();
  418. foreach ($tables_v1_2 as $table) {
  419. $tables[$table] = $table;
  420. }
  421. }
  422. if ($v == '1.11' or $v == '1.11 or older') {
  423. $tables_v1_11 = tripal_chado_chado_get_v1_11_tables();
  424. foreach ($tables_v1_11 as $table) {
  425. $tables[$table] = $table;
  426. }
  427. }
  428. // now add in the custom tables too if requested
  429. if ($include_custom) {
  430. $sql = "SELECT table_name FROM {tripal_custom_tables}";
  431. $resource = db_query($sql);
  432. foreach ($resource as $r) {
  433. $tables[$r->table_name] = $r->table_name;
  434. }
  435. }
  436. asort($tables);
  437. return $tables;
  438. }
  439. /**
  440. * Retrieves the chado tables Schema API array.
  441. *
  442. * @param $table
  443. * The name of the table to retrieve. The function will use the appopriate
  444. * Tripal chado schema API hooks (e.g. v1.11 or v1.2).
  445. *
  446. * @returns
  447. * A Drupal Schema API array defining the table.
  448. *
  449. * @ingroup tripal_chado_schema_api
  450. */
  451. function chado_get_schema($table) {
  452. // first get the chado version that is installed
  453. $v = $GLOBALS["chado_version"];
  454. // get the table array from the proper chado schema
  455. $v = preg_replace("/\./", "_", $v); // reformat version for hook name
  456. // Call the module_invoke_all.
  457. $hook_name = "chado_schema_v" . $v . "_" . $table;
  458. $table_arr = module_invoke_all($hook_name);
  459. // If the module_invoke_all returned nothing then let's make sure there isn't
  460. // An API call we can call directly. The only time this occurs is
  461. // during an upgrade of a major Drupal version and tripal_core is disabled.
  462. if ((!$table_arr or !is_array($table_arr)) and
  463. function_exists('tripal_core_' . $hook_name)) {
  464. $api_hook = "tripal_core_" . $hook_name;
  465. $table_arr = $api_hook();
  466. }
  467. // if the table_arr is empty then maybe this is a custom table
  468. if (!is_array($table_arr) or count($table_arr) == 0) {
  469. $table_arr = chado_get_custom_table_schema($table);
  470. }
  471. return $table_arr;
  472. }
  473. /**
  474. * Retrieves the schema in an array for the specified custom table.
  475. *
  476. * @param $table
  477. * The name of the table to create.
  478. *
  479. * @return
  480. * A Drupal-style Schema API array definition of the table. Returns
  481. * FALSE on failure.
  482. *
  483. * @ingroup tripal_chado_schema_api
  484. */
  485. function chado_get_custom_table_schema($table) {
  486. $sql = "SELECT schema FROM {tripal_custom_tables} WHERE table_name = :table_name";
  487. $results = db_query($sql, array(':table_name' => $table));
  488. $custom = $results->fetchObject();
  489. if (!$custom) {
  490. return FALSE;
  491. }
  492. else {
  493. return unserialize($custom->schema);
  494. }
  495. }
  496. /**
  497. * Returns all chado base tables.
  498. *
  499. * Base tables are those that contain the primary record for a data type. For
  500. * example, feature, organism, stock, are all base tables. Other tables
  501. * include linker tables (which link two or more base tables), property tables,
  502. * and relationship tables. These provide additional information about
  503. * primary data records and are therefore not base tables. This function
  504. * retreives only the list of tables that are considered 'base' tables.
  505. *
  506. * @return
  507. * An array of base table names.
  508. *
  509. * @ingroup tripal_chado_schema_api
  510. */
  511. function chado_get_base_tables() {
  512. // Initialize the base tables with those tables that are missing a type.
  513. // Ideally they should have a type, but that's for a future version of Chado.
  514. $base_tables = array('organism', 'project', 'analysis', 'biomaterial');
  515. // We'll use the cvterm table to guide which tables are base tables. Typically
  516. // base tables (with a few exceptions) all have a type. Iterate through the
  517. // referring tables.
  518. $schema = chado_get_schema('cvterm');
  519. $referring = $schema['referring_tables'];
  520. foreach ($referring as $tablename) {
  521. // Ignore the cvterm tables, relationships, chadoprop tables.
  522. if ($tablename == 'cvterm_dbxref' || $tablename == 'cvterm_relationship' ||
  523. $tablename == 'cvtermpath' || $tablename == 'cvtermprop' || $tablename == 'chadoprop' ||
  524. $tablename == 'cvtermsynonym' || preg_match('/_relationship$/', $tablename) ||
  525. preg_match('/_cvterm$/', $tablename) ||
  526. // Ignore prop tables
  527. preg_match('/prop$/', $tablename) || preg_match('/prop_.+$/', $tablename) ||
  528. // Ignore nd_tables
  529. preg_match('/^nd_/', $tablename)) {
  530. continue;
  531. }
  532. else {
  533. array_push($base_tables, $tablename);
  534. }
  535. }
  536. // Remove any linker tables that have snuck in. Linker tables are those
  537. // whose foreign key constraints link to two or more base table.
  538. $final_list = array();
  539. foreach ($base_tables as $i => $tablename) {
  540. $num_links = 0;
  541. $schema = chado_get_schema($tablename);
  542. $fkeys = $schema['foreign keys'];
  543. foreach ($fkeys as $fkid => $details) {
  544. $fktable = $details['table'];
  545. if (in_array($fktable, $base_tables)) {
  546. $num_links++;
  547. }
  548. }
  549. if ($num_links < 2) {
  550. $final_list[] = $tablename;
  551. }
  552. }
  553. // Sort the tables and return the list.
  554. sort($final_list);
  555. return $final_list;
  556. }
  557. /**
  558. * Get information about which Chado base table a cvterm is mapped to.
  559. *
  560. * Vocbulary terms that represent content types in Tripal must be mapped to
  561. * Chado tables. A cvterm can only be mapped to one base table in Chado.
  562. * This function will return an object that contains the chado table and
  563. * foreign key field to which the cvterm is mapped. The 'chado_table' property
  564. * of the returned object contains the name of the table, and the 'chado_field'
  565. * property contains the name of the foreign key field (e.g. type_id), and the
  566. * 'cvterm' property contains a cvterm object.
  567. *
  568. * @params
  569. * An associative array that contains the following keys:
  570. * - cvterm_id: the cvterm ID value for the term.
  571. * - vocabulary: the short name for the vocabulary (e.g. SO, GO, PATO)
  572. * - accession: the accession for the term.
  573. * - bundle_id: the ID for the bundle to which a term is associated.
  574. * The 'vocabulary' and 'accession' must be used together, the 'cvterm_id' can
  575. * be used on it's own.
  576. * @return
  577. * An object containing the chado_table and chado_field properties or NULL if
  578. * if no mapping was found for the term.
  579. */
  580. function chado_get_cvterm_mapping($params) {
  581. $cvterm_id = array_key_exists('cvterm_id', $params) ? $params['cvterm_id'] : NULL;
  582. $vocabulary = array_key_exists('vocabulary', $params) ? $params['vocabulary'] : NULL;
  583. $accession = array_key_exists('accession', $params) ? $params['accession'] : NULL;
  584. if ($cvterm_id) {
  585. $cvterm = chado_generate_var('cvterm', array('cvterm_id' => $cvterm_id));
  586. }
  587. else if ($vocabulary and $accession) {
  588. $match = array(
  589. 'dbxref_id' => array(
  590. 'db_id' => array(
  591. 'name' => $vocabulary,
  592. ),
  593. 'accession' => $accession,
  594. ),
  595. );
  596. $cvterm = chado_generate_var('cvterm', $match);
  597. }
  598. $result = db_select('chado_cvterm_mapping', 'tcm')
  599. ->fields('tcm')
  600. ->condition('cvterm_id', $cvterm->cvterm_id)
  601. ->execute();
  602. $result = $result->fetchObject();
  603. if ($result) {
  604. $result->cvterm = $cvterm;
  605. }
  606. return $result;
  607. }