Project

General

Profile

« Previous | Next » 

Revision 10174

bugfix: inputs/input.Makefile: %/VegBIEN.csv: for new-style datasources, use a symlink to mappings/VegCore-VegBIEN.csv directly instead of prefiltering VegCore-VegBIEN.csv to include only the columns in map.csv. prefiltering used to be performed as part of mapping the map.csv VegCore output terms to VegBIEN using bin/join, but is no longer needed because the staging table columns are now VegCore terms. instead, the full VegCore-VegBIEN.csv is needed so that derived columns added in stage I or II validations are detected by bin/map (rather than just the original source columns in map.csv).

View differences:

input.Makefile
366 366
endif
367 367

  
368 368
%/VegBIEN.csv: %/map.csv $(coreMap)
369
	<$< $(bin)/cat_cols 1 2$(if $(wildcard\
370
$*/run),|$(bin)/cols 1 1 3|(head -1 $<; tail -n +2)\
371
)|$(bin)/join $(coreMap)|$(bin)/sort_map >$@
369
	$(if $(wildcard $*/run),-ln -s ../$(coreMap) $@\
370
,<$< $(bin)/cat_cols 1 2|$(bin)/join $(coreMap)|$(bin)/sort_map >$@)
371
# ignore errors if symlink exists
372 372
maps += $(autogenMaps)
373 373

  
374 374
maps: $(maps) _always ;

Also available in: Unified diff