nxsconfigserver 2.19.0__tar.gz → 2.21.1__tar.gz

{nxsconfigserver-2.19.0 → nxsconfigserver-2.21.1}/.ci/debian11_py3/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.21.1}/.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "restart mysql service"
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ]  || [ "$1" = "debian12tg10" ]  || [ "$1" = "debian13" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu24.04" ]; then
     docker exec --user root ndts service mariadb restart
 else
     # workaround for a bug in debian9, i.e. starting mysql hangs
@@ -16,7 +16,7 @@ fi
 
 echo "install tango-common"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-common; sleep 10'
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "debian13" ]; then
     # docker exec  --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000  &'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -32,7 +32,7 @@ fi
 echo "install tango-db"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu25.04" ]; then
     docker exec  --user tango ndts /usr/bin/mysql -e 'create database tango'
     docker exec  --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
 fi
@@ -52,12 +52,12 @@ if [ "$2" = "2" ]; then
     echo "install pytango and nxsconfigserver-db"
     docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python-pytango  nxsconfigserver-db ; sleep 10'
 else
-    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
+    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12tg10" ]  || [ "$1" = "debian12" ]  || [ "$1" = "debian13" ] ; then
 	echo "install pytango"
 	docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python3-tango'
 	echo "install nxsconfigserver-db"
 	docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get  install -y   nxsconfigserver-db'
-	if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
+	if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu25.04" ]; then
 	    docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"%" identified by "rootpw"'
 	    docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"localhost" identified by "rootpw"'
 	    docker exec  --user root ndts /usr/bin/mysql -e 'FLUSH PRIVILEGES'

{nxsconfigserver-2.19.0 → nxsconfigserver-2.21.1}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu25.04, ubuntu24.04, ubuntu22.04]
+        os: [debian13, debian12tg10, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -47,33 +47,6 @@ jobs:
           OSYS: ${{ matrix.os }}
         run: .ci/run.sh ${OSYS} 3
       - name: Stop the docker
-        run: docker container stop ndts
-
-  python2_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [debian10]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - name: Update bash files
         run: |
-          chmod +x .ci/run.sh
-          chmod +x .ci/install.sh
-      - name: Build the docker
-        env:
-          OSYS: ${{ matrix.os }}
-        run: docker build -t ndts .ci/${OSYS}_py2
-      - name: Run the docker
-        run: docker run  --name  ndts -d -it -v `pwd`:/home/tango  ndts
-      - name: install tango and nxsconfigserver
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/install.sh ${OSYS} 2
-      - name: run tests
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/run.sh ${OSYS} 2
-      - name: Stop the docker
-        run: docker container stop ndts
+             docker exec  --user root ndts  /bin/bash -c "chown -R 1001 /home/tango "
+             docker container stop ndts

{nxsconfigserver-2.19.0 → nxsconfigserver-2.21.1}/ChangeLog

@@ -1,3 +1,15 @@
+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
+
 2025-07-29 Jan Kotanski <jankotan@gmail.com>
 	* clear the link name  (#79)
 	* tagged as v2.19.0

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

@@ -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,6 +411,18 @@
       <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="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=""/>
+      <readExcludedStates>ON</readExcludedStates>
+      <readExcludedStates>RUNNING</readExcludedStates>
+      <writeExcludedStates>ON</writeExcludedStates>
+      <writeExcludedStates>RUNNING</writeExcludedStates>
+    </attributes>
     <states name="ON" description="Server is ON">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.19.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
@@ -98,21 +98,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 Finally, for python2 packages
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.21.1}/README.rst

@@ -71,21 +71,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 Finally, for python2 packages
 

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

@@ -109,6 +109,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
+	<tr>
+		<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>
+	</tr>
 </table>
 <br><br>
 <hr>

{nxsconfigserver-2.19.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.19.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,6 +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#attrXMLCache"> XMLCache </a>
 			</ul>
 			<li> <a href="FullDocument.html#states">       States       </a>
 		</ul>
@@ -264,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>
@@ -1056,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>
@@ -1898,6 +1899,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
+	<tr>
+		<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>
+	</tr>
 </table>
 <br><br>
 <hr>
@@ -3409,6 +3420,169 @@
 </table>
 <br><br>
 <hr>
+<a name="attrXMLCache"> </a>
+<br><br><br>
+<font size="+1"><u><b> Attribute XMLCache : </b></u></font>
+<ul>
+	XML for merged components without applied variables
+</ul>
+<br><br><br>
+<Table Border=0 Cellpadding=0 CELLSPACING=20>
+	<TR>
+		<TD ALIGN="left" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Definition </b></font></center></td>
+				</tr>
+				<tr>
+					<td> Attribute Type </td>
+					<td> Scalar </td>
+				</tr>
+				<tr>
+					<td> R/W Type </td>
+					<td> READ </td>
+				</tr>
+				<tr>
+					<td> Data Type </td>
+					<td> Tango::DEV_STRING </td>
+				</tr>
+				<tr>
+					<td> Display Level </td>
+					<td> EXPERT </td>
+				</tr>
+				<tr>
+					<td> Inherited </td>
+					<td> false </td>
+				</tr>
+				<tr>
+					<td> Abstract </td>
+					<td> false </td>
+				</tr>
+				<tr>
+					<td> Polling Period </td>
+					<td> Not polled </td>
+				</tr>
+				<tr>
+					<td> Memorized </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Read NOT allowed for </td>
+					<td> <font size="-1">  <li> ON </li>  <li> RUNNING </li> </font> </td>
+				</tr>
+			</table>
+		</td>
+		<TD ALIGN="Center" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Properties </b></font></center></td>
+				</tr>
+				<tr>
+					<td> label </td>
+					<td> XML for merged components </td>
+				</tr>
+				<tr>
+					<td> unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> standard unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> display unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> format </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_value </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_value </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_alarm </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_alarm </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_warning </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_warning </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> delta_time </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> delta_val </td>
+					<td>  </td>
+				</tr>
+			</table>
+		</td>
+		<TD ALIGN="Right" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Event Criteria </b></font></center></td>
+				</tr>
+				<tr>
+					<td> Periodic </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Relative Change </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Absolute Change </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Archive Periodic </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Archive Relative Change </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Archive Absolute Change </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Push Change event by user code </td>
+					<td> false </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td> </Td><Td> </Td></Tr>
+				<tr>
+					<td> Push Archive event by user code </td>
+					<td> false </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td> </Td><Td> </Td></Tr>
+				<tr>
+					<td> Push DataReady event by user code </td>
+					<td> false </td>
+				</tr>
+			</table>
+		</td>
+	</TR>
+</table>
+<br><br>
+<hr>
 <br><br>
 <hr>
 <a name="states"> </a>

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

@@ -77,6 +77,8 @@ class Merger(object):
 
         #: (:obj:`xml.etree.ElementTree.Element`) DOM root node
         self.__root = None
+        #: (:obj:`bool`) do not merge node on false
+        self.skip = False
         #: (:obj:`list` <:obj:`str`> ) tags which cannot have the same siblings
         self.singles = ['strategy', 'dimensions', 'definition',
                         'record', 'device', 'query', 'database',
@@ -182,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
@@ -214,20 +216,32 @@ 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()
             text2 = unicode(self.__getText(elem2)).strip()
             if text1 != text2 and text1 and text2:
-                raise IncompatibleNodeError(
-                    "Incompatible \n%s element value\n%s \n%s "
-                    % (str(self.__getAncestors(elem1, ancestors)),
-                       text1, text2),
-                    [elem1, elem2])
+                if not self.skip:
+                    raise IncompatibleNodeError(
+                        "Incompatible \n%s element value\n%s \n%s "
+                        % (str(self.__getAncestors(elem1, ancestors)),
+                           text1, text2),
+                        [elem1, elem2])
+                else:
+                    status = False
         return status
 
     def __checkAttributes(self, elem1, elem2):
@@ -325,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
@@ -333,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
@@ -354,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,
@@ -426,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
@@ -451,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