X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FxmlManager.py;h=4b4fa61cfc08152cc98c29eb82b9f17756859910;hb=606f9b6618e0e0659d4029c607eaa04d9b3501cc;hp=ca8ec61e0d35869bd6f33a310ce5d20fe6168a62;hpb=831e2e9cfb55b58f7ad66a4796ec25b84c84e0e7;p=tools%2Fsat.git

diff --git a/src/xmlManager.py b/src/xmlManager.py
index ca8ec61..4b4fa61 100644
--- a/src/xmlManager.py
+++ b/src/xmlManager.py
@@ -17,6 +17,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 import os
+import shutil
+
 try: # For python2
     import sys
     reload(sys)  
@@ -25,7 +27,9 @@ except:
     pass
 
 import src
-from . import ElementTree as etree
+import src.ElementTree as etree
+
+verbose = False
 
 class XmlLogFile(object):
     '''Class to manage writing in salomeTools xml log file
@@ -44,7 +48,7 @@ class XmlLogFile(object):
         src.ensure_path_exists(os.path.dirname(filePath))
         # Initialize the field that contain the xml in memory
         self.xmlroot = etree.Element(rootname, attrib = attrib)
-    
+
     def write_tree(self, stylesheet=None, file_path = None):
         '''Write the xml tree in the log file path. Add the stylesheet if asked.
         
@@ -52,15 +56,15 @@ class XmlLogFile(object):
         '''
         log_file_path = self.logFile
         if file_path:
-            log_file_path = file_path
+          log_file_path = file_path
         try:
-            f = open(log_file_path, 'w')
+          with open(log_file_path, 'w') as f:
             f.write("<?xml version='1.0' encoding='utf-8'?>\n")
             if stylesheet:
-                f.write("<?xml-stylesheet type='text/xsl' href='%s'?>\n" % 
-                        stylesheet)    
-            f.write(etree.tostring(self.xmlroot, encoding='utf-8'))
-            f.close()
+                f.write("<?xml-stylesheet type='text/xsl' href='%s'?>\n" %  stylesheet)
+                pass
+            res= etree.tostring(self.xmlroot, encoding='utf-8')
+            f.write(res)
         except IOError:
             pass  
         
@@ -200,13 +204,61 @@ def write_report(filename, xmlroot, stylesheet):
     :param xmlroot etree.Element: the Etree element to write to the file
     :param stylesheet str: The stylesheet to add to the begin of the file
     """
-    if not os.path.exists(os.path.dirname(filename)):
-        os.makedirs(os.path.dirname(filename))
-
-    f = open(filename, "w")
-    f.write("<?xml version='1.0' encoding='utf-8'?>\n")
+    dirname = os.path.dirname(filename)
+    if not os.path.exists(dirname):
+      os.makedirs(dirname)
     if len(stylesheet) > 0:
-        f.write("<?xml-stylesheet type='text/xsl' href='%s'?>\n" % stylesheet)
-    f.write(etree.tostring(xmlroot, encoding='utf-8'))
-    f.close()   
-    
\ No newline at end of file
+       styleName = stylesheet
+    else:
+       styleName = None
+
+    with open(filename, "w") as f:
+      f.write("<?xml version='1.0' encoding='utf-8'?>\n")
+      if styleName is not None:
+        f.write("<?xml-stylesheet type='text/xsl' href='%s'?>\n" % styleName)
+      res = etree.tostring(xmlroot, encoding='utf-8')
+      # print("********** etree.tostring %s" % res)
+      f.write(res)
+
+    # create fileStyle in dirname if not existing
+    if styleName is not None:
+      styleFile = os.path.join(dirname, styleName)
+      if not os.path.exists(styleFile):
+        # copy if from "salomeTools/src/xsl"
+        srcdir = os.path.dirname(src.__file__)
+        srcFile = os.path.join(srcdir, "xsl", styleName)
+        if verbose: print("write_report %s style %s" % (srcFile, styleFile))
+        shutil.copy(srcFile, dirname)
+
+def escapeSequence(aStr):
+    """
+    See xml specification:
+    The ampersand character(&) and the left angle bracket(<) MUST NOT appear in their
+    literal form, except when used as markup delimiters, or within a comment, a processing
+    instruction, or a CDATA section.
+    If they are needed elsewhere, they MUST be escaped using either numeric character references
+    or the strings '&amp;' and '&lt;' respectively.
+    The right angle bracket(>) may be
+    represented using the string '&gt;', and MUST,
+    for compatibility, be escaped using either '&gt;' or a character reference
+    when it appears in the string " ]]> " in content,
+    when that string is not marking the end of a CDATA section.
+    You can use these escape sequences:
+    < (less - than) as &#60; or &lt;
+    > (greater - than) as &#62; or &gt;
+    & (ampersand) as &#38;
+    ' (apostrophe or single quote) as &#39;
+    " (double-quote) as &#34;
+    """
+    replaces = [ ('&', '&amp;'),
+                 ('>', '&gt;'),
+                 ('<', '&lt;'),
+                 ("'", '&#39;'),
+                 ('"', '&#34;'),
+                ]
+    res = aStr
+    for ini, fin in replaces: # order matters
+      res = res.replace(ini, fin)
+    return res
+
+