Revision b8f451b5
Added by Alex Theys over 11 years ago
| 5.x/modules/cdm_dataportal/cdm_api/uuids.php | ||
|---|---|---|
| 101 | 101 |
define('UUID_CHROMOSOMES', 'c4a60319-4978-4692-9545-58d60cf8379e');
|
| 102 | 102 |
define('UUID_CHROMOSOMES_NUMBERS', '6f677e98-d8d5-4bc5-80bf-affdb7e3945a');
|
| 103 | 103 |
define('UUID_IMAGE_SOURCES', 'c0cc5ebe-1f0c-4c31-af53-d486858ea415');
|
| 104 |
//define('UUID_USE_RECORD', '8125a59d-b4d5-4485-89ea-67306297b599');
|
|
| 105 |
define('UUID_USE_RECORD', 'ba773d5b-ab01-47fb-94cf-d241fcdd02ff');
|
|
| 104 |
define('UUID_USE_RECORD', '8125a59d-b4d5-4485-89ea-67306297b599');
|
|
| 106 | 105 |
|
| 107 |
define('UUID_TEST', '064a64a3-92dd-4386-85a4-3c28a59d9730');
|
|
| 108 | 106 |
|
| 109 | 107 |
// typedesignation status |
| 110 | 108 |
define('UUID_HOLOTYPE', 'a407dbc7-e60c-46ff-be11-eddf4c5a970d');
|
| ... | ... | |
| 132 | 130 |
define('UUID_RIGHTS_COPYRIGHT', 'd1ef838e-b195-4f28-b8eb-0d3be080bd37');
|
| 133 | 131 |
define('UUID_RIGHTS_ACCESS_RIGHTS', 'a50b4def-b3ac-4508-b50a-e0f249e3a1d7');
|
| 134 | 132 |
|
| 133 |
// MarkerType Terms |
|
| 134 |
Define('UUID_MARKERTYPE_USE', '2e6e42d9-e92a-41f4-899b-03c0ac64f039');
|
|
| 135 |
|
|
| 135 | 136 |
//nomenclatural status type |
| 136 | 137 |
define('UUID_NOMENCLATURALSTATUS_TYPE_uuidAmbiguous', '90f5012b-705b-4488-b4c6-002d2bc5198e');
|
| 137 | 138 |
define('UUID_NOMENCLATURALSTATUS_TYPE_DOUBTFUL', '0ffeb39e-872e-4c0f-85ba-a4150d9f9e7d');
|
| 5.x/modules/cdm_dataportal/cdm_api/webservice_uris.php | ||
|---|---|---|
| 16 | 16 |
|
| 17 | 17 |
define('CDM_WS_PORTAL_TAXON_DESCRIPTIONS', 'portal/taxon/$0/descriptions');
|
| 18 | 18 |
define('CDM_WS_PORTAL_TAXON_USEDESCRIPTIONS', 'portal/taxon/$0/useDescriptions');
|
| 19 |
define('CDM_WS_PORTAL_TAXON_FINDBESTMATCHINGTAXON', 'bestMatchingTaxon/$0');
|
|
| 20 |
|
|
| 19 | 21 |
|
| 20 | 22 |
/** |
| 21 | 23 |
* $0 : taxon uud |
| ... | ... | |
| 43 | 45 |
|
| 44 | 46 |
define('CDM_WS_NAME_NAMECAHE', 'name/$0/nameCache');
|
| 45 | 47 |
|
| 48 |
define('CDM_WS_PORTAL_NAME_NAMESBYNAME', 'namesByName/$0');
|
|
| 49 |
|
|
| 46 | 50 |
define('CDM_WS_PORTAL_TAXON_SYNONYMY', 'portal/taxon/$0/synonymy');
|
| 47 | 51 |
|
| 48 | 52 |
define('CDM_WS_PORTAL_TAXON_RELATIONS', 'portal/taxon/$0/taxonRelationships');
|
| 5.x/modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme | ||
|---|---|---|
| 1225 | 1225 |
if ($descriptions == null) {
|
| 1226 | 1226 |
return; |
| 1227 | 1227 |
} |
| 1228 |
|
|
| 1228 | 1229 |
foreach($descriptions as $description) {
|
| 1229 |
$out .= '<li class="descriptionText DescriptionElement">' . $description->titleCache; |
|
| 1230 |
//$out .= print_r($description); |
|
| 1231 |
//$taxonName = cdm_ws_get(CDM_WS_NAME_NAMECAHE, $description->taxon->uuid); |
|
| 1232 |
//$out .= print_r($taxonName); |
|
| 1233 |
//$taxonnameName = cdm_ws_get(CDM_WS_PORTAL_NAME_NAMESBYNAME, $taxonName . "."); |
|
| 1234 |
$synonyms = cdm_ws_get(CDM_WS_PORTAL_TAXON_SYNONYMY,$description->taxon->uuid); |
|
| 1235 |
$out .= print_r($synonyms); |
|
| 1236 |
//$out .= print_r($taxonnameName); |
|
| 1237 |
$out .= '<li class="descriptionText DescriptionElement">'; |
|
| 1238 |
foreach ($description->sources as $source) {
|
|
| 1239 |
if($source->originalNameString) {
|
|
| 1240 |
$originalTaxonUsedInSource = cdm_ws_get(CDM_WS_PORTAL_NAME_NAMESBYNAME, $source->originalNameString . "."); |
|
| 1241 |
$out .=print_r($originalTaxonUsedInSource); |
|
| 1242 |
$name_used_in_source_link_to_show_use = l($source->originalNameString, path_to_name($originalTaxonUsedInSource->uuid),array(), NULL, NULL, FALSE ,TRUE); |
|
| 1243 |
|
|
| 1244 |
//$out .= $source->originalNameString . ': '; |
|
| 1245 |
$out .= $name_used_in_source_link_to_show_use . ': '; |
|
| 1246 |
} |
|
| 1247 |
} |
|
| 1248 |
$out .= $description->titleCache; |
|
| 1230 | 1249 |
foreach ($description->sources as $source) {
|
| 1250 |
if($source->originalNameString) {
|
|
| 1251 |
//$out = $source->originalNameString . ':' . $out; |
|
| 1252 |
} |
|
| 1231 | 1253 |
$out .= " (" . theme('cdm_DescriptionElementSource', $source, true) . ")";
|
| 1232 | 1254 |
} |
| 1233 | 1255 |
$out .= '<ul>'; |
| ... | ... | |
| 1253 | 1275 |
} |
| 1254 | 1276 |
$out = ''; |
| 1255 | 1277 |
$markerTypes = array(); |
| 1256 |
$markerTypes['markerTypes'] = '2e6e42d9-e92a-41f4-899b-03c0ac64f039';
|
|
| 1278 |
$markerTypes['markerTypes'] = UUID_MARKERTYPE_USE;
|
|
| 1257 | 1279 |
$useDescriptions = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS, $taxonUuid, queryString($markerTypes)); |
| 1258 |
if(!empty($useDescriptions)) {
|
|
| 1280 |
if(!empty($useDescriptions)) {
|
|
| 1281 |
//$out .= print_r($useDescriptions); |
|
| 1282 |
//$out .= print_r($useDescriptions); |
|
| 1259 | 1283 |
$out .= '<div id="block-cdm_dataportal-feature-description" class="clear-block block block-cdm_dataportal-feature"><a name="userecords"> </a><H2> Uses </H2>'; |
| 1260 | 1284 |
$formatUseDescriptions = theme('cdm_format_Uses', $useDescriptions, $pageSize, $pageNumber);
|
| 1261 | 1285 |
$out .= $formatUseDescriptions; |
Also available in: Unified diff
AT: committing latest changes to the dataportal to work from home and fix some outstanding issues