Author: ssmiweve
Date: 2008-11-27 12:15:55 +0100 (Thu, 27 Nov 2008)
New Revision: 6994
Modified:
branches/2.18/generic.sesam/war/src/main/conf/views.xml
branches/2.18/generic.sesam/war/src/webapp/WEB-INF/classes/fragments/layout/generic.sesam/solrSuggestions.jsp
Log:
jsp documents set content type implicitly, overridding any value in tab.layout,
set content type to text/plain explicit in solrSuggestions.jsp
Modified: branches/2.18/generic.sesam/war/src/main/conf/views.xml
===================================================================
--- branches/2.18/generic.sesam/war/src/main/conf/views.xml 2008-11-27
10:54:17 UTC (rev 6993)
+++ branches/2.18/generic.sesam/war/src/main/conf/views.xml 2008-11-27
11:15:55 UTC (rev 6994)
@@ -47,7 +47,7 @@
<!-- Common views -->
<tab id="solrSuggestions" key="suggest" mode="solrSuggestions">
- <layout main="/fragments/layout/generic.sesam/solrSuggestions.jsp"
content-type="text/plain" expires-in-seconds="28800" />
+ <layout main="/fragments/layout/generic.sesam/solrSuggestions.jsp"
expires-in-seconds="28800" />
<navigation>
<navigation id="offset">
<result-paging id="offset" command-name="solrSuggestions"
page-size="99" number-of-pages="1" hitcount-source="totalhits"/>
Modified:
branches/2.18/generic.sesam/war/src/webapp/WEB-INF/classes/fragments/layout/generic.sesam/solrSuggestions.jsp
===================================================================
---
branches/2.18/generic.sesam/war/src/webapp/WEB-INF/classes/fragments/layout/generic.sesam/solrSuggestions.jsp
2008-11-27 10:54:17 UTC (rev 6993)
+++
branches/2.18/generic.sesam/war/src/webapp/WEB-INF/classes/fragments/layout/generic.sesam/solrSuggestions.jsp
2008-11-27 11:15:55 UTC (rev 6994)
@@ -24,6 +24,7 @@
* See generic.sesam/war/src/main/javascript/external/mwsuggest.js
* Simple way of manually writing out the json array. Alternative would be
to use json-taglib.
-->
+ <jsp:directive.page contentType="text/plain;charset=UTF-8" />
<c:if test="${!empty
DataModel.navigation.configuration.navigationMap.offset and !empty
DataModel.navigation.configuration.navigationMap.offset.navMap.offset}">
<c:set var="pageSize"
value="${DataModel.navigation.configuration.navigationMap.offset.navMap.offset.pageSize}"/>
</c:if>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits