Changeset 34977

Timestamp:

2021-03-26T17:51:23+13:00 (3 years ago)

Author:

davidb

Message:

mini code tidy-up

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/errata-categories/esc-wikipedia-download-and-process-votes.py (modified) (4 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/errata-categories/esc-wikipedia-download-and-process-votes.py

@@ -52 +52 @@
     return header_to_vals
 
-def convert_cols_to_country_recs(header_to_vals,year):
-
-    country_recs = {}
-
+def convert_cols_to_country_year_recs(header_to_vals,year):
+
+    country_year_recs = {}
+
+    a_href_re = re.compile(r"^.*" + str(year) + r"$")
+    
     for country_tag in header_to_vals.get("Country"):
         # print("@@@@@ td = " + repr(country_tag));
         
-        country = country_tag.find("a",href=re.compile(r"^.*" + str(year) + r"$")).string
+        #country = country_tag.find("a",href=re.compile(r"^.*" + str(year) + r"$")).string
+        country = country_tag.find("a",href=a_href_re).string
         # print("**** country = " + country)
-        
-        country_recs[country] = {}
+        country_year = country+str(year)
+        
+        country_year_recs[country_year] = {}
                     
     for key in header_to_vals.keys():
@@ -73 +77 @@
             country_tag = header_to_vals.get("Country")[l]
             country_flag_img = country_tag.find("img")
-            country = country_tag.find("a",href=re.compile(r"^.*" + str(year) + r"$")).string
+            #country = country_tag.find("a",href=re.compile(r"^.*" + str(year) + r"$")).string
+            country = country_tag.find("a",href=a_href_re).string
+            country_year = country+str(year)
             
             val = vals[l]
-            print("@@@ val = " + repr(val))
             
             if key == "Artist":
@@ -106 +111 @@
             #print("*** storing: " + country + "[" + key + "] = " + val)
             
-            country_recs[country][key] = val
-
-    return country_recs
-
-def output_country_recs(country_recs):
-
-    for country_name in country_recs.keys():
-        country_rec = country_recs.get(country_name)
+            country_year_recs[country_year][key] = val
+
+    return country_year_recs
+
+def output_country_year_recs(country_year_recs):
+
+    for country_name in country_year_recs.keys():
+        country_rec = country_year_recs.get(country_name)
 
         print("[" + country_name + "]")
@@ -164 +169 @@
     header_to_vals = html_tablerows_to_hashmap(table_rows)
 
-    country_recs = convert_cols_to_country_recs(header_to_vals,year)
+    country_year_recs = convert_cols_to_country_year_recs(header_to_vals,year)
 
     print()
     print("==========")
 
-    output_country_recs(country_recs)
+    output_country_year_recs(country_year_recs)