Revision 10811eb5
Added by Andreas Kohlbecker over 12 years ago
modules/cdm_dataportal/cdm_api/cdm_api.module | ||
---|---|---|
408 | 408 |
$post_data = implode(',', $post_data); |
409 | 409 |
|
410 | 410 |
// testing |
411 |
$data = cdm_http_request($uri, "POST", $post_data);
|
|
411 |
$data = drupal_http_request($uri, "POST", $post_data);
|
|
412 | 412 |
print $data; |
413 | 413 |
|
414 | 414 |
}else if(strpos($theme, '/') > 0){ // must be a mimetype |
... | ... | |
421 | 421 |
//TODO reconsider caching logic in this function |
422 | 422 |
if(!$theme){ |
423 | 423 |
// print out JSON, the cache cannot be used since it contains objects |
424 |
$data = cdm_http_request($uri); |
|
425 |
print $data; |
|
424 |
$http_response = drupal_http_request($uri); |
|
425 |
foreach($http_response->headers as $hname=>$hvalue) { |
|
426 |
drupal_set_header($hname . ":" . $hvalue); |
|
427 |
} |
|
428 |
print $http_response->data; |
|
426 | 429 |
exit; |
427 | 430 |
} else { |
428 | 431 |
$obj = cdm_ws_get($uri, null, null, null, TRUE); |
... | ... | |
841 | 844 |
$message .= 'parsed in '.sprintf('%3.3f', $time_parse).' s('.sprintf('%3.3f', $cummulated_time_parse).'s); '; |
842 | 845 |
$message .= 'size:'.sprintf('%3.1f', ($datasize / 1024)).' kb of '.$success_msg.' data: '; |
843 | 846 |
if(_is_cdm_ws_uri($path)){ |
844 |
$message .= '<a href="'.url($path.'.xml', $query).'" target="data" class="'.$success_msg.'">xml</a>,'; |
|
845 |
$message .= '<a href="'.url($path.'.json', $query).'" target="data" class="'.$success_msg.'">json</a>'; |
|
847 |
$message .= '<a href="'.url($path.'.xml', $query).'" target="data" class="'.$success_msg.'">xml</a>-'; |
|
848 |
$message .= '<a href="'.url('cdm_api/proxy/'.urlencode(url($path.'.xml', $query))).'" target="data" class="'.$success_msg.'">proxied</a>,'; |
|
849 |
$message .= '<a href="'.url($path.'.json', $query).'" target="data" class="'.$success_msg.'">json</a>-'; |
|
850 |
$message .= '<a href="'.url('cdm_api/proxy/'.urlencode(url($path.'.json', $query))).'" target="data" class="'.$success_msg.'">proxied</a>'; |
|
846 | 851 |
} else { |
847 | 852 |
$message .= '<a href="'.url($path, $query).'" target="data" class="'.$success_msg.'">open</a>'; |
848 | 853 |
} |
Also available in: Unified diff
cdm_server debugging improved, data also availabe through proxy