Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2379
Modified Files:
documentDispatcher.php overview.php
Log Message:
Cleaning
Index: documentDispatcher.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/documentDispatcher.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** documentDispatcher.php 5 Oct 2005 01:38:18 -0000 1.3
--- documentDispatcher.php 5 Oct 2005 22:42:47 -0000 1.4
***************
*** 133,138 ****
*
* @return array with metadata about document:
! * [dcdate] = datestamp
! * [dcformat] = mime-type
* [encoding] = charcter encoding
* [archiveidentifier] = uri to document in the archive
--- 133,138 ----
*
* @return array with metadata about document:
! * [date] = datestamp
! * [mime] = mime-type
* [encoding] = charcter encoding
* [archiveidentifier] = uri to document in the archive
***************
*** 155,161 ****
$result = $locator->getResultSet();
$document = $result[1];
! $document['dcformat'] = index_decode($document['dcformat']);
! if($document['dcformat'] == '' && $mime_hint != '') {
! $document['dcformat'] = $mime_hint;
}
return $document;
--- 155,164 ----
$result = $locator->getResultSet();
$document = $result[1];
!
! #print_r($result);
! #die("");
! $document['mime'] = $document['mime'];
! if($document['mime'] == '' && $mime_hint != '') {
! $document['mime'] = $mime_hint;
}
return $document;
***************
*** 173,177 ****
function type_resolver($document) {
global $conf_document_handler;
! $format = $document['dcformat'];
if($conf_document_handler[$format]) {
return $conf_document_handler[$format];
--- 176,180 ----
function type_resolver($document) {
global $conf_document_handler;
! $format = $document['mime'];
if($conf_document_handler[$format]) {
return $conf_document_handler[$format];
***************
*** 196,201 ****
function parse_document($handler_url, $document, $handler_has_links, $js) {
global $conf_document_retriever, $conf_result_page, $mode;
! $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['date'].'&mime='.$document['dcformat'].'&url='.$document['url'];
! Header("content-type: " . $document['dcformat'], false);
if($handler_has_links && $mode != "external") {
rewrite_document($handler_url, $conf_result_page, $js);
--- 199,209 ----
function parse_document($handler_url, $document, $handler_has_links, $js) {
global $conf_document_retriever, $conf_result_page, $mode;
! $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['date'].'&mime='.$document['mime'].'&url='.$document['url'];
! if ($document['encoding']) {
! Header("content-type: " . $document['mime'] . ", " . $document['encoding'], false);
! }
! else {
! Header("content-type: " . $document['mime'], false);
! }
if($handler_has_links && $mode != "external") {
rewrite_document($handler_url, $conf_result_page, $js);
Index: overview.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overview.php 5 Oct 2005 01:38:18 -0000 1.3
--- overview.php 5 Oct 2005 22:42:47 -0000 1.4
***************
*** 112,116 ****
if ($numhits == 0) {
! print "Sorry, the url were not found in the index (" . $url . ")";
}
else {
--- 112,116 ----
if ($numhits == 0) {
! print "Sorry, the url was not found in the index (" . $url . ")";
}
else {
|
