Changeset 34907

Timestamp:

2021-02-21T15:05:17+13:00 (3 years ago)

Author:

davidb

Message:

Name change to better reflect what the script does

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsx-tocountry-jsonmetadata.py (moved) (moved from main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsx-to-jsonmetadata.py ) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsx-tocountry-jsonmetadata.py

@@ -35 +35 @@
 
 
-def create_to_country_voting_groups(data_hashmap_array):
+def create_to_country_voting_groups(data_hashmap_array_finals):
 
     # Example values for header-names
-    #   (semi-) final: f, sf
+    #   (semi-) final:      f, sf
     #   Jury or Televoting: J, T
-    #   Year: 1975
-    #   To country: Belgium
-    #   From country: Belgium
-    #   Edition: 1975f, 1975sf
-
-    
-    # Filter down to just the voting results concerning finals
-    data_hashmap_array_finals = list(filter(xlsxutil.filter_finalist_votes, data_hashmap_array))
+    #   Year:               1975, ...
+    #   To country:         Belgium
+    #   From country:       Belgium
+    #   Edition:            1975f, 1975sf
+
+    
+#    # Filter down to just the voting results concerning finals
+#    data_hashmap_array_finals = list(filter(xlsxutil.filter_finalist_votes, data_hashmap_array))
 
     # Sort so array entries are grouped by the country receiving the votes in a given year
@@ -186 +186 @@
     print("Number of data rows: " + str(len(data_hashmap_array)))
 
-    
-    to_country_year_voting_groups = create_to_country_voting_groups(data_hashmap_array)
+
+    # Filter down to just the voting results concerning finals
+    data_hashmap_array_finals = list(filter(xlsxutil.filter_finalist_votes, data_hashmap_array))
+
+    print("Number of finalist voting data rows: " + str(len(data_hashmap_array_finals)))
+    
+    to_country_year_voting_groups = create_to_country_voting_groups(data_hashmap_array_finals)
 
     # Debug output