nxsconfigserver 2.18.1__py3-none-any.whl → 2.20.0__py3-none-any.whl

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',
@@ -223,11 +225,14 @@ class Merger(object):
             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):
@@ -530,6 +535,10 @@ class Merger(object):
                             child, linkdatasources)
                 if dsnode is not None:
                     break
+            if dsname:
+                dsname = dsname.replace(" ", "_").replace("/", "_").replace(
+                    ":", "_").replace(".", "_").replace("\\", "_").replace(
+                        ";", "_").lower()
             if dsnode is not None:
                 path = []
                 path = [(node.get("name"), dsname)]

nxsconfigserver/NXSConfigServer.py

@@ -135,6 +135,26 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def read_MergedXML(self, attr):
+        """ Read MergedXML attribute
+
+        :param attr: xml string attribute
+        :type attr: :class:`tango.Attribute`
+        """
+        self.debug_stream("In read_MergedXML()")
+        attr.set_value(self.xmlc.mergedxml)
+
+    def is_MergedXML_allowed(self, _):
+        """ MergedXML attribute 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 read_Selection(self, attr):
         """ Read Selection attribute
 
@@ -765,6 +785,7 @@ class NXSConfigServer(tango.LatestDeviceImpl):
 
         :brief: Creates the NDTS configuration script from the
                 given components. The result is strored in XMLString
+                and MergedXML
 
         :param argin:  DevVarStringArray    list of component names
         :type argin: :obj:`list` <:obj:`str`>
@@ -1316,6 +1337,16 @@ class NXSConfigServerClass(tango.DeviceClass):
              "it contains the resulting XML configuration.",
              'Display level': tango.DispLevel.EXPERT,
         }],
+        'MergedXML':
+        [[tango.DevString,
+          tango.SCALAR,
+          tango.READ],
+         {
+             'label': "XML for merged components",
+             'description':
+             "XML for merged components without applied variables ",
+             'Display level': tango.DispLevel.EXPERT,
+         }],
         'Selection':
         [[tango.DevString,
           tango.SCALAR,

nxsconfigserver/Release.py

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

nxsconfigserver/XMLConfigurator.py

@@ -86,6 +86,8 @@ class XMLConfigurator(object):
         self._streams = StreamSet(weakref.ref(server) if server else None)
         #: (:obj:`str`) XML config string
         self.xmlstring = ""
+        #: (:obj:`str`) Merged coponents in XML string without variables
+        self.mergedxml = ""
         #: (:obj:`str`) component selection
         self.selection = "{}"
         #: (:obj:`str`) JSON string with arguments to connect to database
@@ -976,13 +978,18 @@ class XMLConfigurator(object):
             allnames = self.dependentComponents(
                 list(set(self.__mydb.mandatory() + names)))
             comps = self.__mydb.components(list(set(allnames)))
+            xml = self.__merge(comps, skip=withVariables)
             if withVariables:
-                cpvars = self.__variableComponentValues(comps)
-                comps = [self.__attachVariables(cp, cpvars) for cp in comps]
-            xml = self.__merge(comps)
+                self.mergedxml = xml or ""
+                if xml is not None:
+                    comps = [xml]
+                    cpvars = self.__variableComponentValues(comps)
+                    comps = [self.__attachVariables(cp, cpvars)
+                             for cp in comps]
+                    xml = self.__merge(comps)
         return xml if xml is not None else ""
 
-    def __merge(self, xmls):
+    def __merge(self, xmls, skip=False):
         """ merges the give component xmls
 
         :param xmls: list of component xmls
@@ -996,6 +1003,7 @@ class XMLConfigurator(object):
         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()
         return mgr.toString()

{nxsconfigserver-2.18.1.dist-info → nxsconfigserver-2.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.18.1
+Version: 2.20.0
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -99,21 +99,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.20.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
+nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
+nxsconfigserver/MYSQLDataBase.py,sha256=54bFG4KFLMkVYMme3bcybve24qgsxKTvCo7vP6RDjTI,22755
+nxsconfigserver/Merger.py,sha256=U8MHssm3j_LSXnaQWDrcsNL3WTCjGhndZk5ghX0lvZw,25734
+nxsconfigserver/NXSConfigServer.py,sha256=5zOFJXPfx9qu_pWCcvsCWluHsDfMOKRuAP5TUpuBtyI,48059
+nxsconfigserver/Release.py,sha256=ppIx2NmQN559RH_J9_oB6D0XxZ1haPI1F-OE7-JpN1c,895
+nxsconfigserver/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
+nxsconfigserver/XMLConfigurator.py,sha256=bWJuJHvHsXNKZuFAcXi_Er5O_ZhsR24FFOzoFubp3eg,37573
+nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
+nxsconfigserver-2.20.0.data/scripts/NXSConfigServer,sha256=VEAkby0R6UyckF-OofkVDPx3Mkn6rjPrl2xMbbBXqwo,986
+nxsconfigserver-2.20.0.dist-info/METADATA,sha256=6hna9733z74TKnHve2Txd6uXsqcdS-_9ficmQumIT5c,14580
+nxsconfigserver-2.20.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxsconfigserver-2.20.0.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
+nxsconfigserver-2.20.0.dist-info/RECORD,,

nxsconfigserver-2.18.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
-nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
-nxsconfigserver/MYSQLDataBase.py,sha256=54bFG4KFLMkVYMme3bcybve24qgsxKTvCo7vP6RDjTI,22755
-nxsconfigserver/Merger.py,sha256=t6xX2ETUIy1FYIXvmcEstTwKf9oq_jDtvXIDV6c4kV0,25327
-nxsconfigserver/NXSConfigServer.py,sha256=kxHx0vugHEin9j5c0iizvIbbi0Z5S6E8MoMDY7csN6k,47113
-nxsconfigserver/Release.py,sha256=ySev_ekpby7YKCnOCMkaWn88bJv1w9JD3gWLWmMGuoI,895
-nxsconfigserver/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
-nxsconfigserver/XMLConfigurator.py,sha256=xdifnewlTNIQ3PgHTBvBh83xJUf2qCnqC3Rkq24urzk,37220
-nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
-nxsconfigserver-2.18.1.data/scripts/NXSConfigServer,sha256=VEAkby0R6UyckF-OofkVDPx3Mkn6rjPrl2xMbbBXqwo,986
-nxsconfigserver-2.18.1.dist-info/METADATA,sha256=gl_Fm2AY2SrX9TLjvB8U-Uu4ACAlf_lyCQqw8e94J-A,14440
-nxsconfigserver-2.18.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxsconfigserver-2.18.1.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
-nxsconfigserver-2.18.1.dist-info/RECORD,,