sylvain 02/03/14 03:05:58
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
AggregateNode.java AggregateNodeBuilder.java
Log:
Add substitution to all attributes (reported by Jeremy)
Revision Changes Path
1.2 +28 -21
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ AggregateNode.java 14 Mar 2002 11:05:58 -0000 1.2
@@ -83,14 +83,14 @@
* <a
href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=100517130418424";>here</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: AggregateNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: AggregateNode.java,v 1.2 2002/03/14 11:05:58 sylvain Exp $
*/
public class AggregateNode extends AbstractProcessingNode {
- private String element;
- private String nsURI;
- private String nsPrefix;
+ private MapStackResolver element;
+ private MapStackResolver nsURI;
+ private MapStackResolver nsPrefix;
/** All parts */
private Part[] allParts;
@@ -101,10 +101,10 @@
/** View nodes to jump to */
private Map viewNodes;
- public AggregateNode(String element, String nsURI, String nsPrefix) {
- this.element = element;
- this.nsURI = nsURI;
- this.nsPrefix = nsPrefix;
+ public AggregateNode(String element, String nsURI, String nsPrefix) throws
PatternException {
+ this.element = MapStackResolver.getResolver(element);
+ this.nsURI = MapStackResolver.getResolver(nsURI);
+ this.nsPrefix = MapStackResolver.getResolver(nsPrefix);
}
public void setParts(Part[] allParts, Map viewParts) {
@@ -129,7 +129,11 @@
eventPipeline.setGenerator("!content-aggregator!", null,
Parameters.EMPTY_PARAMETERS);
ContentAggregator aggregator =
(ContentAggregator)eventPipeline.getGenerator();
- aggregator.setRootElement(this.element, this.nsURI, this.nsPrefix);
+ aggregator.setRootElement(
+ this.element.resolve(mapStack),
+ this.nsURI.resolve(mapStack),
+ this.nsPrefix.resolve(mapStack)
+ );
// Get actual parts, potentially filtered by the view
Part[] actualParts;
@@ -153,9 +157,12 @@
for (int i = 0; i < actualParts.length; i++) {
Part part = actualParts[i];
if (part != null) {
- // FIXME : update ContentAggregator to accept boolean for stripRoot
- aggregator.addPart(part.source.resolve(mapStack),
- part.element, part.nsURI, String.valueOf(part.stripRoot),
part.nsPrefix
+ aggregator.addPart(
+ part.source.resolve(mapStack),
+ part.element.resolve(mapStack),
+ part.nsURI.resolve(mapStack),
+ part.stripRoot.resolve(mapStack),
+ part.nsPrefix.resolve(mapStack)
);
}
}
@@ -176,19 +183,19 @@
}
public static class Part {
- public Part(String source, String element, String nsURI, String nsPrefix,
boolean stripRoot)
+ public Part(String source, String element, String nsURI, String nsPrefix,
String stripRoot)
throws PatternException {
this.source = MapStackResolver.getResolver(source);
- this.element = element;
- this.nsURI = nsURI;
- this.nsPrefix = nsPrefix;
- this.stripRoot = stripRoot;
+ this.element = MapStackResolver.getResolver(element);
+ this.nsURI = MapStackResolver.getResolver(nsURI);
+ this.nsPrefix = MapStackResolver.getResolver(nsPrefix);
+ this.stripRoot = MapStackResolver.getResolver(stripRoot);
}
private MapStackResolver source;
- private String element;
- private String nsURI;
- private String nsPrefix;
- private boolean stripRoot;
+ private MapStackResolver element;
+ private MapStackResolver nsURI;
+ private MapStackResolver nsPrefix;
+ private MapStackResolver stripRoot;
}
}
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java
Index: AggregateNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateNodeBuilder.java 5 Mar 2002 08:26:23 -0000 1.1
+++ AggregateNodeBuilder.java 14 Mar 2002 11:05:58 -0000 1.2
@@ -64,7 +64,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: AggregateNodeBuilder.java,v 1.1 2002/03/05 08:26:23 sylvain
Exp $
+ * @version CVS $Id: AggregateNodeBuilder.java,v 1.2 2002/03/14 11:05:58 sylvain
Exp $
*/
public class AggregateNodeBuilder extends AbstractProcessingNodeBuilder
@@ -115,7 +115,7 @@
childConfig.getAttribute("element", ""),
childConfig.getAttribute("ns", ""),
childConfig.getAttribute("prefix", ""),
- childConfig.getAttributeAsBoolean("strip-root", false)
+ childConfig.getAttribute("strip-root", "false")
);
allParts.add(currentPart);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
