Revision 11777
Added by Aaron Marcuse-Kubitza almost 11 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 437 | 437 |
trace = $(log_:.log.sql=.trace) |
| 438 | 438 |
restart_row = $(shell set -x; grep -F Partition: $(log_)|tail -1|$(sed)\ |
| 439 | 439 |
's/^.* rows ([[:digit:]]+)-.*$$/\1/') |
| 440 |
import = -$(if $(profileTest),$(profileOnly),(set -x; date; "time" env commit=1\
|
|
| 440 |
import = $(if $(profileTest),$(profileOnly),(set -x; date; "time" env commit=1\ |
|
| 441 | 441 |
$(if $(profile),profile_to=$(trace)) $(if $(continue),start=$(restart_row))\ |
| 442 | 442 |
$(map2db))$(if $(log), >>$(log_) 2>&1)) |
| 443 |
# don't abort on import errors, which often relate to invalid input data |
|
| 444 | 443 |
|
| 445 | 444 |
import? = $(if $(call and,$(full_import),$(call dontImport,.)),,$(import)) |
| 446 | 445 |
|
| 447 | 446 |
%/import_temp: %/VegBIEN.csv _always |
| 448 |
$(import?) |
|
| 447 |
$(if $(full_import),-)$(import?) |
|
| 448 |
# don't abort on import errors, which often relate to invalid input data |
|
| 449 | 449 |
# default: |
| 450 | 450 |
%/import_temp: _always ; |
| 451 | 451 |
|
Also available in: Unified diff
bugfix: inputs/input.Makefile: $(import): except in a full-database import, errexit so that the import will stop on an error and not let it scroll by