Project

General

Profile

« Previous | Next » 

Revision 1530

input.Makefile: Generate VegBIEN maps from full via maps in order to include all input columns if a src map was provided. This causes the VegBIEN join process to produce all the "No join mapping" errors for that datasource, not just those for fields in the (non-full) via map. maps/src.join.*.csv should no longer be needed for producing "No join mapping" errors.

View differences:

input.Makefile
123 123
joinSrcMap = $(if $(wildcard maps/src.$*.csv),$(bin)/in_place $@\
124 124
$(bin)/intersect maps/src.$*.csv 0)
125 125

  
126
maps/VegBIEN.%.csv: maps/$(via).%.csv $(coreMap)
127
	$(join) <$+ >$@
128
	$(joinSrcMap)
129
maps += $(autogenMaps)
130

  
131 126
makeFullCsv = $(if $(shell test -e $(word 2,$+) && echo t),\
132 127
env ignore=1 $(bin)/union <$+|$(bin)/sort_map >$@,$(CP) $< $@)
133 128
# can't use $(wildcard) because it won't recheck file after $(coreSelfMap) runs
......
137 132
	$(joinSrcMap)
138 133
maps += $(patsubst maps/%.csv,maps/%.full.csv,$(viaMaps))
139 134

  
135
maps/VegBIEN.%.csv: maps/$(via).%.full.csv $(coreMap)
136
	$(bin)/join <$+|$(bin)/sort_map >$@
137
maps += $(autogenMaps)
138

  
140 139
maps/src.join.%.csv: maps/src.%.csv maps/$(via).%.full.csv $(noEmptyMap)
141 140
	$(selfMap) <$<|$(bin)/join $(word 2,$+)|$(join) $(word 3,$+) >$@
142 141
maps += $(srcJoinMaps)

Also available in: Unified diff