Revision d071bed7
Added by Andreas Kohlbecker almost 11 years ago
| 7.x/modules/cdm_dataportal/cdm_api/cdm_api.module | ||
|---|---|---|
| 344 | 344 |
$dwa += $dw; |
| 345 | 345 |
} |
| 346 | 346 |
$dwa = (count($representation->parts) > 0) ? $dwa / count($representation->parts) : 0; |
| 347 |
// @WA: $mimeTypeKey is not defined. |
|
| 348 |
// $prefRepr[$dwa.'_'.$mimeTypeKey] = $representation; |
|
| 349 | 347 |
$prefRepr[$dwa . '_'] = $representation; |
| 350 | 348 |
} |
| 351 | 349 |
} |
| ... | ... | |
| 1354 | 1352 |
* The deserialized webservice response object. |
| 1355 | 1353 |
*/ |
| 1356 | 1354 |
function cdm_ws_get($uri, $pathParameters = array(), $query = NULL, $method = "GET", $absoluteURI = FALSE) {
|
| 1357 |
// static $cacheL1; if(!isset($cacheL1)){ $cacheL1 = array(); }
|
|
| 1355 |
|
|
| 1358 | 1356 |
static $cacheL1 = array(); |
| 1359 | 1357 |
|
| 1360 | 1358 |
// Transform the given uri path or pattern into a proper webservice uri. |
| 7.x/modules/cdm_dataportal/cdm_dataportal.module | ||
|---|---|---|
| 1628 | 1628 |
*/ |
| 1629 | 1629 |
function uri_to_synonym($synonymUuid, $acceptedUuid) {
|
| 1630 | 1630 |
$acceptedPath = path_to_taxon($acceptedUuid, "synonymy"); |
| 1631 |
return url($acceptedPath, array('query' => array('highlite' => $synonymUuid)));
|
|
| 1631 |
return url($acceptedPath, array( |
|
| 1632 |
'query' => array( |
|
| 1633 |
// highlite the synony in the synonymy |
|
| 1634 |
'highlite' => $synonymUuid, |
|
| 1635 |
// the taxon page is refered from a synonym and the synonym can optionally be named in the page title |
|
| 1636 |
// see theme_taxon_page_title() |
|
| 1637 |
'acceptedFor' => $synonymUuid |
|
| 1638 |
) |
|
| 1639 |
)); |
|
| 1640 |
|
|
| 1632 | 1641 |
} |
| 1633 | 1642 |
|
| 1634 | 1643 |
/** |
| 7.x/modules/cdm_dataportal/settings.php | ||
|---|---|---|
| 1435 | 1435 |
$form_title = 'Standard viewer'; |
| 1436 | 1436 |
$form_description = '<p>Configure the standard image viewer.</p><p><strong>Note:</strong> the image viewer should selected otherwise settings are not taking into account.</p>'; |
| 1437 | 1437 |
// $form[] = cdm_dataportal_create_gallery_settings_form($form_name, $form_title, $collapsed); |
| 1438 |
// Comment @WA: $collapsed is not defined. |
|
| 1439 |
// $form['media_settings'][] = cdm_dataportal_create_gallery_settings_form($form_name, $form_title, $collapsed, $form_description); |
|
| 1440 | 1438 |
$form['media_settings'][] = cdm_dataportal_create_gallery_settings_form($form_name, $form_title, FALSE, $form_description); |
| 1441 | 1439 |
|
| 1442 | 1440 |
// @WA: D7 form api does not support reset buttons, |
Also available in: Unified diff
removing out commented code and adding missing query parameter to synonym links