Changeset 79

Timestamp:

Nov 6, 2009 10:35:02 AM (14 years ago)

Author:

jemian

Message:

Refs #2: progress ...

Location:

epics2xml

Files:

• config.xml (modified) (1 diff)
• display.xsl (modified) (1 diff)
• epics2xml.py (modified) (7 diffs)
• pvdata.xml (modified) (2 diffs)

epics2xml/config.xml

@@ -23 +23 @@
         <description>APS Storage ring current, mA</description>
     </pv>
+    <pv name="APS:BarometricPressure:MBR" rate="monitor">
+        <description>ANL barometric pressure, mbar</description>
+    </pv>
 </epics2xml>

epics2xml/display.xsl

@@ -25 +25 @@
         </xsl:element>
         <xsl:element name="body">
-            <xsl:attribute name="bgcolor">#f0f0f8</xsl:attribute>
+<!--            <xsl:attribute name="bgcolor">#f0f0f8</xsl:attribute>-->
             <xsl:element name="h1"><xsl:value-of select="title"/></xsl:element>
             <xsl:element name="h2">EPICS data</xsl:element>
+            <xsl:element name="p">
+                file written:
+                <xsl:value-of select="@timeStamp"/>
+            </xsl:element>
             <xsl:element name="table">
                 <xsl:attribute name="bd">2</xsl:attribute>

epics2xml/epics2xml.py

@@ -27 +27 @@
 from xml.dom import minidom
 import datetime
-import copy
-import pvConnect
+#import copy
+#import pvConnect
 
 
@@ -46 +46 @@
 
     def GetConfigFile(self):
-        '''@return: name of XML settings file'''
-        return self.settingsFile
+        '''@return: name of XML configuration file'''
+        return self.configFile
 
     def SetConfigFile(self, thefile):
         '''set the name of XML configuration file
             @param thefile: [string] name of XML file with the configuration'''
-        self.settingsFile = thefile
+        self.configFile = thefile
 
     def Clear(self):
@@ -58 +58 @@
         self.db = {}
 
+    def ReadConfigFile(self):
+        '''read the configuration from a file into an internal dictionary (self.db)
+
+            @note: this method uses xml.dom.minidom (built into all Pythons)
+            @see: http://docs.python.org/library/xml.dom.minidom.html
+        '''
+        try:
+            doc = minidom.parse(self.configFile) # parse an XML file by name
+            assert doc.documentElement.tagName == self.rootElement
+        except IOError:
+            return 'Could not read the XML file: ' + self.configFile
+        except AssertionError:
+            return 'XML root element is not ' + self.rootElement
+        #... read all attributes from the root element
+        docElem = doc.documentElement
+        self.Clear()
+        version = self._get_attribute(docElem, "version", "not-specified")
+        try:
+            # only handle v1.0 resource configuration files
+            assert version == u'1.0'
+        except AssertionError:
+            doc.unlink()
+            return 'Cannot handle file version:', version
+        # file verified now
+
     def ReadXmlFile(self):
         '''read the settings from a file into an internal dictionary (self.db)
@@ -65 +90 @@
         '''
         try:
-            doc = minidom.parse(self.settingsFile) # parse an XML file by name
+            doc = minidom.parse(self.configFile) # parse an XML file by name
             assert doc.documentElement.tagName == self.rootElement
         except IOError:
-            return 'Could not read the XML file: ' + self.settingsFile
+            return 'Could not read the XML file: ' + self.configFile
         except AssertionError:
             return 'XML root element is not ' + self.rootElement
@@ -134 +159 @@
            @see: http://www.boddie.org.uk/python/XML_intro.html
         '''
-        out = open(self.settingsFile, 'w')
+        out = open(self.configFile, 'w')
         out.write(repr(self))
         out.close()
@@ -141 +166 @@
         #
         
-        return 'Saved settings to ' + self.settingsFile
+        return 'Saved settings to ' + self.configFile
 
     def _SetAttr(self, node, attribute, value):
@@ -227 +252 @@
 
 if __name__ == '__main__':
+    cf = Epics2Xml("config.xml")
+    cf.ReadConfigFile()
 #    rc = Settings("examples/test-settings.xml")
 #    rc.ReadXmlFile()

epics2xml/pvdata.xml

@@ -2 +2 @@
 <?xml-stylesheet type="text/xsl" href="display.xsl" ?>
 
-<pvdata version="1.0">
+<pvdata version="1.0" timeStamp="2009-11-06 10:32:00">
     <title>epics2xml: demonstration of function</title>
     <pv name="S:SRcurrentAI" rate="monitor" timeStamp="2009-11-06 09:26:00">
@@ -8 +8 @@
         <value>99.9853</value>
     </pv>
+    <pv name="APS:BarometricPressure:MBR" rate="monitor" timeStamp="2009-11-06 10:28:00">
+        <description>ANL barometric pressure, mbar</description>
+        <value>992.083</value>
+    </pv>
 </pvdata>