Project

General

Profile

« Previous | Next » 

Revision b8f451b5

Added by Alex Theys almost 12 years ago

AT: committing latest changes to the dataportal to work from home and fix some outstanding issues

View differences:

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