diff --git a/conditor-dumps/05-future-loader.ini b/conditor-dumps/05-future-loader.ini deleted file mode 100644 index bad0c09..0000000 --- a/conditor-dumps/05-future-loader.ini +++ /dev/null @@ -1,29 +0,0 @@ -# npx ezs 05-future-loader.ini -# Sera déplacé dans le loader spécifique Conditor-métrie -append = pack - -[use] -# OBJFlatten -plugin = basics - -[unpack] - -[assign] -path = ApilCollation -value = get("host.volume") \ - .concat(_.get(self,"host.issue")) \ - .concat(_.get(self,"host.pages.range")) \ - .join(" / ") - -path = ApilProvenance -value = get("sourceUids").castArray().map(s => s.split("$")[0]).uniq() - -[exchange] -value = omit(['ws']) - -# Aplatit la structure, pour avoir le même comportement que le loader -# json-optimized.ini -# https://github.com/Inist-CNRS/lodex-extended/blob/master/public/loaders/json-optimized.ini -[OBJFlatten] -separator = fix('/') -safe = true diff --git a/conditor-dumps/05-future-loader/.gitkeep b/conditor-dumps/05-future-loader/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/conditor-dumps/05-future-loader/.gitkeep +++ /dev/null diff --git a/conditor-dumps/05-report/.gitkeep b/conditor-dumps/05-report/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/conditor-dumps/05-report/.gitkeep diff --git a/conditor-dumps/Makefile b/conditor-dumps/Makefile index 9992ff0..9ece073 100644 --- a/conditor-dumps/Makefile +++ b/conditor-dumps/Makefile @@ -9,7 +9,7 @@ .PRECIOUS: 02-download/%.jsonl 03-create-fields/%.jsonl 04-enrich/%.jsonl SOURCE_FILES := $(wildcard 01-query/*.txt) -TARGET_FILES := $(patsubst 01-query/%.txt, 05-future-loader/%.jsonl, $(SOURCE_FILES)) +TARGET_FILES := $(patsubst 01-query/%.txt, 05-report/%.log, $(SOURCE_FILES)) watch: ## Automatically build files when they change while true; do \ @@ -22,18 +22,21 @@ echo $(TARGET_FILES) # cible : dépendance -05-future-loader/%.jsonl: 04-enrich/%.jsonl - npx ezs 05-future-loader.ini < $< > $@.crdownload - mv $@.crdownload $@ +05-report/%.log: 04-enrich/%.jsonl + mkdir -p $(@D) + wc -l $< > $@ 04-enrich/%.jsonl: 03-create-fields/%.jsonl - npx ezs 04-enrich.ini < $< > $@.crdownload + mkdir -p $(@D) + time ezs 04-enrich.ini < $< > $@.crdownload mv $@.crdownload $@ 03-create-fields/%.jsonl: 02-download/%.jsonl - npx ezs 03-create-fields.ini < $< > $@.crdownload + mkdir -p $(@D) + time ezs 03-create-fields.ini < $< > $@.crdownload mv $@.crdownload $@ 02-download/%.jsonl: 01-query/%.txt - npx ezs 02-download.ini < $< > $@.crdownload + mkdir -p $(@D) + time ezs 02-download.ini < $< > $@.crdownload mv $@.crdownload $@