Revision e96d2451
Added by Andreas Kohlbecker over 12 years ago
modules/cdm_dataportal/cdm_api/cdm_api.module | ||
---|---|---|
472 | 472 |
return; |
473 | 473 |
} |
474 | 474 |
|
475 |
$ws_base_uri = null; |
|
475 |
$ws_base_uri = null;
|
|
476 | 476 |
switch($cdmBase->class){ |
477 | 477 |
case 'TaxonBase': |
478 | 478 |
case 'Taxon': |
... | ... | |
798 | 798 |
|
799 | 799 |
$time_parse = microtime(true) - $time_parse_start; |
800 | 800 |
if(variable_get('cdm_webservice_debug', 1) && user_access('administer')){ |
801 |
$success_msg = $obj || $datastr == "[]" ? 'valid':'invalid'; |
|
801 |
if($obj || $datastr == "[]" ){ |
|
802 |
$success_msg = 'valid'; |
|
803 |
} else { |
|
804 |
$success_msg = 'invalid'; |
|
805 |
} |
|
802 | 806 |
_add_debugMessage($uri, $time_get, $time_parse, strlen($datastr), $success_msg); |
803 | 807 |
} |
804 | 808 |
if($set_cacheL2) { |
modules/cdm_dataportal/js/cache_all_taxa.js | ||
---|---|---|
51 | 51 |
var requestNextDataPage = function(callback){ |
52 | 52 |
var uri = searchTaxaUrl + escape("&pageSize=" + pageSize); |
53 | 53 |
if(dataPager != null){ |
54 |
uri += escape("&page="+ dataPager.nextIndex); |
|
54 |
uri += escape("&pageNumber="+ dataPager.nextIndex);
|
|
55 | 55 |
} |
56 | 56 |
log('page->'+uri); |
57 | 57 |
$.ajax({ |
modules/cdm_dataportal/settings.php | ||
---|---|---|
1250 | 1250 |
'#title' => t('Cache Settings'), |
1251 | 1251 |
'#collapsible' => FALSE, |
1252 | 1252 |
'#collapsed' => FALSE, |
1253 |
'#description' => t('<p>TODO: cache process does not work, check java script.</p><p>When caching is enabled all single taxon sites are stored in an internal drupal cache doing
|
|
1253 |
'#description' => t('<p>When caching is enabled all single taxon sites are stored in an internal drupal cache doing |
|
1254 | 1254 |
the portal response of taxa pages faster. This is possible because the sites are loaded from |
1255 | 1255 |
the cache and are not created from scratch.</p>'), |
1256 | 1256 |
); |
... | ... | |
1280 | 1280 |
|
1281 | 1281 |
$out = ''; |
1282 | 1282 |
|
1283 |
_add_js_progressbar();
|
|
1283 |
_add_js_progressbar(); |
|
1284 | 1284 |
drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cache_all_taxa.js'); |
1285 | 1285 |
|
1286 | 1286 |
$request_params = array(); |
... | ... | |
1289 | 1289 |
$request_params['doTaxa'] = 1; |
1290 | 1290 |
$request_params['doSynonyms'] = 0; |
1291 | 1291 |
$request_params['doTaxaByCommonNames'] = 0; |
1292 |
$search_url = cdm_compose_url(CDM_WS_PORTAL_TAXON_FIND, null, queryString($request_params)); |
|
1292 |
|
|
1293 |
$search_url = cdm_compose_url(CDM_WS_PORTAL_TAXON_FIND . ".json", null, queryString($request_params)); |
|
1293 | 1294 |
$search_url = uri_uriByProxy($search_url); |
1294 | 1295 |
$taxon_page_url = url('cdm_dataportal/taxon/'); |
1295 | 1296 |
|
modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme | ||
---|---|---|
105 | 105 |
if($node->feature->uuid != UUID_IMAGE) { |
106 | 106 |
|
107 | 107 |
$block->delta = generalizeString($featureRepresentation); |
108 |
$block->subject = '<span class="uuid-'.$node->feature->uuid.'">' . theme('cdm_feature_name', $featureRepresentation) . '</span>';
|
|
108 |
$block->subject = '<span class="feature.uuid:'.$node->feature->uuid.'">' . theme('cdm_feature_name', $featureRepresentation) . '</span>';
|
|
109 | 109 |
$block->module = "cdm_dataportal-feature"; |
110 | 110 |
$block->content = ''; |
111 | 111 |
|
Also available in: Unified diff
fixing #2565 (DataPortal CacheBot is broken)