nxsconfigserver 2.20.0__tar.gz → 2.21.1__tar.gz

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/ChangeLog

@@ -1,3 +1,11 @@
+2026-01-20 Jan Kotanski <jankotan@gmail.com>
+	* improve duplicated strategy and datasource tag  merging  (#94)
+	* tagged as v2.21.1
+
+2026-01-19 Jan Kotanski <jankotan@gmail.com>
+	* changed MergedXML to XMLCache attribute  (#88)
+	* tagged as v2.21.0
+
 2026-01-16 Jan Kotanski <jankotan@gmail.com>
 	* add MergedXML attribute  (#88)
 	* tagged as v2.20.0

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/NXSConfigServer.xmi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://tango.org/pogo/PogoDsl">
   <classes name="NXSConfigServer" pogoRevision="9.9">
-    <description description="NeXuS Configuration Server is a Tango Server with its implementation based&#xA;on a MySQL database. It allows to store XML configuration datasources&#xA;and components. It also gives possibility to select mandatory components&#xA;and perform the process of component merging.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsconfigserver/&#xA;Web page: https://nexdatas.github.io/nxsconfigserver/&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Configuration Server for Nexus Data Writer" sourcePath="/home/jkotan/ndts/nexdatas.configserver" language="Python" filestogenerate="XMI   file,Code files,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
+    <description description="NeXuS Configuration Server is a Tango Server with its implementation based&#xA;on a MySQL database. It allows to store XML configuration datasources&#xA;and components. It also gives possibility to select mandatory components&#xA;and perform the process of component merging.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsconfigserver/&#xA;Web page: https://nexdatas.github.io/nxsconfigserver/&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Configuration Server for Nexus Data Writer" sourcePath="/home/jkotan/ndts/nxsconfigserver" language="Python" filestogenerate="XMI   file,Code files,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <identification contact="at desy.de - jan.kotanski" author="jan.kotanski" emailDomain="desy.de" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="DESY" reference=""/>
     </description>
@@ -164,7 +164,7 @@
       <excludedStates>ON</excludedStates>
       <excludedStates>RUNNING</excludedStates>
     </commands>
-    <commands name="CreateConfiguration" description="Creates the NDTS configuration script from the given components. The result is strored in XMLString" execMethod="create_configuration" displayLevel="OPERATOR" polledPeriod="0">
+    <commands name="CreateCache" description="Creates the cache configuration script from the given components. The result is strored in XMLCache" execMethod="create_cache" displayLevel="OPERATOR" polledPeriod="0" isDynamic="false">
       <argin description="list of component names">
         <type xsi:type="pogoDsl:StringArrayType"/>
       </argin>
@@ -411,13 +411,13 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <properties description="JSON list of datasources to which links will be added" label="Datasources to which extra links will be added" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
     </attributes>
-    <attributes name="MergedXML" attType="Scalar" rwType="READ" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+    <attributes name="XMLCache" attType="Scalar" rwType="READ" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
       <dataType xsi:type="pogoDsl:StringType"/>
       <changeEvent fire="false" libCheckCriteria="false"/>
       <archiveEvent fire="false" libCheckCriteria="false"/>
       <dataReadyEvent fire="false" libCheckCriteria="true"/>
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
-      <properties description="XML for merged components without applied variables " label="XML for merged components" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
+      <properties description="XML for merged components without applied variables" label="XML for merged components" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
       <readExcludedStates>ON</readExcludedStates>
       <readExcludedStates>RUNNING</readExcludedStates>
       <writeExcludedStates>ON</writeExcludedStates>

{nxsconfigserver-2.20.0/nxsconfigserver.egg-info → nxsconfigserver-2.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.20.0
+Version: 2.21.1
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/doc_html/Attributes.html

@@ -110,14 +110,14 @@
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
 	<tr>
-		<td> <a href="AttrMergedXML.html"> MergedXML </a> </td>
+		<td> <a href="AttrXMLCache.html"> XMLCache </a> </td>
 		<td> false </td>
 		<td> false </td>
 		<td> Scalar </td>
 		<td> READ </td>
 		<td> Tango::DEV_STRING </td>
 		<td> EXPERT </td>
-		<td> XML for merged components without applied variables  </td>
+		<td> XML for merged components without applied variables </td>
 	</tr>
 </table>
 <br><br>

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/doc_html/Commands.html

@@ -114,11 +114,11 @@
 		<td> Stores the DataSource from XMLString </td>
 	</tr>
 	<tr>
-		<td> <a href="CmdCreateConfiguration.html"> CreateConfiguration </a> </td>
+		<td> <a href="CmdCreateCache.html"> CreateCache </a> </td>
 		<td> DEVVAR_STRINGARRAY </td>
 		<td> DEV_VOID </td>
 		<td> OPERATOR </td>
-		<td> Creates the NDTS configuration script from the given components. The result is strored in XMLString </td>
+		<td> Creates the cache configuration script from the given components. The result is strored in XMLCache </td>
 	</tr>
 	<tr>
 		<td> <a href="CmdDeleteComponent.html"> DeleteComponent </a> </td>

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/doc_html/FullDocument.html

@@ -28,7 +28,7 @@
 				<li> <a href="FullDocument.html#cmdStoreSelection"> StoreSelection </a>
 				<li> <a href="FullDocument.html#cmdStoreComponent"> StoreComponent </a>
 				<li> <a href="FullDocument.html#cmdStoreDataSource"> StoreDataSource </a>
-				<li> <a href="FullDocument.html#cmdCreateConfiguration"> CreateConfiguration </a>
+				<li> <a href="FullDocument.html#cmdCreateCache"> CreateCache </a>
 				<li> <a href="FullDocument.html#cmdDeleteComponent"> DeleteComponent </a>
 				<li> <a href="FullDocument.html#cmdDeleteSelection"> DeleteSelection </a>
 				<li> <a href="FullDocument.html#cmdDeleteDataSource"> DeleteDataSource </a>
@@ -55,7 +55,7 @@
 				<li> <a href="FullDocument.html#attrLinkDataSources"> LinkDataSources </a>
 				<li> <a href="FullDocument.html#attrCanFailDataSources"> CanFailDataSources </a>
 				<li> <a href="FullDocument.html#attrExtraLinkDataSources"> ExtraLinkDataSources </a>
-				<li> <a href="FullDocument.html#attrMergedXML"> MergedXML </a>
+				<li> <a href="FullDocument.html#attrXMLCache"> XMLCache </a>
 			</ul>
 			<li> <a href="FullDocument.html#states">       States       </a>
 		</ul>
@@ -265,11 +265,11 @@
 		<td> Stores the DataSource from XMLString </td>
 	</tr>
 	<tr>
-		<td> <a href="CmdCreateConfiguration.html"> CreateConfiguration </a> </td>
+		<td> <a href="CmdCreateCache.html"> CreateCache </a> </td>
 		<td> DEVVAR_STRINGARRAY </td>
 		<td> DEV_VOID </td>
 		<td> OPERATOR </td>
-		<td> Creates the NDTS configuration script from the given components. The result is strored in XMLString </td>
+		<td> Creates the cache configuration script from the given components. The result is strored in XMLCache </td>
 	</tr>
 	<tr>
 		<td> <a href="CmdDeleteComponent.html"> DeleteComponent </a> </td>
@@ -1057,16 +1057,16 @@
 	</tr>
 </table>
 <br><br><hr>
-<a name="cmdCreateConfiguration"> </a>
+<a name="cmdCreateCache"> </a>
 <br><br><br>
-<font size="+1"><u><b> Command CreateConfiguration : </b></u></font>
+<font size="+1"><u><b> Command CreateCache : </b></u></font>
 <ul>
-	Creates the NDTS configuration script from the given components. The result is strored in XMLString
+	Creates the cache configuration script from the given components. The result is strored in XMLCache
 </ul>
 <br><br><br>
 <Table Border=2 Cellpadding=3 CELLSPACING=0>
 	<tr bgcolor="#CCCCFF" class="TableHeadingColor">
-	<td colspan=0> <font size=+1> <center><b> CreateConfiguration Definition </b></font></center></td>
+	<td colspan=0> <font size=+1> <center><b> CreateCache Definition </b></font></center></td>
 	</tr>
 	<tr>
 		<td> Input Argument </td>
@@ -1900,14 +1900,14 @@
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
 	<tr>
-		<td> <a href="AttrMergedXML.html"> MergedXML </a> </td>
+		<td> <a href="AttrXMLCache.html"> XMLCache </a> </td>
 		<td> false </td>
 		<td> false </td>
 		<td> Scalar </td>
 		<td> READ </td>
 		<td> Tango::DEV_STRING </td>
 		<td> EXPERT </td>
-		<td> XML for merged components without applied variables  </td>
+		<td> XML for merged components without applied variables </td>
 	</tr>
 </table>
 <br><br>
@@ -3420,11 +3420,11 @@
 </table>
 <br><br>
 <hr>
-<a name="attrMergedXML"> </a>
+<a name="attrXMLCache"> </a>
 <br><br><br>
-<font size="+1"><u><b> Attribute MergedXML : </b></u></font>
+<font size="+1"><u><b> Attribute XMLCache : </b></u></font>
 <ul>
-	XML for merged components without applied variables 
+	XML for merged components without applied variables
 </ul>
 <br><br><br>
 <Table Border=0 Cellpadding=0 CELLSPACING=20>

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/nxsconfigserver/Merger.py

@@ -184,7 +184,7 @@ class Merger(object):
             res += ":" + name
         return res
 
-    def __areMergeable(self, elem1, elem2, ancestors):
+    def __areMergeable(self, elem1, elem2, ancestors, node):
         """ checks if two elements are mergeable
 
         :param elem1: first element
@@ -216,10 +216,19 @@ class Merger(object):
         if tags:
             status = False
             if tagName in self.singles or (name1 and name1 == name2):
-                raise IncompatibleNodeError(
-                    "Incompatible element attributes  %s: %s"
-                    % (str(self.__getAncestors(elem1, ancestors)), str(tags)),
-                    [elem1, elem2])
+                if not self.skip:
+                    if tags and tags[0] == ('TANGO', 'CLIENT'):
+                        node.remove(elem2)
+                    elif tags and tags[0] == ('CLIENT', 'TANGO'):
+                        node.remove(elem1)
+                    else:
+                        raise IncompatibleNodeError(
+                            "Incompatible element attributes  %s: %s %s"
+                            % (str(self.__getAncestors(elem1, ancestors)),
+                               str(node.get("name")),  str(tags)),
+                            [elem1, elem2])
+                else:
+                    status = False
 
         if tagName in self.uniqueText:
             text1 = unicode(self.__getText(elem1)).strip()
@@ -330,6 +339,9 @@ class Merger(object):
 
             children = list(node)
             c1 = 0
+            if unicode(node.tag) in self.switchable and self.switchdatasources:
+                # print("NODE", node.tag, node.get("name"))
+                self.__switch(node)
             while c1 < len(children):
                 child1 = children[c1]
                 c2 = c1 + 1
@@ -338,7 +350,7 @@ class Merger(object):
                     if child1 != child2:
                         if self.__areMergeable(
                                 child1, child2,
-                                ancestors):
+                                ancestors, node):
                             self.__mergeNodes(child1, child2, node)
                             children.pop(c2)
                             c2 -= 1
@@ -359,8 +371,9 @@ class Merger(object):
 
                 self.__mergeChildren(child, newancestors, entrynode,
                                      datanode, linknode)
-                if cName in self.switchable and self.switchdatasources:
-                    self.__switch(child)
+                # if cName in self.switchable and self.switchdatasources:
+                #     print("CHILD", child.tag, child.get("name"))
+                #     self.__switch(child)
                 if cName in self.linkable and self.linkdatasources:
                     datanode = self.__addlink(
                         child, newancestors, entrynode, datanode,
@@ -431,7 +444,8 @@ class Merger(object):
         :type node: :obj:`xml.etree.ElementTree.Element`
         """
         if node is not None:
-            stnode = None
+            stnodes = []
+            modes = []
             mode = None
             dsname = None
             dsnode = None
@@ -456,13 +470,18 @@ class Merger(object):
                 elif cName == 'strategy':
                     mode = child.get("mode")
                     if mode in self.modesToSwitch.keys():
-                        stnode = child
-                    else:
-                        break
-                if stnode is not None and dsnode is not None:
-                    break
-            if stnode is not None and dsnode is not None:
-                stnode.attrib["mode"] = self.modesToSwitch[mode]
+                        stnodes.append(child)
+                        modes.append(mode)
+                    # else:
+                    #     break
+                # if stnode not None and dsnode is not None:
+                #     break
+            if stnodes and dsnode is not None:
+                for si, stn in enumerate(stnodes):
+                    mode = modes[si]
+                    if mode in self.modesToSwitch.keys():
+                        stn.attrib["mode"] = self.modesToSwitch[mode]
+                        # print("SWITCH", node.get("name"), dsname, dsnode)
 
     def __canfail(self, node):
         """ switch the given node to canfail mode

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/nxsconfigserver/NXSConfigServer.py

@@ -135,17 +135,17 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
-    def read_MergedXML(self, attr):
-        """ Read MergedXML attribute
+    def read_XMLCache(self, attr):
+        """ Read XMLCache attribute
 
         :param attr: xml string attribute
         :type attr: :class:`tango.Attribute`
         """
-        self.debug_stream("In read_MergedXML()")
-        attr.set_value(self.xmlc.mergedxml)
+        self.debug_stream("In read_XMLCache()")
+        attr.set_value(self.xmlc.xmlcache)
 
-    def is_MergedXML_allowed(self, _):
-        """ MergedXML attribute State Machine
+    def is_XMLCache_allowed(self, _):
+        """ XMLCache attribute State Machine
 
         :returns: True if the operation allowed
         :rtype: :obj:`bool`
@@ -785,7 +785,7 @@ class NXSConfigServer(tango.LatestDeviceImpl):
 
         :brief: Creates the NDTS configuration script from the
                 given components. The result is strored in XMLString
-                and MergedXML
+                and XMLCache
 
         :param argin:  DevVarStringArray    list of component names
         :type argin: :obj:`list` <:obj:`str`>
@@ -810,6 +810,36 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def CreateCache(self, argin):
+        """ CreateCache command
+
+        :brief: Creates the NDTS cache script from the
+                given components. The result is strored in XMLString
+                and XMLCache
+
+        :param argin:  DevVarStringArray    list of component names
+        :type argin: :obj:`list` <:obj:`str`>
+        """
+        self.debug_stream("In CreateCache()")
+        try:
+            self.set_state(tango.DevState.RUNNING)
+            self.xmlc.createCache(argin)
+            self.set_state(tango.DevState.OPEN)
+        finally:
+            if self.get_state() == tango.DevState.RUNNING:
+                self.set_state(tango.DevState.OPEN)
+
+    def is_CreateCache_allowed(self):
+        """ CreateCache command State Machine
+
+        :returns: True if the operation allowed
+        :rtype: :obj:`bool`
+        """
+        if self.get_state() in [tango.DevState.ON,
+                                tango.DevState.RUNNING]:
+            return False
+        return True
+
     def DeleteComponent(self, argin):
         """ DeleteComponent command
 
@@ -1276,6 +1306,9 @@ class NXSConfigServerClass(tango.DeviceClass):
         'CreateConfiguration':
             [[tango.DevVarStringArray, "list of component names"],
              [tango.DevVoid, ""]],
+        'CreateCache':
+            [[tango.DevVarStringArray, "list of component names"],
+             [tango.DevVoid, ""]],
         'DeleteComponent':
             [[tango.DevString, "component name"],
              [tango.DevVoid, ""]],
@@ -1337,7 +1370,7 @@ class NXSConfigServerClass(tango.DeviceClass):
              "it contains the resulting XML configuration.",
              'Display level': tango.DispLevel.EXPERT,
         }],
-        'MergedXML':
+        'XMLCache':
         [[tango.DevString,
           tango.SCALAR,
           tango.READ],

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/nxsconfigserver/Release.py

@@ -20,4 +20,4 @@
 """ release version module """
 
 #: version number
-__version__ = "2.20.0"
+__version__ = "2.21.1"

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/nxsconfigserver/XMLConfigurator.py

@@ -87,7 +87,7 @@ class XMLConfigurator(object):
         #: (:obj:`str`) XML config string
         self.xmlstring = ""
         #: (:obj:`str`) Merged coponents in XML string without variables
-        self.mergedxml = ""
+        self.xmlcache = ""
         #: (:obj:`str`) component selection
         self.selection = "{}"
         #: (:obj:`str`) JSON string with arguments to connect to database
@@ -831,9 +831,12 @@ class XMLConfigurator(object):
             name = subc.strip() if subc else ""
             if name:
                 if tag and name not in keys:
-                    raise NonregisteredDBRecordError(
-                        "The %s %s of %s not registered in the DataBase" % (
-                            tag if tag else "variable", name, component))
+                    if not onlyexisting:
+                        raise NonregisteredDBRecordError(
+                            "The %s %s of %s not registered in the "
+                            "DataBase" % (
+                                tag if tag else "variable",
+                                name, component))
                 try:
                     xmlds = funValue([name], defsubc)
                 except Exception:
@@ -842,7 +845,7 @@ class XMLConfigurator(object):
                     raise NonregisteredDBRecordError(
                         "The %s %s of %s not registered" % (
                             tag if tag else "variable", name, component))
-                if tag:
+                if tag and xmlds:
                     if sys.version_info > (3,):
                         root = et.fromstring(
                             bytes(xmlds[0], "UTF-8"),
@@ -908,10 +911,12 @@ class XMLConfigurator(object):
             component, self.__varLabel,
             list(self.__parameters.keys()), self.__getVariable)
 
-    def __attachComponents(self, component):
+    def __attachComponents(self, component, onlyexisting=False):
         """ attaches variables to component
 
         :param component: given component
+        :param onlyexisting: attachElement only if exists
+        :type onlyexisting: :obj:`bool`
         :type component: :obj:`str`
         :returns: component with attached variables
         :rtype: :obj:`str`
@@ -919,13 +924,16 @@ class XMLConfigurator(object):
         if not component:
             return
         return self.__attachElements(
-            component, self.__cpLabel, [], lambda x, y: [""])
+            component, self.__cpLabel, [], lambda x, y: [""],
+            onlyexisting=onlyexisting)
 
-    def __attachDataSources(self, component):
+    def __attachDataSources(self, component, onlyexisting=False):
         """ attaches datasources to component
 
         :param component: given component
         :type component: :obj:`str`
+        :param onlyexisting: attachElement only if exists
+        :type onlyexisting: :obj:`bool`
         :returns: component with attached datasources
         :rtype: :obj:`str`
         """
@@ -934,7 +942,7 @@ class XMLConfigurator(object):
         return self.__attachElements(
             component, self.__dsLabel,
             self.availableDataSources(), self.dataSources,
-            "datasource")
+            "datasource", onlyexisting=onlyexisting)
 
     def merge(self, names):
         """ merges the give components
@@ -963,13 +971,15 @@ class XMLConfigurator(object):
                 cpvars[str(key)] = str(value)
         return cpvars
 
-    def __mergeVars(self, names, withVariables=False):
+    def __mergeVars(self, names, withVariables=False, onlyCache=False):
         """ merges the give components
 
         :param names: list of component names
         :type names: :obj:`list` <:obj:`str`>
         :param withVariables: if true variables will be substituted
         :param withVariables: :obj:`bool`
+        :param onlyCache: if true create only cache
+        :param onlyCache: :obj:`bool`
         :returns: merged components
         :rtype: :obj:`str`
         """
@@ -980,7 +990,12 @@ class XMLConfigurator(object):
             comps = self.__mydb.components(list(set(allnames)))
             xml = self.__merge(comps, skip=withVariables)
             if withVariables:
-                self.mergedxml = xml or ""
+                xml = self.__attachDataSources(
+                   self.__attachComponents(
+                       xml, onlyexisting=True), onlyexisting=True)
+                self.xmlcache = xml or ""
+                if onlyCache:
+                    return self.xmlcache
                 if xml is not None:
                     comps = [xml]
                     cpvars = self.__variableComponentValues(comps)
@@ -998,11 +1013,12 @@ class XMLConfigurator(object):
         :rtype: :obj:`str`
         """
         mgr = Merger()
-        mgr.switchdatasources = json.loads(self.stepdatasources)
-        mgr.linkdatasources = json.loads(self.linkdatasources)
-        mgr.extralinkdatasources = json.loads(self.extralinkdatasources)
-        mgr.canfaildatasources = json.loads(self.canfaildatasources)
-        mgr.extralinkpath = self.__splitExtraPath(self.extraLinkPath)
+        if not skip:
+            mgr.switchdatasources = json.loads(self.stepdatasources)
+            mgr.linkdatasources = json.loads(self.linkdatasources)
+            mgr.extralinkdatasources = json.loads(self.extralinkdatasources)
+            mgr.canfaildatasources = json.loads(self.canfaildatasources)
+            mgr.extralinkpath = self.__splitExtraPath(self.extraLinkPath)
         mgr.skip = skip
         mgr.collect(xmls)
         mgr.merge()
@@ -1035,6 +1051,16 @@ class XMLConfigurator(object):
                     epath.append([nd[0], "NX" + nd[0]])
         return epath
 
+    def createCache(self, names):
+        """ creates the final configuration string in the xmlstring attribute
+
+        :param names: list of component names
+        :type names: :obj:`list` <:obj:`str`>
+        """
+        self.__mergeVars(names, withVariables=True, onlyCache=True)
+        self._streams.info("XMLConfigurator::createConfiguration() "
+                           "- Create configuration")
+
     def createConfiguration(self, names):
         """ creates the final configuration string in the xmlstring attribute
 

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1/nxsconfigserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.20.0
+Version: 2.21.1
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/test/NXSConfigServer_test.py

@@ -137,8 +137,8 @@ class NXSConfigServerTest(XMLConfigurator_test.XMLConfiguratorTest):
     # gets xmlconfiguration
     # \param xmlc configuration instance
     # \returns xml configuration string
-    def getMergedXML(self, xmlc):
-        return xmlc.MergedXML
+    def getXMLCache(self, xmlc):
+        return xmlc.XMLCache
 
 
 if __name__ == '__main__':

{nxsconfigserver-2.20.0 → nxsconfigserver-2.21.1}/test/XMLConfigurator_test.py

@@ -176,8 +176,8 @@ class XMLConfiguratorTest(unittest.TestCase):
     # gets merged xmlconfiguration
     # \param xmlc configuration instance
     # \returns xml configuration string
-    def getMergedXML(self, xmlc):
-        return xmlc.mergedxml
+    def getXMLCache(self, xmlc):
+        return xmlc.xmlcache
 
     # sets selection configuration
     # \param selectionc configuration instance
@@ -1202,11 +1202,11 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.getXML(el)
         self.assertEqual(self.getXML(el), '')
-        self.assertEqual(self.getMergedXML(el), '')
+        self.assertEqual(self.getXMLCache(el), '')
         self.assertEqual(el.createConfiguration([]), None)
         self.getXML(el)
         self.assertEqual(self.getXML(el), '')
-        self.assertEqual(self.getMergedXML(el), '')
+        self.assertEqual(self.getXMLCache(el), '')
         el.setMandatoryComponents(man)
         el.close()
 
@@ -1249,7 +1249,7 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,
@@ -1315,7 +1315,7 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,
@@ -1329,7 +1329,7 @@ class XMLConfiguratorTest(unittest.TestCase):
         self.assertEqual(el.createConfiguration([name]), None)
 
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,
@@ -1400,7 +1400,7 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,
@@ -1416,7 +1416,7 @@ class XMLConfiguratorTest(unittest.TestCase):
         self.assertEqual(el.createConfiguration([name, name2]), None)
 
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,
@@ -1437,7 +1437,7 @@ class XMLConfiguratorTest(unittest.TestCase):
         self.assertEqual(el.createConfiguration([name, name2]), None)
 
         xml = self.getXML(el)
-        mxml = self.getMergedXML(el)
+        mxml = self.getXMLCache(el)
         checkxmls(
             self,
             xml,