nxsconfigserver 2.16.0__tar.gz → 2.17.0__tar.gz

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/ChangeLog

@@ -1,3 +1,7 @@
+2025-04-15 Jan Kotanski <jankotan@gmail.com>
+	* add ExtraLinkDataSources attribute and ExtraLinkPath property(#68)
+	* tagged as v2.17.0
+
 2025-04-09 Jan Kotanski <jankotan@gmail.com>
 	* add support for vds tags (#65)
 	* tagged as v2.16.0

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/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://www.esrf.fr/tango/pogo/PogoDsl">
-  <classes name="NXSConfigServer" pogoRevision="9.4">
-    <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">
+<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.8">
+    <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,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>
@@ -10,6 +10,11 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <DefaultPropValue>&quot;XCS&quot;</DefaultPropValue>
     </deviceProperties>
+    <deviceProperties name="ExtraLinkPath" description="extra link path below NXentry, default: instrument:NXinstrument/collection:NXcollection">
+      <type xsi:type="pogoDsl:StringType"/>
+      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
+      <DefaultPropValue>&quot;instrument:NXinstrument/collection:NXcollection&quot;</DefaultPropValue>
+    </deviceProperties>
     <commands name="State" description="This command gets the device state (stored in its device_state data member) and returns it to the caller." execMethod="dev_state" displayLevel="OPERATOR" polledPeriod="0">
       <argin description="none">
         <type xsi:type="pogoDsl:VoidType"/>
@@ -387,6 +392,14 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <properties description="JSON list of datasources to be switched into CanFail mode during creating configuration process" label="Datasources to be switched into CanFail mode" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
     </attributes>
+    <attributes name="ExtraLinkDataSources" attType="Scalar" rwType="READ_WRITE" displayLevel="OPERATOR" 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="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>
     <states name="ON" description="Server is ON">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
@@ -396,6 +409,6 @@
     <states name="RUNNING" description="Performing a query">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
-    <preferences docHome="./doc_html" makefileHome="/usr/share/pogo/preferences"/>
+    <preferences docHome="./doc_html" makefileHome="$(TANGO_DIR)/Libraries/cppserver/common"/>
   </classes>
 </pogoDsl:PogoSystem>

{nxsconfigserver-2.16.0/nxsconfigserver.egg-info → nxsconfigserver-2.17.0}/PKG-INFO

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

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/doc_html/Attributes.html

@@ -99,6 +99,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to be switched into CanFail mode during creating configuration process </td>
 	</tr>
+	<tr>
+		<td> <a href="AttrExtraLinkDataSources.html"> ExtraLinkDataSources </a> </td>
+		<td> false </td>
+		<td> false </td>
+		<td> Scalar </td>
+		<td> READ_WRITE </td>
+		<td> Tango::DEV_STRING </td>
+		<td> OPERATOR </td>
+		<td> JSON list of datasources to which links will be added </td>
+	</tr>
 </table>
 <br><br>
 <hr>

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/doc_html/FullDocument.html

@@ -4,52 +4,6 @@
 <title> NXSConfigServer Tango Class User&lsquo;s Guide </title>
 </head>
 <body text="Black" bgcolor="White" link="Blue" vlink="Purple" alink="Red">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" >
-        <td align="center">
-            <a href="http://www.esrf.fr/" target=new>
-                <img src="http://www.esrf.fr/gifs/logo/80.gif" border=0 height="35"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.elettra.trieste.it/" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/elettra_logo.gif" border=0 height="35"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.synchrotron-soleil.fr/" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/soleil_logo.gif" border=0 height="35"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.cells.es/" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/alba.jpg" border=0 height="27"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.tango-controls.org/" target="_top">
-               <img src="http://www.esrf.fr/computing/cs/tango/tango_logo.jpg" alt=""  height="40" /></a>
-        </td>
-        <td align="center">
-            <a href="http://www.desy.de/html/home/index_eng.html" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/desy.gif" border=0 height="26"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.maxlab.lu.se/maxlab/max4/index.html" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/maxlab.gif" border=0 height="21"></a>
-        </td>
-        <td align="center">
-            <a href="http://www.frm2.tum.de/en/index.html" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/frm-2.jpg" border=0 height="24"></a>
-        </td>
-         <td align="center">
-            <a href="http://www.synchrotron.uj.edu.pl/" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/solaris_logo.gif" border=0 height="21"></a>
-        </td>
-         <td align="center">
-            <a href="http://www.anka.kit.edu/english/28.php" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/anka_blau_rot.png" border=0 height="25"></a>
-        </td>
-         <td align="center">
-            <a href="http://www.eli-hu.hu/" target=new>
-                <img src="http://www.esrf.fr/computing/cs/tango/eli-alps.jpg" border=0 height="32"></a>
-        </td>
-   </table>
 <hr>
 <br>
 <center><h2><u><b> NXSConfigServer Tango Python Class </b></u></h2></center>	<br><br>
@@ -99,6 +53,7 @@
 				<li> <a href="FullDocument.html#attrSTEPDataSources"> STEPDataSources </a>
 				<li> <a href="FullDocument.html#attrLinkDataSources"> LinkDataSources </a>
 				<li> <a href="FullDocument.html#attrCanFailDataSources"> CanFailDataSources </a>
+				<li> <a href="FullDocument.html#attrExtraLinkDataSources"> ExtraLinkDataSources </a>
 			</ul>
 			<li> <a href="FullDocument.html#states">       States       </a>
 		</ul>
@@ -188,6 +143,12 @@
 		<td> String </td>
 		<td> &quot;XCS&quot; <br> </td>
 	</tr>
+	<tr>
+		<td> ExtraLinkPath </td>
+		<td> extra link path below NXentry, default: instrument:NXinstrument/collection:NXcollection </td>
+		<td> String </td>
+		<td> &quot;instrument:NXinstrument/collection:NXcollection&quot; <br> </td>
+	</tr>
 </table>
 <br><br>
 <hr>
@@ -1870,6 +1831,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to be switched into CanFail mode during creating configuration process </td>
 	</tr>
+	<tr>
+		<td> <a href="AttrExtraLinkDataSources.html"> ExtraLinkDataSources </a> </td>
+		<td> false </td>
+		<td> false </td>
+		<td> Scalar </td>
+		<td> READ_WRITE </td>
+		<td> Tango::DEV_STRING </td>
+		<td> OPERATOR </td>
+		<td> JSON list of datasources to which links will be added </td>
+	</tr>
 </table>
 <br><br>
 <hr>
@@ -3214,6 +3185,173 @@
 </table>
 <br><br>
 <hr>
+<a name="attrExtraLinkDataSources"> </a>
+<br><br><br>
+<font size="+1"><u><b> Attribute ExtraLinkDataSources : </b></u></font>
+<ul>
+	JSON list of datasources to which links will be added
+</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_WRITE </td>
+				</tr>
+				<tr>
+					<td> Data Type </td>
+					<td> Tango::DEV_STRING </td>
+				</tr>
+				<tr>
+					<td> Display Level </td>
+					<td> OPERATOR </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 allowed for </td>
+					<td> All states </td>
+				</tr>
+				<tr>
+					<td> Write allowed for </td>
+					<td> All states </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> Datasources to which extra links will be added </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.16.0 → nxsconfigserver-2.17.0}/doc_html/Properties.html

@@ -24,6 +24,12 @@
 		<td> String </td>
 		<td> &quot;XCS&quot; <br> </td>
 	</tr>
+	<tr>
+		<td> ExtraLinkPath </td>
+		<td> extra link path below NXentry, default: instrument:NXinstrument/collection:NXcollection </td>
+		<td> String </td>
+		<td> &quot;instrument:NXinstrument/collection:NXcollection&quot; <br> </td>
+	</tr>
 </table>
 </body>
 </html>

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/nxsconfigserver/Merger.py

@@ -131,9 +131,18 @@ class Merger(object):
         #: (:obj:`list` <:obj:`str`> ) aliased to add links
         self.linkdatasources = []
 
+        #: (:obj:`list` <:obj:`str`> ) aliased to add extralinks
+        self.extralinkdatasources = []
+
         #: (:obj:`list` <:obj:`str`> ) aliased to switch to CanFial mode
         self.canfaildatasources = []
 
+        #: (:obj:`list` <:obj:`str`> ) extra link path
+        self.extralinkpath = []
+
+        #: (:obj:`list` <:obj:`str`> ) data link path
+        self.linkpath = [("data", "NXdata")]
+
         #: (:obj:`str`) datasource label
         self.__dsvars = "$datasources."
 
@@ -155,6 +164,8 @@ class Merger(object):
 
         :param node: dom node
         :type node: :obj:`xml.etree.ElementTree.Element`
+        :param ancestors: list with NeXus path nodes (tag, name, type)
+        :type ancestors: :obj:`list`< (:obj:`str`,:obj:`str`,:obj:`str`) >
         :returns: xml path
         :rtype: :obj:`str`
         """
@@ -178,6 +189,8 @@ class Merger(object):
         :type elem1: :obj:`xml.etree.ElementTree.Element`
         :param elem2: second element
         :type elem2: :obj:`xml.etree.ElementTree.Element`
+        :param ancestors: list with NeXus path nodes (tag, name, type)
+        :type ancestors: :obj:`list`< (:obj:`str`,:obj:`str`,:obj:`str`) >
         :returns: bool varaible if two elements are mergeable
         :rtype: :obj:`bool`
         """
@@ -244,6 +257,8 @@ class Merger(object):
         :type elem1: :obj:`xml.etree.ElementTree.Element`
         :param elem2: second element
         :type elem2: :obj:`xml.etree.ElementTree.Element`
+        :param parent: the given parent node
+        :type parent: :obj:`xml.etree.ElementTree.Element`
         """
         attr2 = elem2.attrib
         texts = []
@@ -283,11 +298,20 @@ class Merger(object):
 
         parent.remove(elem2)
 
-    def __mergeChildren(self, node, ancestors, entrynode=None):
+    def __mergeChildren(self, node, ancestors, entrynode=None,
+                        datanode=None, linknode=None):
         """ merge the given node
 
         :param node: the given node
         :type node: :obj:`xml.etree.ElementTree.Element`
+        :param ancestors: list with NeXus path nodes (tag, name, type)
+        :type ancestors: :obj:`list`< (:obj:`str`,:obj:`str`,:obj:`str`) >
+        :param entrynode: entry node
+        :type entrynode: :class:`xml.etree.ElementTree.Element`
+        :param datanode: data node
+        :type datanode: :class:`xml.etree.ElementTree.Element`
+        :param linknode: link node
+        :type linknode: :class:`xml.etree.ElementTree.Element`
         """
         if node is not None and node.tag != "definition":
             newancestors = tuple(
@@ -328,11 +352,18 @@ class Merger(object):
                                self.__getAncestors(child, newancestors)),
                             [child])
 
-                self.__mergeChildren(child, newancestors, entrynode)
+                self.__mergeChildren(child, newancestors, entrynode,
+                                     datanode, linknode)
                 if cName in self.switchable and self.switchdatasources:
                     self.__switch(child)
                 if cName in self.linkable and self.linkdatasources:
-                    self.__addlink(child, newancestors, entrynode)
+                    datanode = self.__addlink(
+                        child, newancestors, entrynode, datanode,
+                        self.linkdatasources, self.linkpath)
+                if cName in self.linkable and self.extralinkdatasources:
+                    linknode = self.__addlink(
+                        child, newancestors, entrynode, linknode,
+                        self.extralinkdatasources, self.extralinkpath)
                 if cName in self.switchable and self.canfaildatasources:
                     self.__canfail(child)
 
@@ -465,27 +496,38 @@ class Merger(object):
             if stnode is not None and dsnode is not None:
                 stnode.attrib["canfail"] = "true"
 
-    def __addlink(self, node, ancestors, entrynode):
+    def __addlink(self, node, ancestors, entrynode, linknode, linkdatasources,
+                  linkpath=None):
         """ add link in NXdata group
 
         :param node: the given node
         :type node: :obj:`xml.etree.ElementTree.Element`
+        :param ancestors: list with NeXus path nodes (tag, name, type)
+        :type ancestors: :obj:`list`< (:obj:`str`,:obj:`str`,:obj:`str`) >
+        :param entrynode: root node
+        :type entrynode: :class:`xml.etree.ElementTree.Element`
+        :param linknode: the given link node
+        :type linknode: :obj:`xml.etree.ElementTree.Element`
+        :param linkpath: list with NeXus path (name, type)
+        :type linkpath: :obj:`list` < (:obj:`str`,:obj:`str`) >
+        :returns: the current link node
+        :rtype: :obj:`xml.etree.ElementTree.Element`
         """
         if node is not None:
             dsname = None
             dsnode = None
 
             dsname, dsnode = self.__getTextDataSource(
-                node, self.linkdatasources)
+                node, linkdatasources)
             for child in node:
                 cName = unicode(child.tag)
                 if cName == 'datasource':
                     dsname = child.get("name")
-                    if dsname in self.linkdatasources:
+                    if dsname in linkdatasources:
                         dsnode = child
                     else:
                         dsname, dsnode = self.__getTextDataSource(
-                            child, self.linkdatasources)
+                            child, linkdatasources)
                 if dsnode is not None:
                     break
             if dsnode is not None:
@@ -494,46 +536,76 @@ class Merger(object):
                 for anc in reversed(ancestors):
                     path.append((anc[1], anc[2]))
                 linkfound = False
-                datanode = None
                 if entrynode is not None:
-                    for gchild in entrynode:
-                        if gchild.get("name") == 'data' \
-                           and gchild.get("type") == 'NXdata':
-                            datanode = gchild
-                            for dchild in datanode:
-                                if dchild.get("name") == dsname:
-                                    linkfound = True
+                    if linknode is None:
+                        # found linknode
+                        parent = entrynode
+                        for nm, tp in linkpath:
+                            node = None
+                            for gchild in parent:
+                                if gchild.get("name") == nm \
+                                   and gchild.get("type") == tp:
+                                    node = gchild
                                     break
+                            if node is None:
+                                break
+                            else:
+                                parent = node
+                        else:
+                            linknode = parent
+
+                    if linknode is not None:
+                        for dchild in linknode:
+                            if dchild.get("name") == dsname:
+                                linkfound = True
+                                break
                     if not linkfound:
-                        self.__createLink(entrynode, datanode, path)
+                        linknode = self.__createLink(
+                            entrynode, linknode, path, linkpath)
+        return linknode
 
-    def __createLink(self, entry, data, path):
+    def __createLink(self, entrynode, linknode, path, linkpath=None):
         """ create link on given node
 
-        :param root: root node
-        :type root: :class:`xml.etree.ElementTree.Element`
-        :param node: the given node
-        :type node: :obj:`xml.etree.ElementTree.Element`
+        :param entrynode: root node
+        :type entrynode: :class:`xml.etree.ElementTree.Element`
+        :param linknode: the given link node
+        :type linknode: :obj:`xml.etree.ElementTree.Element`
         :param path: list with NeXus path (name, type)
-        :type node: :obj:`list` < (:obj:`str`,:obj:`str`) >
+        :type path: :obj:`list` < (:obj:`str`,:obj:`str`) >
+        :param linkpath: list with NeXus path (name, type)
+        :type linkpath: :obj:`list` < (:obj:`str`,:obj:`str`) >
+        :returns: the current link node
+        :rtype: :obj:`xml.etree.ElementTree.Element`
         """
-
         if path:
             target, dsname = path[0]
             if target:
-                if data is None:
-                    data = etree.Element("group")
-                    entry.append(data)
-                    data.attrib["type"] = "NXdata"
-                    data.attrib["name"] = "data"
+                if linknode is None:
+                    linknode = entrynode
+                    if linkpath is None:
+                        linkpath = [("data", "NXdata")]
+                    for nm, tp in linkpath:
+                        for gchild in linknode:
+                            if gchild.get("name") == nm \
+                                  and gchild.get("type") == tp:
+                                linknode = gchild
+                                break
+                        else:
+                            node = etree.Element("group")
+                            linknode.append(node)
+                            linknode = node
+                            linknode.attrib["type"] = tp
+                            linknode.attrib["name"] = nm
                 for gname, gtype in path[1:]:
                     target = "%s:%s/" % (gname, gtype) + target
                 target = "/" + target
                 if dsname:
                     link = etree.Element("link")
-                    data.append(link)
+                    linknode.append(link)
                     link.attrib["target"] = "%s" % target
                     link.attrib["name"] = dsname
+        return linknode
 
     def collect(self, components):
         """ collects the given components in one DOM tree

{nxsconfigserver-2.16.0 → nxsconfigserver-2.17.0}/nxsconfigserver/NXSConfigServer.py

@@ -89,6 +89,7 @@ class NXSConfigServer(tango.LatestDeviceImpl):
         self.set_state(tango.DevState.ON)
         self.get_device_properties(self.get_device_class())
         self.xmlc.versionLabel = self.VersionLabel
+        self.xmlc.extraLinkPath = self.ExtraLinkPath
 
     def always_executed_hook(self):
         """ Always excuted hook method
@@ -263,6 +264,39 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def read_ExtraLinkDataSources(self, attr):
+        """ Read ExtraLinkDataSources attribute
+
+        :param attr: extra link datasources attribute
+        :type attr: :class:`tango.Attribute`
+        """
+        self.debug_stream("In read_ExtraLinkDataSources()")
+        attr.set_value(self.xmlc.extralinkdatasources or "")
+
+    def write_ExtraLinkDataSources(self, attr):
+        """ Write ExtraLinkDataSources attribute
+
+        :param attr: extra link datasources attribute
+        :type attr: :class:`tango.Attribute`
+        """
+        self.debug_stream("In write_ExtraLinkDataSources()")
+        if self.is_ExtraLinkDataSources_write_allowed():
+            self.xmlc.extralinkdatasources = attr.get_write_value() or ""
+        else:
+            self.warn_stream("To change the settings please close the server.")
+            raise Exception(
+                "To change the settings please close the server.")
+
+    def is_ExtraLinkDataSources_write_allowed(self):
+        """ ExtraLinkDataSources attribute Write State Machine
+
+        :returns: True if the operation allowed
+        :rtype: :obj:`bool`
+        """
+        if self.get_state() in [tango.DevState.RUNNING]:
+            return False
+        return True
+
     def read_CanFailDataSources(self, attr):
         """ Read CanFailDataSources attribute
 
@@ -1135,6 +1169,11 @@ class NXSConfigServerClass(tango.DeviceClass):
         [tango.DevString,
          "version label",
          ["XCS"]],
+        'ExtraLinkPath':
+        [tango.DevString,
+         "extra link NeXus path below NXentry. "
+         "Default: instrument:NXinstrument/collection:NXcollection",
+         ["instrument:NXinstrument/collection:NXcollection"]],
     }
 
     #: (:obj:`dict` <:obj:`str`, \
@@ -1299,6 +1338,15 @@ class NXSConfigServerClass(tango.DeviceClass):
              'description': "JSON list of datasources"
              "to which links will be added",
         }],
+        'ExtraLinkDataSources':
+        [[tango.DevString,
+          tango.SCALAR,
+          tango.READ_WRITE],
+         {
+             'label': "Datasources to which extra links will be added",
+             'description': "JSON list of datasources"
+             "to which extra links will be added",
+        }],
         'CanFailDataSources':
         [[tango.DevString,
           tango.SCALAR,