--- a/PLCControler.py Wed Oct 09 23:06:47 2013 +0200
+++ b/PLCControler.py Thu Oct 10 09:43:52 2013 +0200
@@ -254,55 +254,30 @@
# Helpers object for generating instance tagname
#-------------------------------------------------------------------------------
-class InstanceTagName(etree.XSLTExtension):
def __init__(self, controller):
- etree.XSLTExtension.__init__(self)
self.Controller = controller
- def GetTagName(self, infos):
- def execute(self, context, self_node, input_node, output_parent):
- tagname_infos = etree.Element('infos')
- self.process_children(context, tagname_infos)
- tagname = etree.Element('tagname')
- tagname.text = self.GetTagName(tagname_infos)
- output_parent.append(tagname)
-class ConfigTagName(InstanceTagName):
- def GetTagName(self, infos):
- return self.Controller.ComputeConfigurationName(infos.get("name"))
-class ResourceTagName(InstanceTagName):
- def GetTagName(self, infos):
- return self.Controller.ComputeConfigurationResourceName(
- infos.get("config_name"), infos.get("name"))
-class PouTagName(InstanceTagName):
- def GetTagName(self, infos):
- return self.Controller.ComputePouName(infos.get("name"))
+ def ConfigTagName(self, context, *args): + self.TagName = self.Controller.ComputeConfigurationName(args[0][0]) + def ResourceTagName(self, context, *args): + self.TagName = self.Controller.ComputeConfigurationResourceName(args[0][0], args[1][0]) -class ActionTagName(InstanceTagName):
- def GetTagName(self, infos):
- return self.Controller.ComputePouActionName(
- infos.get("pou_name"), infos.get("name"))
+ def PouTagName(self, context, *args): + #print "PouTagName", etree.tostring(args[0][0]) + self.TagName = self.Controller.ComputePouName(args[0][0]) -class TransitionTagName(InstanceTagName):
- def GetTagName(self, infos):
- return self.Controller.ComputePouTransitionName(
- infos.get("pou_name"), infos.get("name"))
+ def ActionTagName(self, context, *args): + self.TagName = self.Controller.ComputePouActionName(args[0][0], args[0][1]) -instance_tagname_xslt = etree.parse(
- os.path.join(ScriptDirectory, "plcopen", "instance_tagname.xslt"))
+ def TransitionTagName(self, context, *args): + self.TagName = self.Controller.ComputePouTransitionName(args[0][0], args[0][1]) #-------------------------------------------------------------------------------
# Helpers object for generating pou block instances list
@@ -812,23 +787,24 @@
def GetPouInstanceTagName(self, instance_path, debug = False):
project = self.GetProject(debug)
+ factory = InstanceTagName(self) + parser = etree.XMLParser() + parser.resolvers.add(LibraryResolver(self, debug)) instance_tagname_xslt_tree = etree.XSLT(
- ("instance_tagname_ns", "instance_definition"): InstanceDefinition(self, debug),
- ("instance_tagname_ns", "config_tagname"): ConfigTagName(self),
- ("instance_tagname_ns", "resource_tagname"): ResourceTagName(self),
- ("instance_tagname_ns", "pou_tagname"): PouTagName(self),
- ("instance_tagname_ns", "action_tagname"): ActionTagName(self),
- ("instance_tagname_ns", "transition_tagname"): TransitionTagName(self)})
+ os.path.join(ScriptDirectory, "plcopen", "instance_tagname.xslt"), + extensions = {("instance_tagname_ns", name): getattr(factory, name) + for name in ["ConfigTagName", "ResourceTagName", + "PouTagName", "ActionTagName", - result = instance_tagname_xslt_tree(project,
- instance_path=etree.XSLT.strparam(instance_path)).getroot()
+ instance_tagname_xslt_tree(project, + instance_path=etree.XSLT.strparam(instance_path))
+ return factory.GetTagName() def GetInstanceInfos(self, instance_path, debug = False):
tagname = self.GetPouInstanceTagName(instance_path)
--- a/plcopen/instance_tagname.xslt Wed Oct 09 23:06:47 2013 +0200
+++ b/plcopen/instance_tagname.xslt Thu Oct 10 09:43:52 2013 +0200
@@ -1,12 +1,20 @@
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:ppx="http://www.plcopen.org/xml/tc6_0201"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xmlns:ns="instance_tagname_ns"
- extension-element-prefixes="ns"
- exclude-result-prefixes="ns">
+<xsl:stylesheet xmlns:func="http://exslt.org/functions" xmlns:dyn="http://exslt.org/dynamic" xmlns:str="http://exslt.org/strings" xmlns:math="http://exslt.org/math" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:yml="http://fdik.org/yml" xmlns:set="http://exslt.org/sets" xmlns:ppx="http://www.plcopen.org/xml/tc6_0201" xmlns:ns="instance_tagname_ns" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" extension-element-prefixes="ns" version="1.0" exclude-result-prefixes="ns"> + <xsl:output method="xml"/> + <xsl:variable name="space" select="' '"/> + <xsl:param name="autoindent" select="4"/> <xsl:param name="instance_path"/>
+ <xsl:variable name="project"> + <xsl:copy-of select="document('project')/project/*"/> + <xsl:variable name="stdlib"> + <xsl:copy-of select="document('stdlib')/stdlib/*"/> + <xsl:variable name="extensions"> + <xsl:copy-of select="document('extensions')/extensions/*"/> <xsl:template name="element_name">
+ <xsl:param name="_indent" select="0"/> <xsl:when test="contains($path,'.')">
@@ -18,6 +26,7 @@
<xsl:template name="next_path">
+ <xsl:param name="_indent" select="0"/> <xsl:when test="contains($path,'.')">
@@ -26,12 +35,14 @@
<xsl:template match="ppx:project">
+ <xsl:param name="_indent" select="0"/> <xsl:variable name="config_name">
<xsl:call-template name="element_name">
<xsl:with-param name="path" select="$instance_path"/>
<xsl:apply-templates select="ppx:instances/ppx:configurations/ppx:configuration[@name=$config_name]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> <xsl:with-param name="element_path">
<xsl:call-template name="next_path">
<xsl:with-param name="path" select="$instance_path"/>
@@ -40,41 +51,43 @@
<xsl:template match="ppx:configuration">
+ <xsl:param name="_indent" select="0"/> <xsl:param name="element_path"/>
<xsl:when test="$element_path!=''">
<xsl:variable name="child_name">
- <xsl:call-template name="element_name">
- <xsl:with-param name="path" select="$element_path"/>
+ <xsl:call-template name="element_name"> + <xsl:with-param name="path" select="$element_path"/> <xsl:apply-templates select="ppx:resource[@name=$child_name] | ppx:globalVars/ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> <xsl:with-param name="element_path">
<xsl:call-template name="next_path">
- <xsl:with-param name="path" select="$element_path"/>
+ <xsl:with-param name="path" select="$element_path"/>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
+ <xsl:value-of select="ns:ConfigTagName(@name)"/> <xsl:template match="ppx:resource">
+ <xsl:param name="_indent" select="0"/> <xsl:param name="element_path"/>
<xsl:when test="$element_path!=''">
- <xsl:variable name="child_name">
- <xsl:call-template name="element_name">
- <xsl:with-param name="path" select="$element_path"/>
+ <xsl:variable name="child_name"> + <xsl:call-template name="element_name"> + <xsl:with-param name="path"> + <xsl:value-of select="$element_path"/> <xsl:apply-templates select="ppx:pouInstance[@name=$child_name] | ppx:task/ppx:pouInstance[@name=$child_name] | ppx:globalVars/ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> <xsl:with-param name="element_path">
<xsl:call-template name="next_path">
<xsl:with-param name="path" select="$element_path"/>
@@ -83,123 +96,101 @@
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- <xsl:attribute name="config_name">
- <xsl:value-of select="ancestor::ppx:configuration/@name"/>
+ <xsl:value-of select="ns:ResourceTagName(ancestor::ppx:configuration/@name, @name)"/> <xsl:template match="ppx:pouInstance">
+ <xsl:param name="_indent" select="0"/> <xsl:param name="element_path"/>
- <ns:instance_definition>
- <xsl:attribute name="name">
- <xsl:value-of select="@typeName"/>
- <xsl:attribute name="path">
- <xsl:value-of select="$element_path"/>
- </ns:instance_definition>
+ <xsl:variable name="type_name"> + <xsl:value-of select="@typeName"/> + <xsl:apply-templates select="exsl:node-set($project)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($project)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:with-param name="element_path" select="$element_path"/> <xsl:template match="ppx:pou">
+ <xsl:param name="_indent" select="0"/> + <xsl:param name="element_path"/> + <xsl:when test="$element_path!=''"> + <xsl:variable name="child_name"> + <xsl:call-template name="element_name"> + <xsl:with-param name="path" select="$element_path"/> + <xsl:apply-templates select="ppx:interface/*/ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:with-param name="element_path"> + <xsl:call-template name="next_path"> + <xsl:with-param name="path" select="$element_path"/> + <xsl:apply-templates select="ppx:actions/ppx:action[@name=$child_name] | ppx:transitions/ppx:transition[@name=$child_name]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:variable name="name"> + <xsl:value-of select="@name"/> + <xsl:value-of select="ns:PouTagName($name)"/> + <xsl:template match="ppx:action"> + <xsl:param name="_indent" select="0"/> + <xsl:value-of select="ns:ActionTagName(ancestor::ppx:pou/@name, @name)"/> + <xsl:template match="ppx:transition"> + <xsl:param name="_indent" select="0"/> + <xsl:value-of select="ns:TransitionTagName(ancestor::ppx:pou/@name, @name)"/> + <xsl:template match="ppx:dataType"> + <xsl:param name="_indent" select="0"/> + <xsl:param name="element_path"/> + <xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:with-param name="element_path" select="$element_path"/> + <xsl:template match="ppx:derived"> + <xsl:param name="_indent" select="0"/> + <xsl:param name="element_path"/> + <xsl:variable name="type_name"> + <xsl:value-of select="@name"/> + <xsl:apply-templates select="exsl:node-set($project)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($project)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:with-param name="element_path" select="$element_path"/> + <xsl:template match="ppx:array"> + <xsl:param name="_indent" select="0"/> + <xsl:param name="element_path"/> + <xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> + <xsl:with-param name="element_path" select="$element_path"/> + <xsl:template match="ppx:struct"> + <xsl:param name="_indent" select="0"/> <xsl:param name="element_path"/>
<xsl:variable name="child_name">
<xsl:call-template name="element_name">
<xsl:with-param name="path" select="$element_path"/>
- <xsl:apply-templates select="ppx:interface/*/ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
+ <xsl:apply-templates select="ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]"> + <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/> <xsl:with-param name="element_path">
<xsl:call-template name="next_path">
<xsl:with-param name="path" select="$element_path"/>
- <xsl:apply-templates select="ppx:actions/ppx:action[@name=$child_name]"/>
- <xsl:apply-templates select="ppx:transitions/ppx:transition[@name=$child_name]"/>
- <xsl:template match="ppx:action">
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- <xsl:attribute name="pou_name">
- <xsl:value-of select="ancestor::ppx:pou/@name"/>
- <xsl:template match="ppx:transition">
- <ns:transition_tagname>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- <xsl:attribute name="pou_name">
- <xsl:value-of select="ancestor::ppx:pou/@name"/>
- </ns:transition_tagname>
- <xsl:template name="ppx:dataType">
- <xsl:param name="element_path"/>
- <xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="element_path" select="element_path"/>
- <xsl:template match="ppx:derived">
- <xsl:param name="element_path"/>
- <ns:instance_definition>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- <xsl:attribute name="path">
- <xsl:value-of select="$element_path"/>
- </ns:instance_definition>
- <xsl:template match="array">
- <xsl:param name="element_path"/>
- <xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="element_path" select="element_path"/>
- <xsl:template match="struct">
- <xsl:param name="element_path"/>
- <xsl:variable name="child_name">
- <xsl:call-template name="element_name">
- <xsl:with-param name="path" select="$element_path"/>
- <xsl:variable name="next_child_path">
- <xsl:call-template name="next_path">
- <xsl:with-param name="path" select="$element_path"/>
- <xsl:apply-templates select="ppx:variable[@name=$child_name]/ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="element_path" select="element_path"/>
- <xsl:template match="pou_instance">
- <xsl:when test="@pou_path!=''">
- <xsl:with-param name="element_path" select="@pou_path"/>
- <xsl:attribute name="name">
- <xsl:value-of select="ppx:pou/@name"/>
- <xsl:template match="datatype_instance">
- <xsl:with-param name="element_path" select="@datatype_path"/>
\ No newline at end of file