diff --git a/.env b/.env index 2bec9b6..78128dd 100644 --- a/.env +++ b/.env @@ -4,4 +4,5 @@ CLIENT_ROOT=./client SYNOPSX_ROOT=./synopsx WEBAPP_ROOT=./webapp DATA_ROOT=./data +FTINDEX_ROOT=./gdpFtIndex LOG_ROOT=./log diff --git a/.gitmodules b/.gitmodules index ec968f8..c307908 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "webapp"] path = webapp url = https://github.com/guidesDeParis/webapp +[submodule "gdpFtIndex"] + path = gdpFtIndex + url = https://github.com/guidesDeParis/gdpFtIndex.git diff --git a/Docker/basex/gdp-entrypoint.sh b/Docker/basex/gdp-entrypoint.sh index eead130..a065c91 100755 --- a/Docker/basex/gdp-entrypoint.sh +++ b/Docker/basex/gdp-entrypoint.sh @@ -10,11 +10,11 @@ echo "Creating GDP BaseX db" basex "db:create('gdp','/srv/basex/src/gdp.tei.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})" # , 'serializer': 'indent=no' -echo "Creating FullText Index tmp file" -basex "xslt:transform(fn:doc('/srv/basex/src/gdp.tei.xml'), fn:doc('/srv/basex/src/xslt/generateFullTextIndex.xsl'))" > /tmp/gdpFtIndex.xml +# echo "Creating FullText Index tmp file" +# basex "xslt:transform(fn:doc('/srv/basex/src/gdp.tei.xml'), fn:doc('/srv/basex/src/xslt/generateFullTextIndex.xsl'))" > /tmp/gdpFtIndex.xml echo "Creating FullText Index DB" -basex "db:create('gdpFtIndex', '/tmp/gdpFtIndex.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})" +basex "db:create('gdpFtIndex', '/srv/basex/ftindex/gdpFtIndex.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})" # , 'serializer': 'indent=no' # echo "Creating Advanced Search Index" diff --git a/client b/client index 8494e5a..232b44f 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 8494e5a0e262f92cf8562c2b94800e0d267a7e4e +Subproject commit 232b44f3c683dd481a344aa65906c3e8b60ddab9 diff --git a/data b/data index 1df1223..86052c6 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 1df122355a9303e68104caa3720a1a8bac3be00f +Subproject commit 86052c67d53ba434d355b020a2fff6e89cbce6a0 diff --git a/docker-compose.yml b/docker-compose.yml index 7d6e67e..3c48c41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx" - "${WEBAPP_ROOT}:/srv/basex/webapp/synopsx/workspace/gdp" - "${DATA_ROOT}:/srv/basex/src" + - "${FTINDEX_ROOT}:/srv/basex/ftindex" - basex-home:/srv # - basex-data:/srv/basex/data # - "${LOG_ROOT}:/var/log:rw" diff --git a/gdpFtIndex b/gdpFtIndex new file mode 160000 index 0000000..9fc8e27 --- /dev/null +++ b/gdpFtIndex @@ -0,0 +1 @@ +Subproject commit 9fc8e27978c76051d3178e5c42b53e5f7b7e3db3 diff --git a/synopsx b/synopsx index a8b7c0c..5185bab 160000 --- a/synopsx +++ b/synopsx @@ -1 +1 @@ -Subproject commit a8b7c0c10ad399b20c3b78af5eb08ec2c3790071 +Subproject commit 5185bab9fa64de42941354d881e6188e6c5ed114 diff --git a/webapp b/webapp index 2ca9ee5..220e4d0 160000 --- a/webapp +++ b/webapp @@ -1 +1 @@ -Subproject commit 2ca9ee51fda213a706bfe4a55f4e5427ad18cccc +Subproject commit 220e4d0b21baea9648f01ca6f0f470852920f00e