Changeset 33222 for main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xlsutil.py

Timestamp:

2019-06-26T15:52:27+12:00 (5 years ago)

Author:

davidb

Message:

More careful working with unicode/utf8

File:

• main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xlsutil.py (modified) (2 diffs)

main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xlsutil.py

@@ -6 +6 @@
 ## worksheet_name = "Archaeological reports"
 
-sanitized_headers = [ "Report Identifier", "Author", "Title", "Produced By", "Date", "HNZPT Region", "File No",
-                      "Authority No", "Site No", "Relevant TLA's", "Record Type", "Date Entered" ]
+sanitized_headers = [ u"Report Identifier", u"Author", u"Title", u"Produced By", u"Date", u"HNZPT Region", u"File No",
+                      u"Authority No", u"Site No", u"Relevant TLA's", u"Record Type", u"Date Entered" ]
+
+def make_unicode(value):
+    value_unicode = value
+
+    if type(value) != unicode:
+        value_str = value
+        if type(value_str) != str:
+            value_str = str(value)
+        
+        value_unicode =  value_str.decode('utf-8')
+
+    return value_unicode
+
+
+def cell_value_tidy_unicode(worksheet,row_i,col_j):
+    value= worksheet.cell_value(row_i,col_j)
+
+    value_unicode = make_unicode(value)
+    value_unicode_stripped = value_unicode.strip()
+
+    return value_unicode_stripped
+
 
 def format_if_int(cell_value):
@@ -36 +58 @@
     found_header = False
     for col_j in range(num_header_cols):
-        header_cell_value = worksheet.cell_value(header_row_pos,col_j)
-        if header_cell_value == "Report Identifier":
+        header_cell_value = cell_value_tidy_unicode(worksheet,header_row_pos,col_j)
+        if header_cell_value == u"Report Identifier":
             found_header = True