Changeset 35990 for main/trunk

Timestamp:

2022-01-11T21:16:22+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.sh (modified) (1 diff)
• 08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py (modified) (2 diffs)

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

@@ -4 +4 @@
 # prep_dir=essentia-audio-features
 
-python3 -u ./08b-COPY-CSV-AUDIO-FEATURES-TO-IMPORT_support.py $*
+python3 -u ./08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py $*
 
 

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

@@ -225 +225 @@
 
           print("  Copying: " + src_json_file + " => " + dst_json_file)
-#          shutil.copy(src_json_file,dst_json_file)
+          shutil.copy(src_json_file,dst_json_file)
 
           print("  Copying: " + src_json_file + " => " + dst_assoc_json_file)
-#          shutil.copy(src_json_file,dst_assoc_json_file)
+          shutil.copy(src_json_file,dst_assoc_json_file)
                     
 
 # Sort out contestant CSV files to copy into ../import area
 
-src_csv_filenames = []
+src_csv_files = []
 
 if start_year is None and end_year is None:
@@ -240 +240 @@
      #esc_cutoff_endyear = 2021
      
-     src_csv_filenames.append("contestants-1956.cvs")
-     src_csv_filenames.append(f"contestants-1957-to-{esc_cutoff_endyear}.cvs")
+     src_csv_files.append("contestants-1956.cvs")
+     src_csv_files.append(f"contestants-1957-to-{esc_cutoff_endyear}.cvs")
      
 elif start_year is None :
-     src_csv_filenames.append(f"contestants-1956-to-{end_year}.cvs")
+     src_csv_files.append(f"contestants-1956-to-{end_year}.cvs")
 
 elif end_year is None :
-     src_csv_filenames.append(f"contestants-{start_year}-to-{esc_cutoff_endyear}.cvs")
+     src_csv_files.append(f"contestants-{start_year}-to-{esc_cutoff_endyear}.cvs")
 else:
-     src_csv_filenames.append(f"contestants-{start_year}-to-{end_year}.cvs")
+     src_csv_files.append(f"contestants-{start_year}-to-{end_year}.cvs")
 
 
 dst_csv_dirs = [os.path.join(import_dir,"inaugural-year"), os.path.join(import_dir,"missing-cat-countries") ]
 
-
 sparql_result_dirs = glob(os.path.join(import_dir,"sparqlresults-local--countries-in-esc-by-year-*/"))
-
 dst_csv_dirs += sparql_result_dirs
 
-print("****** src_csv_filename = " + repr(src_csv_filenames))
-
-print("****** dst_csv_dirs = " + repr(dst_csv_dirs))
-
-
-# cp contestants-2015.csv ../../import/sparqlresults-local--countries-in-esc-by-year-just-2015--with-errata/metadata-contestants-2015.csv 
+
+print()
+print("Copying the following Contestants CSV files into 'import'")
+
+for dst_dir in dst_csv_dirs:
+     for src_csv_file in src_csv_files:
+
+          src_csv_filename = os.path.join(prep_dir,src_csv_file)
+          dst_csv_filename = os.path.join(dst_dir,src_csv_file)
+          
+          print("  Copying: " + src_csv_filename + " => " + dst_csv_filename)
+          shutil.copy(src_csv_filename,dst_filename)
+
+