This commit is contained in:
voje 2019-04-21 21:04:07 +02:00
parent ae9aca0b1e
commit 4eec686507
3 changed files with 9 additions and 9 deletions

2
.gitignore vendored
View File

@ -6,4 +6,4 @@ src/frontend_vue/dist/
dockerfiles/database/create.js dockerfiles/database/create.js
*__pycache__/ *__pycache__/
env.local env.local
logs/ logs/*

View File

@ -8,12 +8,12 @@ MAKE_ROOT = $(shell pwd)
# kres is composed of many .xml files # kres is composed of many .xml files
# I generated srl tags for kres in separate .json files # I generated srl tags for kres in separate .json files
# (for each kres.xml file there is a kres.json file with srl tags) # (for each kres.xml file there is a kres.json file with srl tags)
SSJ_FILE = "$(MAKE_ROOT)/data/samples/ssj_xml/ssj500k-sl.body.sample.xml" # SSJ_FILE = "$(MAKE_ROOT)/data/samples/ssj_xml/ssj500k-sl.body.sample.xml"
# SSJ_FILE = "$(MAKE_ROOT)/data/ssj_file_link" SSJ_FILE = "$(MAKE_ROOT)/data/ssj_file_link"
KRES_FOLDER = "$(MAKE_ROOT)/data/samples/kres_xml" # KRES_FOLDER = "$(MAKE_ROOT)/data/samples/kres_xml"
# KRES_FOLDER = "$(MAKE_ROOT)/data/kres_xml_folder_link" KRES_FOLDER = "$(MAKE_ROOT)/data/kres_xml_folder_link"
KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/samples/kres_srl_json" # KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/samples/kres_srl_json"
# KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/kres_json_folder_link" KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/kres_json_folder_link"
OUTPUT = "db" OUTPUT = "db"
# OUTPUT = "file" # OUTPUT = "file"
@ -24,7 +24,7 @@ DBADDR = "0.0.0.0:27017" # don't use localhost
# create it from env.default # create it from env.default
include env.local include env.local
N_CORES = 2 N_CORES = 5
export export
.PHONY: python-env fill-database .PHONY: python-env fill-database

@ -1 +1 @@
Subproject commit bcc64c767c36ed8e41fd07dc896b83a49faf785b Subproject commit 3276619e6f69c5a8fbc8e163d489904303a4a91c