Changeset 33224

Timestamp:

2019-06-26T16:48:48+12:00 (5 years ago)

Author:

davidb

Message:

Further code tidy-up

Location:

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

Files:

• xls-to-csv.py (modified) (3 diffs)
• xls-to-sanitized-csv.py (modified) (2 diffs)

main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xls-to-csv.py

@@ -143 +143 @@
                     header_name = u"TLA"
 
-#                header_name_utf8 = unicode(header_name).encode("utf-8")
                 header_name_utf8 = header_name.encode("utf-8")
                 metadata_name_utf8 = header_name_utf8.replace(" ", "")
@@ -184 +183 @@
                         # Check to see if companion PDF file present
                         # pdf_filename = os.path.join(excel_dirname,"pdfs",formatted_cell_value+".pdf")
-                        id = formatted_cell_value.replace(" ","")
+                        id = formatted_cell_value.replace(" ","-")
                         
                         pdf_file = id_to_relative_pdf_file(id)
@@ -202 +201 @@
                             print "Unbound id: '" + id + "'"
 
-                    if isinstance(formatted_cell_value, basestring):
-                        # Remove any trailing whitespace.  
-                        # Newline at end particular harmful for a entry in the CSV file
-                        formatted_cell_value = formatted_cell_value.rstrip();
-
-#                    formatted_cell_value_utf8 = unicode(formatted_cell_value).encode("utf-8")
+#                    if isinstance(formatted_cell_value, basestring):
+#                        # Remove any trailing whitespace.  
+#                        # Newline at end particular harmful for a entry in the CSV file
+#                        formatted_cell_value = formatted_cell_value.rstrip();
+
                     formatted_cell_value_utf8 = formatted_cell_value.encode("utf-8")
 

main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xls-to-sanitized-csv.py

@@ -11 +11 @@
     worksheet = workbook.sheet_by_index(xlsutil.worksheet_index_pos)
     ## worksheet = workbook.sheet_by_name(xlsutil.worksheet_name)
-
-    # excel_filename_split = os.path.split(excel_filename)
-    # excel_dirname = excel_filename_split[0]
-    # excel_file = excel_filename_split[1]
-    # excel_file_splitext = os.path.splitext(excel_file)
-    # excel_file_root = excel_file_splitext[0];
-
-    # sanitized_csv_filename  = os.path.join("for-download",excel_file_root+".csv")
 
     sanitized_csv_ofile = open(sanitized_csv_filename, 'wb')
@@ -49 +41 @@
                 header_col_j = header_names_mapping[header_name]
 
-#                cell_value = worksheet.cell_value(row_i,header_col_j)
-#
-#                cell_value_utf8 = unicode(cell_value).encode("utf-8")
-
                 cell_value_unicode = xlsutil.cell_value_tidy_unicode(worksheet,row_i,header_col_j)
-
                 cell_value_utf8 = cell_value_unicode.encode("utf-8")
-
-##                cell_value_utf8 = unicode(cell_value).encode("utf-8")
 
                 sanitized_utf8_row.append(cell_value_utf8)