diff --git a/pledge-update/main.php b/pledge-update/main.php index 594084c..b9efc7c 100644 --- a/pledge-update/main.php +++ b/pledge-update/main.php @@ -1,15 +1,15 @@ $file) { @@ -23,9 +23,7 @@ foreach ($files as $key => $file) { exit(1); } - $candidate_file = dirname($file)."/candidates.csv"; - - if (($handle = fopen($candidate_file, "r")) !== FALSE) { + if (($handle = fopen($file, "r")) !== FALSE) { $headers = fgetcsv($handle); while (($data = fgetcsv($handle)) !== FALSE) { $candidate = []; @@ -43,7 +41,11 @@ foreach ($files as $key => $file) { 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); while (($data = fgetcsv($handle)) !== FALSE) { $candidate = []; diff --git a/update-pledges.sh b/update-pledges.sh index 9283f8a..7385994 100755 --- a/update-pledges.sh +++ b/update-pledges.sh @@ -13,14 +13,14 @@ DATA_PATH="../spl-data" -pledges_files=() +candidates_files=() for folder in "$DATA_PATH"/*; do - if test -f "$folder"/pledges.csv; then - pledges_files+=("$folder"/pledges.csv) + if test -f "$folder"/candidates.csv; then + candidates_files+=("$folder"/candidates.csv) fi 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)