Changeset 35992 for main

Timestamp:

2022-01-11T22:15:07+13:00 (2 years ago)

Author:

davidb

Message:

Changes after testing

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare

Files:

• 08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py (modified) (2 diffs)
• PREPARE-ALL.sh (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py

@@ -240 +240 @@
      #esc_cutoff_endyear = 2021
      
-     src_csv_files.append("contestants-1956.cvs")
-     src_csv_files.append(f"contestants-1957-to-{esc_cutoff_endyear}.cvs")
+     src_csv_files.append("contestants-1956.csv")
+     src_csv_files.append(f"contestants-1957-to-{esc_cutoff_endyear}.csv")
      
 elif start_year is None :
-     src_csv_files.append(f"contestants-1956-to-{end_year}.cvs")
+     src_csv_files.append(f"contestants-1956-to-{end_year}.csv")
 
 elif end_year is None :
-     src_csv_files.append(f"contestants-{start_year}-to-{esc_cutoff_endyear}.cvs")
+     src_csv_files.append(f"contestants-{start_year}-to-{esc_cutoff_endyear}.csv")
 else:
-     src_csv_files.append(f"contestants-{start_year}-to-{end_year}.cvs")
+     src_csv_files.append(f"contestants-{start_year}-to-{end_year}.csv")
 
 
@@ -268 +268 @@
           
           print("  Copying: " + src_csv_filename + " => " + dst_csv_filename)
-          shutil.copy(src_csv_filename,dst_filename)
-
-
+          shutil.copy(src_csv_filename,dst_csv_filename)
+
+

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/PREPARE-ALL.sh

@@ -51 +51 @@
     ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh \
     && \
-    ./08b-COPY-AUDIO-FEATURES-TO-IMPORT.py
+    ./08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT.sh
 fi
 
@@ -58 +58 @@
     ./09-GEN-PROBLEM-LOD-LISTS.sh
 fi
+