Project

General

Profile

« Previous | Next » 

Revision 4844

input.Makefile: Maps building: Use new mappings/VegCore.csv as the VegCore vocabulary to canonicalize on, in order to also canonicalize VegCore terms which are not yet mapped to VegBIEN. This results in several DwC terms getting their case standardized according to http://rs.tdwg.org/dwc/terms/. Continue to determine unmapped terms using mappings/VegCore-VegBIEN.csv, because a term should not be considered mapped until it has been mapped all the way through to VegBIEN.

View differences:

input.Makefile
137 137
anyTest = $*/test.%
138 138
srcsOnly = $(filter-out $(anyMap) $(anyTest) %/logs,$(call dataOnly,$(1)))
139 139

  
140
vocab := $(mappings)/VegCore.csv
140 141
coreMap := $(mappings)/VegCore-VegBIEN.csv
141 142
dict := $(mappings)/Veg+-VegCore.csv
142 143

  
......
251 252

  
252 253
# Via maps cleanup
253 254
ifneq ($(filter %/.map.csv.last_cleanup,$(MAKECMDGOALS)),)
254
%/.map.csv.last_cleanup: %/map.csv $(coreMap) $(dict)
255
	$(bin)/in_place $< $(bin)/canon 1 $(coreMap)
255
%/.map.csv.last_cleanup: %/map.csv $(vocab) $(dict)
256
	$(bin)/in_place $< $(bin)/canon 1 $(vocab)
256 257
	$(bin)/in_place $< $(bin)/canon 1 $(dict)
257 258
	$(bin)/in_place $< $(bin)/translate 1 $(dict)
258 259
	touch $@
......
285 286
%/unmapped_terms.csv: %/map.csv $(coreMap)
286 287
	$(call newTerms,1,|$(bin)/filter_out_ci 0 $(coreMap))
287 288

  
288
%/new_terms.csv: %/map.csv $(coreMap) $(dict) %/unmapped_terms.csv
289
%/new_terms.csv: %/map.csv $(vocab) $(dict) %/unmapped_terms.csv
289 290
	$(call newTerms,0,$(rmNewTerms))
290
rmNewTerms = |$(bin)/filter_out_ci 0 $(coreMap)|$(bin)/filter_out_ci 0 $(dict)\
291
rmNewTerms = |$(bin)/filter_out_ci 0 $(vocab)|$(bin)/filter_out_ci 0 $(dict)\
291 292
$(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))
292 293

  
293 294
termsSubdirs := $(tables)

Also available in: Unified diff