base-theme: added binary file: xml-iized import fails on initZMS

Products/zms/_xmllib.py

@@ -466,12 +466,20 @@ def toCdata(self, s, xhtml=False):
 
   # Return Text in CDATA.
   elif s is not None:
-    if isinstance(s, bytes):
-      s = s.decode('utf-8')
-    # Hack for invalid characters
-    s = s.replace(chr(30), '')
-    # Hack for nested CDATA
-    s = re.compile(r'\<\!\[CDATA\[(.*?)\]\]\>').sub(r'<!{CDATA{\1}}>', s)
+    try:
+      if isinstance(s, bytes):
+        s = s.decode('utf-8')
+      # Hack for invalid characters
+      s = s.replace(chr(30), '')
+      # Hack for nested CDATA
+      s = re.compile(r'\<\!\[CDATA\[(.*?)\]\]\>').sub(r'<!{CDATA{\1}}>', s)
+    except:
+      # @zmsdev: If decoding fails, it just nests as CDATA
+      # toCdata() shall not and cannot be used to handle binary file data
+      # correctly in terms of creating a Zope file/image object
+      # Ref: ConfManager.getConfXmlFile() ==> standard.toXmlString(self, l)
+      standard.writeBlock(self, "[toCdata]: WARNING - Cannot create file/image object from binary data")
+      pass
     # Wrap with CDATA
     rtn = '<![CDATA[%s]]>'%s
 

Products/zms/conf/metaobj_manager/com.zms.theme.default/theme_zms5_base/__init__.py

@@ -109,3 +109,21 @@ class Attrs:
 			,"name":"custom_zmsdemo.css"
 			,"repetitive":0
 			,"type":"File"}
+
+		theme_zms5_base_common_img_zmslogosvg = {"default":""
+			,"id":"theme_zms5_base/common/img/zmslogo.svg"
+			,"keys":[]
+			,"mandatory":0
+			,"multilang":0
+			,"name":"zmslogo.svg"
+			,"repetitive":0
+			,"type":"File"}
+
+		theme_zms5_base_common_img_faviconico = {"default":""
+			,"id":"theme_zms5_base/common/img/favicon.ico"
+			,"keys":[]
+			,"mandatory":0
+			,"multilang":0
+			,"name":"favicon.ico"
+			,"repetitive":0
+			,"type":"File"}