Changeset 2835 for TI05-delivery/ows_framework/trunk

Timestamp:

21/08/07 12:36:34 (12 years ago)

Author:

lawrence

Message:

Slightly more elegant default xml encoding solution

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models

Files:

• ndgRetrieve.py (modified) (1 diff)
• xmlHandler2.py (modified) (2 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgRetrieve.py

@@ -73 +73 @@
     
     try:
-    x=xmlHandler2.xmlHandler(r,string=1)
-    return 1,x
+        x=xmlHandler2.xmlHandler(r,string=1)
+        return 1,x
     except Exception,e:
         logString='Document parse for [%s] failed [%s]'%(uri,e)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/xmlHandler2.py

@@ -35 +35 @@
         # Unfortunately we never know whether the incoming xml content is
         # unicode or a string ...
+        encoding='utf-8'
         try:
-            self.xmls=unicode(self.xmls,'utf-8')
-        except:
-            pass
-        self.xmls=self.xmls.encode('utf-8','replace')
+            ss=xml[0:39].split('"')
+            if ss[2]=='encoding=': encoding=ss[3]
+        except:pass
+        try:
+            self.xmls=unicode(self.xmls,encoding)
+        except:pass
+        self.xmls=self.xmls.encode(encoding,'replace')
         
         self.realns={}            
@@ -49 +53 @@
             self.xmls=self.__fixXML(self.xmls)
             self.tree=ET.XML(self.xmls)
-        
-            
+
         self.__updatens()