Revision 4122
Added by Aaron Marcuse-Kubitza almost 12 years ago
| input.Makefile | ||
|---|---|---|
| 114 | 114 |
anyMap := $(srcMap) $(viaMap) $(fullViaMap) $(directMap) |
| 115 | 115 |
|
| 116 | 116 |
anyTest = src/$*/test.% |
| 117 |
srcsOnly = $(filter-out $(anyMap) $(anyTest),$(1)) |
|
| 117 |
srcsOnly = $(filter-out $(anyMap) $(anyTest) src/%/logs,$(1))
|
|
| 118 | 118 |
|
| 119 | 119 |
via := Veg+ |
| 120 | 120 |
|
| ... | ... | |
| 164 | 164 |
$(if $(isCsv),$(import_install_)) |
| 165 | 165 |
import_install_ = (prefix=; . $(bin)/vegbien_dest; "time" nice -n +5\ |
| 166 | 166 |
env schema=$(datasrc) table=$* $(bin)/csv2db $(catSrcs)\ |
| 167 |
$(if $(log),$(if $(quiet),&>,2>&1|tee )import/install-$*.log.sql))
|
|
| 167 |
$(if $(log),$(if $(quiet),&>,2>&1|tee )src/$*/logs/install.log.sql))
|
|
| 168 | 168 |
|
| 169 | 169 |
##### Maps building |
| 170 | 170 |
|
| ... | ... | |
| 259 | 259 |
profileOnly = -env profile_to=/dev/fd/3 $(map2db) 3>&1 1>&2|\ |
| 260 | 260 |
$(bin)/profile_stats /dev/fd/0 |
| 261 | 261 |
|
| 262 |
log_ = import/$*$(if $(n),.n=$(n),).$(date).log.sql
|
|
| 262 |
log_ = src/$*/logs/$(if $(n),n=$(n).,)$(date).log.sql
|
|
| 263 | 263 |
trace = $(log_:.log.sql=.trace) |
| 264 | 264 |
import = -$(if $(profileTest),$(profileOnly),(set -x; "time" env commit=1\ |
| 265 | 265 |
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\ |
| ... | ... | |
| 275 | 275 |
|
| 276 | 276 |
##### Log files from import |
| 277 | 277 |
|
| 278 |
logs := $(wildcard import/*.log.sql import/*.trace)
|
|
| 278 |
logs := $(wildcard src/*/logs/*.log.sql src/*/logs/*.trace)
|
|
| 279 | 279 |
|
| 280 | 280 |
rm_logs: _always |
| 281 | 281 |
$(RM) $(logs) |
| ... | ... | |
| 375 | 375 |
|
| 376 | 376 |
##### Documentation |
| 377 | 377 |
|
| 378 |
steps = $(selfMake) -s import test=1 by_col=1 verbosity=2 n=100\ |
|
| 378 |
steps = $(selfMake) -s import-$* test=1 by_col=1 verbosity=2 n=100\
|
|
| 379 | 379 |
2>&1|$(bin)/debug2redmine >$@ |
| 380 | 380 |
|
| 381 |
import/steps.by_col.sql: _always
|
|
| 381 |
src/%/logs/steps.by_col.log.sql: _always
|
|
| 382 | 382 |
+$(steps) |
Also available in: Unified diff
inputs: Moved log files into subfolders, using steps at <https://projects.nceas.ucsb.edu/nceas/projects/bien/wiki/VegCSV_subfolders#Move-log-files-into-subfolders>