Author: michiel
Date: 2010-03-30 18:14:40 +0200 (Tue, 30 Mar 2010)
New Revision: 41684
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/searcher.jspx
Log:
support for pagesize
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-30 15:29:46 UTC (rev 41683)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-30 16:14:40 UTC (rev 41684)
@@ -21,6 +21,9 @@
<jsp:directive.attribute name="element" type="java.lang.String"
description="This is equivalent to the element
attribute of an mm:listnodescontainer, but it defaults to the _last_ element."
/>
+ <jsp:directive.attribute name="pagesize" type="java.lang.Integer"
+ description="" />
+
<jsp:directive.attribute name="config" type="java.lang.String"
description="Configuration file defaults to
('searchrelate')" />
@@ -38,24 +41,30 @@
<mm:import externid="laststep"
vartype="integer"><jsp:expression>q.getSteps().indexOf(q.getNodeStep())</jsp:expression></mm:import>
</mm:listnodescontainer>
- <mm:write session="${pid}" referid="query" />
+ <mm:write session="${pid}_context" value="" />
+ <mm:context scope="session" id="${pid}_context">
+ <mm:import externid="query" from="parent" />
+ <mm:import id="pagesize">${empty pagesize ? 10 : pagesize}</mm:import>
+ </mm:context>
- <table class="mmsr_pathsearch"
+
+ <mm:import id="numberoftd" vartype="integer">${laststep / 2 + 1}</mm:import>
+ <table class="mmsr_pathsearch steps_${numberoftd}"
id="${pid}">
<tr>
- <c:forEach begin="0" end="${laststep + 1}" var="i" step="2">
- <th><mm:nodeinfo nodetype="${query.steps[i].tableName}"
type="plural_guinodemanager" /></th>
+ <c:forEach begin="0" end="${laststep + 1}" var="i" step="2"
varStatus="status">
+ <th class="${status.first ? 'first' : ''} ${status.last ? 'last' :
''}"><mm:nodeinfo nodetype="${query.steps[i].tableName}"
type="plural_guinodemanager" /></th>
</c:forEach>
</tr>
<tr>
- <td>
- <mm:include page="/mmbase/searchrelate/path/searcher.jspx"
referids="pid">
+ <td class="first">
+ <mm:include page="/mmbase/searchrelate/path/searcher.jspx"
referids="pid,pagesize?">
<mm:param name="step">0</mm:param>
</mm:include>
</td>
- <c:forEach begin="3" end="${laststep + 1}" step="2">
- <td />
+ <c:forEach begin="3" end="${laststep + 1}" step="2" varStatus="status">
+ <td class="${status.last ? 'last' : ''}" />
</c:forEach>
</tr>
</table>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/searcher.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/searcher.jspx
2010-03-30 15:29:46 UTC (rev 41683)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/searcher.jspx
2010-03-30 16:14:40 UTC (rev 41684)
@@ -14,25 +14,32 @@
<jsp:directive.page
import="org.mmbase.bridge.util.Queries,org.mmbase.bridge.*" />
<mm:import externid="pid" from="parameters" required="true" />
- <mm:import from="session" externid="${pid}" id="query" jspvar="q"
required="true" vartype="org.mmbase.bridge.NodeQuery" />
+ <mm:context scope="session" id="parameters" referid="${pid}_context" />
+
+
<mm:cloud>
<mm:import externid="step" from="request,parameters" vartype="integer"
required="true" jspvar="step"/>
<mm:import externid="nodeNumber" from="request,parameters"
required="${step gt 0}" />
- <jsp:scriptlet>Node node = null;</jsp:scriptlet>
- <c:if test="${!empty nodeNumber}">
- <mm:node referid="nodeNumber" jspvar="n">
- <jsp:scriptlet>node = n;</jsp:scriptlet>
- </mm:node>
- </c:if>
- <jsp:scriptlet>
- pageContext.setAttribute("laststep",
q.getSteps().indexOf(q.getNodeStep()));
- NodeQuery nodeQuery = Queries.getSubQuery(q, node, step);
- pageContext.setAttribute("nodeQuery", nodeQuery);
- </jsp:scriptlet>
+ <mm:write referid="parameters.query" jspvar="q"
vartype="org.mmbase.bridge.NodeQuery" write="false">
+
+ <jsp:scriptlet>Node node = null;</jsp:scriptlet>
+ <c:if test="${!empty nodeNumber}">
+ <mm:node referid="nodeNumber" jspvar="n">
+ <jsp:scriptlet>node = n;</jsp:scriptlet>
+ </mm:node>
+ </c:if>
+ <jsp:scriptlet>
+ pageContext.setAttribute("laststep",
q.getSteps().indexOf(q.getNodeStep()));
+ NodeQuery nodeQuery = Queries.getSubQuery(q, node, step);
+ pageContext.setAttribute("nodeQuery", nodeQuery);
+ </jsp:scriptlet>
+ </mm:write>
+
<mm-srt:relate
+ pagesize="${parameters.pagesize}"
styleClass="pathsearcher_${laststep eq step ? 'end' : 'ontheway'}"
repository="${nodeQuery}"
load="${step eq 0 ? null : false}"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
