Use pledges.csv files as override of candidates.csv files.

This commit is contained in:
Kim Taylor
2024-09-17 21:19:26 +10:00
parent e73afcc366
commit 0f89ddf779
2 changed files with 15 additions and 13 deletions

View File

@@ -1,15 +1,15 @@
<?php <?php
$options = getopt("", ["pledges-files:"]); $options = getopt("", ["candidates-files:"]);
if (isset($options['pledges-files'])) { if (isset($options['candidates-files'])) {
$pledges_files = $options['pledges-files']; $candidates_files = $options['candidates-files'];
} else { } else {
error_log("Error: Missing required option '--pledges-files'."); error_log("Error: Missing required option '--candidates-files'.");
exit(1); exit(1);
} }
$files = explode(" ", $pledges_files); $files = explode(" ", $candidates_files);
$candidate_data = []; $candidate_data = [];
foreach ($files as $key => $file) { foreach ($files as $key => $file) {
@@ -23,9 +23,7 @@ foreach ($files as $key => $file) {
exit(1); exit(1);
} }
$candidate_file = dirname($file)."/candidates.csv"; if (($handle = fopen($file, "r")) !== FALSE) {
if (($handle = fopen($candidate_file, "r")) !== FALSE) {
$headers = fgetcsv($handle); $headers = fgetcsv($handle);
while (($data = fgetcsv($handle)) !== FALSE) { while (($data = fgetcsv($handle)) !== FALSE) {
$candidate = []; $candidate = [];
@@ -43,7 +41,11 @@ foreach ($files as $key => $file) {
exit(1); exit(1);
} }
if (($handle = fopen($file, "r")) !== FALSE) { $pledges_file = dirname($file)."/pledges.csv";
if (!file_exists($pledges_file)) continue;
if (($handle = fopen($pledges_file, "r")) !== FALSE) {
$headers = fgetcsv($handle); $headers = fgetcsv($handle);
while (($data = fgetcsv($handle)) !== FALSE) { while (($data = fgetcsv($handle)) !== FALSE) {
$candidate = []; $candidate = [];

View File

@@ -13,14 +13,14 @@
DATA_PATH="../spl-data" DATA_PATH="../spl-data"
pledges_files=() candidates_files=()
for folder in "$DATA_PATH"/*; do for folder in "$DATA_PATH"/*; do
if test -f "$folder"/pledges.csv; then if test -f "$folder"/candidates.csv; then
pledges_files+=("$folder"/pledges.csv) candidates_files+=("$folder"/candidates.csv)
fi fi
done done
pledge_sed=$(php pledge-update/main.php --pledges-files "${pledges_files[*]}") pledge_sed=$(php pledge-update/main.php --candidates-files "${candidates_files[*]}")
content=$(sed "$pledge_sed" ../spl-data/movie-homepage) content=$(sed "$pledge_sed" ../spl-data/movie-homepage)