matt/spl-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: matt:1cadbcffb45a8a6c30eee183119b6a064cbde0e2
Branches Tags
matt:main
matt:council_2024_final
...
compare: matt:033b30cb7869926deee5544fba5693b19acd5550
Branches Tags
matt:main
matt:council_2024_final

3 Commits
1cadbcffb4 ... 033b30cb78

Author SHA1 Message Date
Matt Way
033b30cb78 Replace ' character when searching for picture file in csv-normaliser 2024-09-04 20:20:15 +10:00
Matt Way
b0b09178e8 Skip lines that have an empty candidate name 2024-09-04 20:19:50 +10:00
Matt Way
6aca0bc039 Check multiple potential input filenames in csv-normaliser 2024-09-04 20:19:12 +10:00
1 changed files with 10 additions and 8 deletions
Expand all files Collapse all files

18
csv-normaliser/main.php
View File

@@ -4,13 +4,15 @@ $options = getopt("", ["folder:", "input:", "output:", "media:"]);
if (isset($options['folder'])) { if (isset($options['folder'])) {
$folder = $options['folder']; $folder = $options['folder'];
if (is_dir($folder)) { if (is_dir($folder)) {
$expectedInputFileName = str_replace("-", " ", strtoupper(basename($folder))) . ".csv"; $expectedInputFileNames = [];
$expectedInputFileNames[] = str_replace("-", " ", strtoupper(basename($folder))) . ".csv";
$expectedInputFileNames[] = strtoupper(basename($folder)) . ".csv";
if (!isset($options['input'])) { if (!isset($options['input'])) {
$expectedInputFile = $folder . DIRECTORY_SEPARATOR . $expectedInputFileName; foreach ($expectedInputFileNames as $expectedInputFileName) {
if (is_file($expectedInputFile)) { $expectedInputFile = $folder . DIRECTORY_SEPARATOR . $expectedInputFileName;
$options['input'] = $expectedInputFile; if (is_file($expectedInputFile)) {
} else { $options['input'] = $expectedInputFile;
error_log("Couldn't find " . $expectedInputFile . "\n"); }
} }
} }
if (!isset($options['output'])) { if (!isset($options['output'])) {
@@ -84,14 +86,14 @@ if (($handle = fopen($inputFile, "r")) !== FALSE) {
$candidateName = trim($data[1]); $candidateName = trim($data[1]);
if ($candidateName == "example name") { if ($candidateName == "example name" || $candidateName == "") {
error_log("Skipping line ". $currentLine); error_log("Skipping line ". $currentLine);
continue; continue;
} }
//print("Adding candidate " . $candidateName . " to ". $currentWard . "\n"); //print("Adding candidate " . $candidateName . " to ". $currentWard . "\n");
$name_split = explode(" ", $data[1]); $name_split = explode(" ", str_replace("'", "_", $data[1]));
$name_patterns = [ $name_patterns = [
implode(".*", $name_split), implode(".*", $name_split),