Changeset 29140 for branches/sc_branches/psps_testing/psi/psi_inquisitor.py

Timestamp:

Sep 10, 2010, 9:39:28 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Unstable. Added logging (no tused yet. p2 is currently very slow

File:

• branches/sc_branches/psps_testing/psi/psi_inquisitor.py (modified) (4 diffs)

branches/sc_branches/psps_testing/psi/psi_inquisitor.py

@@ -2 +2 @@
 from suds.xsd.doctor import Import, ImportDoctor
 from suds import sudsobject
+from utilities.util import convert
+import unicodedata
 
 class PsiInquisitor:
@@ -42 +44 @@
         >>> # we cannot guarantee the order in result
         >>> print result['items']
-        [{u'[frameID]': u'105439'}]
+        [{'frameID': 105439}]
         >>> print result['fields']
-        [u'[frameID]']
+        ['[frameID]']
         >>> print result['types']
-        {u'[frameID]': u'Integer'}
+        {'[frameID]': 'Integer'}
         >>> # This test has to be completed with exhaustive ones...
         >>> # e.g. unit tests against the csr data base.
@@ -62 +64 @@
         line_count = 0
         for line in lines:
+            # Unicode normalization comes from
+            # http://www.peterbe.com/plog/unicode-to-ascii. I don't
+            # know where the NFKD means...
+            line = unicodedata.normalize('NFKD', line).encode('ascii','ignore')
             if first_line_not_seen:
                 # Build up the field list and the types dictionary
@@ -85 +91 @@
                 element = {}
                 for i in range(len(values)):
-                    element[contents['fields'][i]] = values[i]
+                    field_name = contents['fields'][i].replace('[', 
+                                                               '').replace(']', 
+                                                                           '')
+                    element[field_name] = convert(types_dictionary[contents['fields'][i]],
+                                                  values[i])
                 contents['items'].append(element)
         return contents