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

Timestamp:

2022-09-12T12:46:11+12:00 (20 months ago)

Author:

anupama

Message:

changes for empty ID, and also for a different format for Site No.

File:

• main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/prepare/xls-to-csv.py (modified) (5 diffs)

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

@@ -163 +163 @@
 
         row_i = xlsutil.header_row_pos + 1
+        print "num rows = ", num_rows
         while row_i<num_rows:
             num_cols = worksheet.row_len(row_i)
@@ -168 +169 @@
 
             found_pdf = False
+            empty_id = False
 
             for col_j in range(num_cols):
@@ -192 +194 @@
                         formatted_cell_value = formatted_cell_value.strip().replace(" ","-")
                         id = formatted_cell_value
-                        
-                        pdf_file = id_to_relative_pdf_file(id)
-                        pdf_file_root, pdf_ext = os.path.splitext(pdf_file)
-                        PDF_file = pdf_file_root + ".PDF"
-                    
-                        pdf_filename = os.path.join(excel_dirname,pdf_file)
-                        PDF_filename = os.path.join(excel_dirname,PDF_file)
-
-                        if os.path.exists(pdf_filename):
-                            found_pdf = True
-                            formatted_utf8_row.insert(0, pdf_file)
-                        elif os.path.exists(PDF_filename):
-                            found_pdf = True
-                            formatted_utf8_row.insert(0, PDF_file)
+                        if id == u"":
+                            empty_id = True
+                            print "empty id, row ",row_i
                         else:
-                            print "Unbound id: '" + id + "'"
-
-#                    if isinstance(formatted_cell_value, basestring):
+                            pdf_file = id_to_relative_pdf_file(id)
+                            pdf_file_root, pdf_ext = os.path.splitext(pdf_file)
+                            PDF_file = pdf_file_root + ".PDF"
+                            
+                            pdf_filename = os.path.join(excel_dirname,pdf_file)
+                            PDF_filename = os.path.join(excel_dirname,PDF_file)
+                            
+                            if os.path.exists(pdf_filename):
+                                found_pdf = True
+                                formatted_utf8_row.insert(0, pdf_file)
+                            elif os.path.exists(PDF_filename):
+                                found_pdf = True
+                                formatted_utf8_row.insert(0, PDF_file)
+                            else:
+                                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
@@ -237 +242 @@
                                 site_no_ordering = "%s%03d" % (site_no_primary_letter, site_no_primary_num)
                             else:
-                                if site_no != "various":
-                                    print "Warning: Site No '"+site_no+"' did not form Capital Letter followed by Digits"
-                                    print "Leaving value unchanged for column 'Site No Ordering'"
-
-                                site_no_ordering = site_no
+                                # try eg CA/5
+                                pattern=re.compile('^([A-Z][A-Z])')
+                                site_no_match2 = pattern.match(site_no)
+
+                                if site_no_match2:
+                                    site_no_ordering = site_no_match2.group(1)
+                                    print "matched second pattern ", site_no_ordering
+                                else:
+                                    if site_no != "various":
+                                        print "Warning: Site No '"+site_no+"' did not form Capital Letter followed by Digits"
+                                        print "Leaving value unchanged for column 'Site No Ordering'"
+                                        
+                                    site_no_ordering = site_no
                         else:
                             site_no_ordering = ""
@@ -252 +265 @@
             if found_pdf:
                 pdfbound_wr.writerow(formatted_utf8_row)
+            elif empty_id:
+                print "id was empty, not outputting row", formatted_utf8_row
             else:
                 unbound_wr.writerow(formatted_utf8_row)