Author: ssenrogn
Date: 2008-01-22 15:44:52 +0100 (Tue, 22 Jan 2008)
New Revision: 6006
Modified:
trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
Log:
Removed the first comment in a document to prevent quirks mode in IE 6.0.
Modified:
trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-01-22 13:20:14 UTC (rev 6005)
+++ trunk/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-01-22 14:44:52 UTC (rev 6006)
@@ -21,16 +21,18 @@
package no.sesat.search.view.taglib;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+
import no.sesat.search.datamodel.DataModel;
import no.sesat.search.datamodel.generic.StringDataObject;
import no.sesat.search.run.RunningQueryImpl;
import no.sesat.search.view.config.SearchTab;
import no.sesat.search.view.config.SearchTab.Layout;
+
import org.apache.log4j.Logger;
@@ -43,67 +45,61 @@
public final class SearchTabMainTag extends AbstractVelocityTemplateTag {
-
+
// Constants -----------------------------------------------------
-
+
private static final Logger LOG = Logger.getLogger(SearchTabMainTag.class);
private static final String MISSING = "Missing_SearchTabMain_Template";
-
+
private static final String PAGES_DIRECTORY = "/pages/";
-
-
-
+
+
+
// Attributes ----------------------------------------------------
-
+
// Static --------------------------------------------------------
-
+
// Constructors --------------------------------------------------
-
+
// Public -------------------------------------------
-
+
/** Called by the container to invoke this tag.
* The implementation of this method is provided by the tag library
developer,
* and handles all tag processing, body iteration, etc.
- *
+ *
* Calling this tag also has the side effect of setting the layout in use
into the context's attributes.
- *
- * @throws javax.servlet.jsp.JspException
+ *
+ * @throws javax.servlet.jsp.JspException
*/
@Override
public void doTag() throws JspException {
-
+
final PageContext cxt = (PageContext) getJspContext();
final DataModel datamodel = (DataModel)
cxt.findAttribute(DataModel.KEY);
final SearchTab tab = datamodel.getPage().getCurrentTab();
final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
- final Layout layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO
- ? tab.getLayouts().get(layoutDO.getXmlEscaped())
+ final Layout layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO
+ ? tab.getLayouts().get(layoutDO.getXmlEscaped())
: tab.getDefaultLayout();
cxt.setAttribute("layout", layout);
final String front = null != layout.getFront() && 0 <
layout.getFront().length()
? layout.getFront()
: null;
-
+
final String include = datamodel.getQuery().getQuery().isBlank() &&
null != front
? front
: layout.getMain();
-
+
if(null != include){
-
- try{
- cxt.getOut().println("<!-- " + include + " -->");
- }catch(IOException ioe){
- LOG.warn("Failed to write include comment", ioe);
- }
final Map<String,Object> map = new HashMap<String,Object>();
map.put("layout", layout);
-
+
importTemplate(include.startsWith("/") ? include : PAGES_DIRECTORY
+ include, map);
-
+
}else{
// use the default httpDecorator.jsp
cxt.setAttribute(MISSING, Boolean.TRUE);
@@ -116,6 +112,6 @@
// Protected -----------------------------------------------------
// Private -------------------------------------------------------
-
+
// Inner classes -------------------------------------------------
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
