More updates for issue #189: support p:pipeline as an alias for p:dec…

…lare-step; output profile calls for custom step invocations
ndw · Feb 5, 2015 · 294f6e2 · 294f6e2
1 parent fff0e91
commit 294f6e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/com/xmlcalabash/core/XProcRuntime.java b/src/com/xmlcalabash/core/XProcRuntime.java
@@ -156,6 +156,7 @@ public class XProcRuntime {
     private QName profileLine = new QName("", "line");
     private QName profileTime = new QName("http://xmlcalabash.com/ns/profile", "time");
     private String p_declare_step_clark = XProcConstants.p_declare_step.getClarkName();
+    private String p_pipeline_clark = XProcConstants.p_pipeline.getClarkName();
 
     public XProcRuntime(XProcConfiguration config) {
         this.config = config;
@@ -964,7 +965,7 @@ public void start(XStep step) {
         }
 
         String name = step.getType().getClarkName();
-        if (p_declare_step_clark.equals(name)
+        if ((p_declare_step_clark.equals(name) || p_pipeline_clark.equals(name))
                 && step.getType() != null
                 && step.getStep().getDeclaredType() != null) {
             profileWriter.addAttribute(profileType, step.getStep().getDeclaredType().getClarkName());

diff --git a/src/com/xmlcalabash/runtime/XPipelineCall.java b/src/com/xmlcalabash/runtime/XPipelineCall.java
@@ -90,7 +90,9 @@ public void run() throws SaxonApiException {
             }
         }
 
+        runtime.start(this);
         newstep.run();
+        runtime.finish(this);
 
     }
 }