From 567702babdb6bc81d4f9eef5065be5d7a4b07aba Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Fri, 9 Aug 2019 15:48:55 +0200
Subject: [PATCH] include the correct modules in the autogenerated ODD.

---
 scripts/local_stylesheet.sh                | 6 +++---
 scripts/rnc_analysis_to_odd.sh             | 4 +++-
 scripts/update_output.sh                   | 1 +
 stylesheets/rng_to_odd/analysis_to_odd.xsl | 7 ++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/scripts/local_stylesheet.sh b/scripts/local_stylesheet.sh
index fc21c59..e535b6e 100755
--- a/scripts/local_stylesheet.sh
+++ b/scripts/local_stylesheet.sh
@@ -15,7 +15,7 @@ STYLESHEET_DIR="$BASE_DIR/stylesheets"
 NAME_PATTERN='*'
 SUFFIX='.xml'
 CACHE=
-SAXON_ARGS=
+SAXON_ARGS=()
 
 OUTPUT_DIR=
 
@@ -82,7 +82,7 @@ while [[ $# > 0 ]]; do
 			;;
 		-o | --options)
 			shift
-			SAXON_ARGS="$SAXON_ARGS $1"
+			SAXON_ARGS+=( "$1" )
 			shift
 			;;
 		-c | --cache)
@@ -137,7 +137,7 @@ java -jar "$DEP_DIR/Stylesheets/lib/saxon9he.jar"
 	"$STYLESHEET_DIR/$STYLESHEET"
 	-s:"$file"
 	-o:"$OUTPUT_DIR/$output"
-	$SAXON_ARGS
+	${SAXON_ARGS[*]}
 EOF
 	if [[ $CACHE ]] && [[ -e $OUTPUT_DIR/$output ]]; then
 		echo "'$OUTPUT_DIR/$output' already exists, skipping..."
diff --git a/scripts/rnc_analysis_to_odd.sh b/scripts/rnc_analysis_to_odd.sh
index 0950f3a..c369271 100755
--- a/scripts/rnc_analysis_to_odd.sh
+++ b/scripts/rnc_analysis_to_odd.sh
@@ -30,7 +30,7 @@ function print_help {
 	echo "  -h | --help: print this help"
 	echo "  -i|--input-dir INPUT. directory containing analysis results created by $SCRIPT_DIR/rnc_analyse.sh. default: '$input_dir'"
 	echo "  -o|--output-dir OUTPUT_DIR. default: '$output_dir'"
-	echo "  -m|--modules 'MODULE1 MODULE2'. Overwrite which TEI modules to include"
+	echo "  -m|--modules 'MODULE1,MODULE2'. Overwrite which TEI modules to include"
 	echo "  -v|--verbosity (0: only errors, 1: warnings, 2: info, 3: debug). default: $verbosity"
 	echo "  -d|--debug-module VAL (multiple options accumulate): send debug messages for the specific module"
 }
@@ -90,6 +90,8 @@ fi
 
 if [[ "$modules" != "" ]]; then
 	module_param="modules=$modules"
+else
+	module_param=
 fi
 
 mkdir -p "$output_dir"
diff --git a/scripts/update_output.sh b/scripts/update_output.sh
index 577dda6..1d098f3 100755
--- a/scripts/update_output.sh
+++ b/scripts/update_output.sh
@@ -104,6 +104,7 @@ $SCRIPT_DIR/rnc_analysis_to_odd.sh \
 	--verbosity 3 \
 	--input-dir "$INTERMEDIATE_DIR/s2/prepare/rnc_analysis" \
 	--output-dir "$INTERMEDIATE_DIR/s2/odd" \
+	--modules 'core,tei,header,namesdates,figures,transcr,linking,textstructure' \
 	>$INTERMEDIATE_DIR/s2/logs/rnc_analysis_to_odd.log \
 	2>&1
 
diff --git a/stylesheets/rng_to_odd/analysis_to_odd.xsl b/stylesheets/rng_to_odd/analysis_to_odd.xsl
index fff5da6..d720adb 100644
--- a/stylesheets/rng_to_odd/analysis_to_odd.xsl
+++ b/stylesheets/rng_to_odd/analysis_to_odd.xsl
@@ -20,7 +20,8 @@
 	<import href="analysis_to_odd/define_to_schematron.xsl"/>
 
 	<!-- parameters: -->
-	<param name="modules" as="xs:string*" select="('tei','header','core','textstructure')"/>
+	<param name="modules" as="xs:string" select="'tei,header,core,textstructure'"/>
+	<param name="modules_to_include" as="xs:string*" select="tokenize($modules,',')"/>
 	<param name="analysis_dir" as="xs:string" required="yes"/>
 	<param name="input_filename" required="yes"/>
 	<param name="print_rng" as="xs:boolean" select="true()"/>
@@ -45,7 +46,7 @@
 
 	<!-- entry point: -->
 	<template match="/">
-		<value-of select="eoa:info(concat('modules to include: ', string-join($modules, ', ')))"/>
+		<value-of select="eoa:info(concat('modules to include: ', string-join($modules_to_include, ', ')))"/>
 
 		<value-of select="eoa:debug(concat('input_dir: ', $analysis_dir))"/>
 
@@ -75,7 +76,7 @@
 			<element name="schemaSpec" namespace="{$tei_namespace}">
 				<attribute name="ident">ODDfromRnc</attribute>
 				<!-- modules: -->
-				<for-each select="$modules">
+				<for-each select="$modules_to_include">
 					<element name="moduleRef" namespace="{$tei_namespace}">
 						<attribute name="key"><value-of select="."/></attribute>
 					</element>