Author: sshafroi
Date: 2008-12-05 15:31:57 +0100 (Fri, 05 Dec 2008)
New Revision: 7042
Modified:
branches/2.18/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml
Log:
Allow use of output parameter since we are having problems with links using it.
The problem we are having is that rules that has hit one rewrite rule, and is
not permanent will not let itself rewrite again by another rule that is
permanent. So the fix in RunningQueryImpl.java and
AbstractVelocityTemplateTag.java should be reverted later when we have figured
out what's the problem.
Modified:
branches/2.18/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
===================================================================
---
branches/2.18/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-12-04 14:08:13 UTC (rev 7041)
+++
branches/2.18/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-12-05 14:31:57 UTC (rev 7042)
@@ -103,6 +103,8 @@
// TODO generic parameter key to be put into ParameterDataObject
public static final String PARAM_LAYOUT = "layout";
+ public static final String PARAM_LAYOUT_OLD = "output"; //FIXME: added
since we had problems using the url-rewrite rules.
+
// TODO generic parameter key to be put into ParameterDataObject
private static final String PARAM_COMMANDS = "commands";
// TODO generic parameter key to be put into ParameterDataObject
Modified:
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
===================================================================
---
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-12-04 14:08:13 UTC (rev 7041)
+++
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-12-05 14:31:57 UTC (rev 7042)
@@ -89,7 +89,15 @@
if(null != datamodel && null != datamodel.getPage()){
final SearchTab tab = datamodel.getPage().getCurrentTab();
final ParametersDataObject params = datamodel.getParameters();
- final StringDataObject layoutDO = null != params ?
params.getValue(RunningQueryImpl.PARAM_LAYOUT) : null;
+
+ StringDataObject layoutDO = null;
+ if (params != null) {
+ layoutDO = params.getValue(RunningQueryImpl.PARAM_LAYOUT);
+ if (layoutDO == null) {
+ layoutDO =
params.getValue(RunningQueryImpl.PARAM_LAYOUT_OLD);
+ }
+ }
+
layout = null != layoutDO && null != tab && null !=
tab.getLayouts()
? tab.getLayouts().get(layoutDO.getXmlEscaped())
: null != tab ? tab.getDefaultLayout() : null;
Modified: branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml
===================================================================
--- branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml 2008-12-04
14:08:13 UTC (rev 7041)
+++ branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml 2008-12-05
14:31:57 UTC (rev 7042)
@@ -53,4 +53,5 @@
<!-- legacy -->
<rule><from>(.*)&output=(.*)</from><to
type="permanent-redirect">$1&layout=$2</to></rule>
+ <rule><from>(.*)\?output=(.*)</from><to
type="permanent-redirect">$1?layout=$2</to></rule>
</urlrewrite>
_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits
