Commit f6865a29 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

rm doctype system + maj makefile

parent d320b082

Makefile

+4 −8
Original line number Diff line number Diff line
@@ -40,14 +40,6 @@ run: stop ## lancement du serveur basex 
	else\

		./basex/bin/basexhttp -h$(HTTP_PORT) &\

	fi

#	@echo 'RUN'

#	@if [ ! $(HTTP_PORT) ] then ./basex/bin/basexhttp -h$(HTTP_PORT) & else sh ./basex/bin/basexhttp &;fi

#	@if [ $(MAX_ENV) -eq 'DEV' ]; then\

#		./basex/bin/basexhttp -h$(HTTP_PORT) &;\

#	else\

#  		./basex/bin/basexhttp;\

#  	fi





install-tei-demo: run ##  installation de l'édition de démo TEI

	sleep 2
@@ -63,6 +55,10 @@ disable-plugin: ## Désactivation d'un plugin : make disable-plugin [plugin-name 
list-plugins: ## Affichage de la liste des plugins

	cd $(TOOLS_DIR) && ./max.sh --$(MAKECMDGOALS)



package-edition:  ## packaging d'un max avec ses sources

	cd $(TOOLS_DIR) && ./build.sh

	@echo "Package ok"



help: ## afficher l'aide

	@echo "\nChoisissez une commande. Les choix sont:\n"

	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[0;36m%-12s\033[m %s\n", $$1, $$2}'

max.xq

+0 −9
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ declare 
%output:method("html")

%output:html-version("5.0")

%output:encoding("UTF-8")

%output:doctype-system("html")

%rest:path( "/max.html")

function max:home(){

    let $jsonFile := file:parent(static-base-uri()) ||'package.json'
@@ -56,7 +55,6 @@ declare 
%output:method("html")

%output:html-version("5.0")

%output:encoding("UTF-8")

%output:doctype-system("html")

%rest:path( "/{$project}")

function max:projectHome($project){

    let $redirection :=
@@ -74,7 +72,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:path( "/{$project}/{$page=[a-zA-Z0-9_]+}.html")
@@ -133,7 +130,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:path("/{$project}/sommaire/{$doc=.*}.html")
@@ -147,7 +143,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:query-param("search", "{$search}")
@@ -185,7 +180,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:query-param("search", "{$search}")
@@ -238,7 +232,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:path("/{$project}/fragment/{$id}.html")
@@ -251,7 +244,6 @@ declare 
%rest:GET

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:query-param("xsl", "{$xsl}")
@@ -295,7 +287,6 @@ declare 
%rest:error("err:max")

%output:method("html")

%output:html-version("5.0")

%output:doctype-system("html")

%output:indent("no")

%output:encoding("UTF-8")

%rest:error-param("message", "{$message}")

rxq/alignment.xqm

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ declare 
%output:method("html")

%output:indent("no")

%output:html-version("5.0")

%output:doctype-system("html")

%rest:path("/{$project}/{$doc=.*xml}/{$id1}/{$id2}.html")

function max.alignment:alignedHTML($project, $doc, $id1, $id2){

   let $dbPath := max.config:getProjectDBPath($project)