From 2b4e5e621b35f0cefa02d2623bf9d771cbb578b5 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Mon, 5 Aug 2019 16:05:47 +0200
Subject: [PATCH] output dbg msgs only if 'debug_modules' param contains
 corresp. module

---
 scripts/rnc_to_analysis.sh                    |  6 +-
 .../analysis_to_odd/define_to_schematron.xsl  |  4 +-
 .../analysis_to_odd/xpath_cond_from_rng.xsl   |  6 +-
 .../xpath_cond_from_rng_attributes.xsl        |  8 +--
 stylesheets/rng_to_odd/common/print.xsl       | 71 +++++++++++++++++--
 stylesheets/rng_to_odd/rng_to_analysis.xsl    |  3 +
 .../rng_to_analysis/rnc_analyse_structure.xsl | 20 +++---
 .../rng_to_odd/rng_to_analysis/rng_to_dnf.xsl | 59 ++++++++-------
 .../xpath_unique_expr_advanced.xsl            | 37 +++++-----
 .../xpath_unique_expr_simple.xsl              |  2 +-
 10 files changed, 139 insertions(+), 77 deletions(-)

diff --git a/scripts/rnc_to_analysis.sh b/scripts/rnc_to_analysis.sh
index 3533b17..db4737f 100755
--- a/scripts/rnc_to_analysis.sh
+++ b/scripts/rnc_to_analysis.sh
@@ -89,10 +89,8 @@ xsltproc --stringparam out-name "$rng_simplified_arg" stylesheets/rnc_simplifica
 
 echo "simplified rng -> analysis: '$rng_simplified' -> '$output_dir/{2_flattened.xml,3_serialized.txt}'"
 
-debug_modules_options=
-for mod in "${debug_modules[@]}"; do
-	debug_modules_options="$debug_modules_options debug_$mod=1"
-done
+debug_modules_options="debug_modules=${debug_modules[@]}"
+
 # echo "debug_modules_options: $debug_modules_options"
 $SCRIPT_DIR/local_stylesheet.sh \
 	--input-dir "$output_dir" \
diff --git a/stylesheets/rng_to_odd/analysis_to_odd/define_to_schematron.xsl b/stylesheets/rng_to_odd/analysis_to_odd/define_to_schematron.xsl
index bef4752..565bae6 100644
--- a/stylesheets/rng_to_odd/analysis_to_odd/define_to_schematron.xsl
+++ b/stylesheets/rng_to_odd/analysis_to_odd/define_to_schematron.xsl
@@ -101,8 +101,8 @@
 				<value-of select="@name"/>
 				<text>):</text>
 			</element>
-			<value-of select="eoa:debug(concat('unique_expr_str: ', $unique_xpath_expr_str))"/>
-			<value-of select="eoa:debug(concat('xpath_condition_str: ', $xpath_condition_str))"/>
+			<value-of select="eoa:debug('define_to_schematron', concat('unique_expr_str: ', $unique_xpath_expr_str))"/>
+			<value-of select="eoa:debug('define_to_schematron', concat('xpath_condition_str: ', $xpath_condition_str))"/>
 			<element name="constraint" namespace="{$tei_namespace}">
 				<sch:rule context="{$unique_xpath_expr_str}">
 					<sch:assert test="{$xpath_condition_str}">
diff --git a/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng.xsl b/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng.xsl
index 0baf82a..2fe10c5 100644
--- a/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng.xsl
+++ b/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng.xsl
@@ -127,7 +127,7 @@
 
 	<!-- this should never happen: -->
 	<template mode="rng_to_xpath_cond_impl" as="xs:string" match="rng:attribute">
-		<value-of select="eoa:error(concat('rng_to_xpath_cond_impl: called with element: ', name(), '. value: ', .))"/>
+		<value-of select="eoa:error('xpath_cond_from_rng', concat('rng_to_xpath_cond_impl: called with element: ', name(), '. value: ', .))"/>
 		<text/>
 	</template>
 
@@ -277,7 +277,7 @@
 	</template>
 
 	<template mode="rng_to_xpath_cond_impl" as="xs:string" match="node() | @*" >
-		<value-of select="eoa:error(concat('rng_to_xpath_cond_impl. no implementation for ', name(), '. value: ', .))"/>
+		<value-of select="eoa:error('xpath_cond_from_rng', concat('rng_to_xpath_cond_impl. no implementation for ', name(), '. value: ', .))"/>
 	</template>
 	
 	<!-- rng_to_xpath_cond_raw:
@@ -333,7 +333,7 @@
 	</template>
 
 	<template mode="rng_to_xpath_cond_raw" as="xs:string" match="node()|@*" >
-		<value-of select="eoa:error(concat('rng_to_xpath_cond_raw. no implementation for ', name(), '. value: ', .))"/>
+		<value-of select="eoa:error('xpath_cond_from_rng', concat('rng_to_xpath_cond_raw. no implementation for ', name(), '. value: ', .))"/>
 	</template>
 
 	<!-- context:
diff --git a/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng_attributes.xsl b/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng_attributes.xsl
index 7426168..974f956 100644
--- a/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng_attributes.xsl
+++ b/stylesheets/rng_to_odd/analysis_to_odd/xpath_cond_from_rng_attributes.xsl
@@ -87,7 +87,7 @@
 					<text>xs:</text>
 				</when>
 				<otherwise>
-					<value-of select="eoa:warning(concat('no namespace prefix datatype library ', @datatypeLibrary))"/>
+					<value-of select="eoa:warning('xpath_cond_from_rng_attributes', concat('no namespace prefix datatype library ', @datatypeLibrary))"/>
 					<text/>
 				</otherwise>
 			</choose>
@@ -131,7 +131,7 @@
 
 	<template mode="attribute_condition" match="*" as="xs:string">
 		<param name="attr_name" as="xs:string"/>
-		<value-of select="eoa:warning(concat('no rule to check attribute ', $attr_name))"/>
+		<value-of select="eoa:warning('xpath_cond_from_rng_attributes', concat('no rule to check attribute ', $attr_name))"/>
 		<value-of select="concat( '@', $attr_name )"/>
 	</template>
 
@@ -150,7 +150,7 @@
 					<text>xml:</text>
 				</when>
 				<otherwise>
-					<value-of select="eoa:warning(concat('no namespace prefix for ', rng:name/@ns))"/>
+					<value-of select="eoa:warning('xpath_cond_from_rng_attributes', concat('no namespace prefix for ', rng:name/@ns))"/>
 				</otherwise>
 			</choose>
 		</variable>
@@ -158,7 +158,7 @@
 	</template>
 
 	<template mode="attribute_name" match="*">
-		<value-of select="eoa:error( concat('attribute_name only valid for rng:attribute, but called from ', name()) )"/>
+		<value-of select="eoa:error( 'xpath_cond_from_rng_attributes', concat('attribute_name only valid for rng:attribute, but called from ', name()) )"/>
 	</template>
 
 </stylesheet>
diff --git a/stylesheets/rng_to_odd/common/print.xsl b/stylesheets/rng_to_odd/common/print.xsl
index b568aea..2a7e974 100644
--- a/stylesheets/rng_to_odd/common/print.xsl
+++ b/stylesheets/rng_to_odd/common/print.xsl
@@ -15,6 +15,9 @@
 	<!--
 	<import href="utils.xsl"/>
 	-->
+	
+		<!-- overwrite this to enable module specific debug output -->
+	<param name="debug_modules" as="xs:string*" select="()"/>
 
 	<!-- verbosity: 0: only errors, 1: warnings, 2: info, 3: debug -->
   <param name="verbosity" as="xs:integer" required="no" select="2"/>
@@ -25,6 +28,15 @@
   <function name="eoa:error" as="xs:integer"><value-of select="3"/></function>
 
   <function name="eoa:debug" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:debug(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:debug" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
     <param name="message" as="xs:string*"/>
 		<!-- TODO: This probably doesn't work if the message is
 			more than a single string -->
@@ -32,6 +44,15 @@
   </function>
 
   <function name="eoa:info" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:info(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:info" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
     <param name="message" as="xs:string*"/>
 		<!-- TODO: This probably doesn't work if the message is
 			more than a single string -->
@@ -39,6 +60,15 @@
   </function>
 
   <function name="eoa:warning" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:warning(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:warning" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
     <param name="message" as="xs:string*"/>
 		<!-- TODO: This probably doesn't work if the message is
 			more than a single string -->
@@ -46,6 +76,15 @@
   </function>
 
   <function name="eoa:error" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:error(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:error" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
     <param name="message" as="xs:string*"/>
 		<!-- TODO: This probably doesn't work if the message is
 			more than a single string -->
@@ -55,67 +94,89 @@
 	<!-- promise: this function never returns anything! -->
   <function name="eoa:message" as="element()?">
     <param name="level" as="xs:integer"/>
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="$level"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+  </function>
+
+	<!-- promise: this function never returns anything! -->
+  <function name="eoa:message" as="element()?">
+    <param name="level" as="xs:integer"/>
+    <param name="module" as="xs:string"/>
     <param name="message" as="xs:string*"/>
 		<call-template name="eoa:message">
 			<with-param name="level" select="$level"/>
+			<with-param name="module" select="$module"/>
 			<with-param name="message" select="$message"/>
 		</call-template>
   </function>
 
 	<template name="eoa:debug" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
     <param name="message" as="xs:string*"/>
 		<call-template name="eoa:message">
 			<with-param name="level" select="eoa:debug()"/>
+			<with-param name="module" select="$module"/>
 			<with-param name="message" select="$message"/>
 		</call-template>
 	</template>
 
 	<template name="eoa:info" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
     <param name="message" as="xs:string*"/>
 		<call-template name="eoa:message">
 			<with-param name="level" select="eoa:info()"/>
+			<with-param name="module" select="$module"/>
 			<with-param name="message" select="$message"/>
 		</call-template>
 	</template>
 
 	<template name="eoa:warning" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
     <param name="message" as="xs:string*"/>
 		<call-template name="eoa:message">
 			<with-param name="level" select="eoa:warning()"/>
+			<with-param name="module" select="$module"/>
 			<with-param name="message" select="$message"/>
 		</call-template>
 	</template>
 
 	<template name="eoa:error" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
     <param name="message" as="xs:string*"/>
 		<call-template name="eoa:message">
 			<with-param name="level" select="eoa:error()"/>
+			<with-param name="module" select="$module"/>
 			<with-param name="message" select="$message"/>
 		</call-template>
 	</template>
 
   <template name="eoa:message" as="element()?">
     <param name="level" as="xs:integer"/>
+    <param name="module" as="xs:string" select="''"/>
     <param name="message" as="xs:string*"/>
     <choose>
-      <when test="$level = 0 and $verbosity >= 3">
+      <when test="$level = 0 and $verbosity >= 3 and ($module = '' or $module = $debug_modules)">
 				<for-each select="$message">
-        	<message terminate="no">[DEBUG]: <value-of select="."/></message>
+        	<message terminate="no">[DEBUG]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
 				</for-each>
       </when>
       <when test="$level = 1 and $verbosity >= 2">
 				<for-each select="$message">
-        	<message terminate="no">[INFO]: <value-of select="."/></message>
+        	<message terminate="no">[INFO]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
 				</for-each>
       </when>
       <when test="$level = 2 and $verbosity >= 1">
 				<for-each select="$message">
-        	<message terminate="no">[WARNING]: <value-of select="."/></message>
+        	<message terminate="no">[WARNING]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
 				</for-each>
       </when>
       <when test="$level = 3">
 				<for-each select="$message">
-					<message terminate="{position() = last()}">[ERROR]: <value-of select="."/>. Exiting.</message>
+					<message terminate="{position() = last()}">[ERROR]: <value-of select="concat($module, ': ')"/><value-of select="."/>. Exiting.</message>
 				</for-each>
       </when>
     </choose>
diff --git a/stylesheets/rng_to_odd/rng_to_analysis.xsl b/stylesheets/rng_to_odd/rng_to_analysis.xsl
index 6350a10..1e381b3 100644
--- a/stylesheets/rng_to_odd/rng_to_analysis.xsl
+++ b/stylesheets/rng_to_odd/rng_to_analysis.xsl
@@ -29,8 +29,11 @@ as officially documented here: https://relaxng.org/spec.html#simple-syntax
 	<!-- output intermediate steps into this directory...: -->
 	<param name="output" required="yes"/>
 	<!-- enable these to get debug messages for specific modules: -->
+	<param name="debug_modules" as="xs:string*" select="()"/>
+	<!--
 	<param name="debug_xpath_unique_expr_advanced" select="false()" as="xs:boolean"/>
 	<param name="debug_rng_to_dnf" select="false()" as="xs:boolean"/>
+	-->
 
 	<!-- output formats : -->
 	<output
diff --git a/stylesheets/rng_to_odd/rng_to_analysis/rnc_analyse_structure.xsl b/stylesheets/rng_to_odd/rng_to_analysis/rnc_analyse_structure.xsl
index 2f4796d..7efd023 100644
--- a/stylesheets/rng_to_odd/rng_to_analysis/rnc_analyse_structure.xsl
+++ b/stylesheets/rng_to_odd/rng_to_analysis/rnc_analyse_structure.xsl
@@ -87,11 +87,11 @@
 	</template>
 
 	<template mode="structure_advanced" match="eoa:element">
-		<value-of select="eoa:info(concat('structure_advanced: calculating element ', @name))"/>
+		<value-of select="eoa:info('structure_advanced', concat('calculating element ', @name))"/>
 		<copy>
 			<apply-templates mode="structure_advanced" select="@* | *[not( self::eoa:definitions )]"/>
 			<element name="definitions" namespace="{$eoa_namespace}">
-				<value-of select="eoa:debug( concat('calculating unique xpath expressions for all definitions of element ', @name,':'))"/>
+				<value-of select="eoa:debug('structure_advanced', concat('calculating unique xpath expressions for all definitions of element ', @name,':'))"/>
 				<variable name="xpath_unique_expr_advanced">
 					<call-template name="xpath_unique_expr_advanced">
 						<with-param name="define_ids" as="xs:string*" select=".//rng:define/@name"/>
@@ -110,13 +110,13 @@
 				-->
 				<variable name="problems" as="element(eoa:problems)?" select="$xpath_unique_expr_advanced/eoa:problems"/>
 				<if test="$problems">
-					<value-of select="eoa:warning('structure_advanced: there are problems with this element:')"/>
+					<value-of select="eoa:warning('structure_advanced', 'there are problems with this element:')"/>
 					<for-each select="$problems/eoa:problem">
-						<value-of select="eoa:warning(concat(eoa:object, ': ', eoa:message))"/>
+						<value-of select="eoa:warning('structure_advanced', concat(eoa:object, ': ', eoa:message))"/>
 					</for-each>
 				</if>
 				<for-each select="eoa:definitions/eoa:define">
-					<value-of select="eoa:info(concat('structure_advanced: calculating definition ', @name))"/>
+					<value-of select="eoa:info('structure_advanced', concat('calculating definition ', @name))"/>
 					<!-- convert "eoa:values -> eoa:path": -->
 					<variable name="unique_xpath_expressions_values" as="element()*">
 						<for-each select="$xpath_unique_expr_advanced/eoa:result/eoa:entry[eoa:key = current()/rng:define/@name]/eoa:value">
@@ -156,15 +156,15 @@
 			<apply-templates mode="is_rng_supported" select="rng:define"/>
 		</variable>
 		<if test="$is_rng_supported">
-			<value-of select="eoa:warning( concat('problem in the rng for element ', rng:define/@name, '. reason: ', $is_rng_supported) )"/>
+			<value-of select="eoa:warning( 'structure_advanced', concat('problem in the rng for element ', rng:define/@name, '. reason: ', $is_rng_supported) )"/>
 		</if>
 
-		<value-of select="eoa:debug( 'calculating rng_no_attributes:')"/>
+		<value-of select="eoa:debug( 'structure_advanced', 'calculating rng_no_attributes:')"/>
 		<variable name="no_attributes" as="element(rng:define)">
 			<apply-templates mode="no_attributes" select="rng:define"/>
 		</variable>
 
-		<value-of select="eoa:debug( 'calculating rng_only_attributes:')"/>
+		<value-of select="eoa:debug( 'structure_advanced', 'calculating rng_only_attributes:')"/>
 		<variable name="only_attributes" as="element(rng:define)">
 			<apply-templates mode="only_attributes" select="rng:define"/>
 		</variable>
@@ -270,7 +270,7 @@
 	<!-- filter out anything concerning attributes: -->
 
 	<template mode="no_attributes" match="rng:attribute">
-		<value-of select="eoa:error( 'no_attributes called with rng:attribute')"/>
+		<value-of select="eoa:error( 'structure_advanced', 'no_attributes called with rng:attribute')"/>
 		<!--
 		<element name="empty" namespace="{$rng_namespace}"/>
 		-->
@@ -331,7 +331,7 @@
 	<!-- clean a definition keeping only the parts concerning attributes: -->
 
 	<template mode="only_attributes" match="rng:ref">
-		<value-of select="eoa:error( 'only_attributes called with rng:ref')"/>
+		<value-of select="eoa:error( 'structure_advanced', 'only_attributes called with rng:ref')"/>
 	</template>
 
 	<template mode="only_attributes"
diff --git a/stylesheets/rng_to_odd/rng_to_analysis/rng_to_dnf.xsl b/stylesheets/rng_to_odd/rng_to_analysis/rng_to_dnf.xsl
index 18ee42d..c987b22 100644
--- a/stylesheets/rng_to_odd/rng_to_analysis/rng_to_dnf.xsl
+++ b/stylesheets/rng_to_odd/rng_to_analysis/rng_to_dnf.xsl
@@ -44,7 +44,7 @@
 		mode="rng_dnf_finish"
 		match="rng:choice[not(parent::rng:element) and not(ancestor-or-self::rng:attribute)]"
 	>
-		<value-of select="eoa:error('rng_dnf_finish: found choice which is not toplevel. (This indicates an internal error in the dnf calculation)')"/>
+		<sequence select="eoa:error('rng_to_dnf', 'rng_dnf_finish: found choice which is not toplevel. (This indicates an internal error in the dnf calculation)')"/>
 	</template>
 
 	<template mode="rng_dnf_finish" match="@* | node()">
@@ -122,16 +122,14 @@
 		<choose>
 			<when test="not($normalized_children[self::rng:choice])">
 				<!-- debug output -->
-				<if test="$debug_rng_to_dnf">
-					<value-of select="eoa:debug(concat(
-						$depth,
-						'rng_to_dnf: ',
-						parent::*/parent::*/name(), '/',
-						parent::*/name(), '[', parent::*/position(), ']', '/',
-						name(),'[',position(),']',
-						' - just copy!'
-					))"/>
-				</if>
+				<sequence select="eoa:debug('rng_to_dnf', concat(
+					$depth,
+					'rng_to_dnf: ',
+					parent::*/parent::*/name(), '/',
+					parent::*/name(), '[', parent::*/position(), ']', '/',
+					name(),'[',position(),']',
+					' - just copy!'
+				))"/>
 				<copy>
 					<copy-of select="@*"/>
 					<copy-of select="$normalized_children"/>
@@ -156,21 +154,19 @@
 					select="eoa:all_seqs($all_sub_choices_count)" 
 				/>
 				<!-- debug output -->
-				<if test="$debug_rng_to_dnf">
-					<value-of select="eoa:debug( concat(
-						$depth,
-						'rng_to_dnf: ',
-						parent::*/parent::*/name(), '/',
-						parent::*/name(), '[', parent::*/position(), ']', '/',
-						name(),'[',position(),']',
-						' - children: ',
-						string-join($normalized_children/name(), ','),
-						' - all_sub_choices_count: ',
-						string-join($all_sub_choices_count, ','),
-						'. all_sub_choices: ',
-						string-join($all_sub_choices, ',')
-					))"/>
-				</if>
+				<sequence select="eoa:debug( 'rng_to_dnf', concat(
+					$depth,
+					'rng_to_dnf: ',
+					parent::*/parent::*/name(), '/',
+					parent::*/name(), '[', parent::*/position(), ']', '/',
+					name(),'[',position(),']',
+					' - children: ',
+					string-join($normalized_children/name(), ','),
+					' - all_sub_choices_count: ',
+					string-join($all_sub_choices_count, ','),
+					'. all_sub_choices: ',
+					string-join($all_sub_choices, ',')
+				))"/>
 				<element name="choice" namespace="{$rng_namespace}">
 					<for-each select="$all_sub_choices">
 						<variable name="sub_choice"
@@ -178,15 +174,16 @@
 							as="xs:integer*"
 						/>
 						<!-- debug output -->
-						<if test="$debug_rng_to_dnf">
-							<message>
+						<call-template name="eoa:debug">
+							<with-param name="module" select="'rng_to_dnf'"/>
+							<with-param name="message">
 								<text>current subchoice: </text>
 								<value-of select="$sub_choice" separator=","/>
 								<value-of select="$newline"/>
 								<text>names: </text>
 								<value-of select="$normalized_children/name()" separator=","/>
-							</message>
-						</if>
+							</with-param>
+						</call-template>
 						<element name="group" namespace="{$rng_namespace}">
 							<!--
 							-->
@@ -235,7 +232,7 @@
 				</call-template>
 			</when>
 			<when test="count($choice_numbers)">
-				<value-of select="eoa:error('rng_to_dnf_helper: choice numbers left')"/>
+				<sequence select="eoa:error('rng_to_dnf', 'rng_to_dnf_helper: choice numbers left')"/>
 			</when>
 		</choose>
 
diff --git a/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_advanced.xsl b/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_advanced.xsl
index 0c5506a..9768a88 100644
--- a/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_advanced.xsl
+++ b/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_advanced.xsl
@@ -75,6 +75,18 @@
 		<param name="structured_definitions" select="/"/>
 		<param name="depth" as="xs:string" select="''"/>
 		<!-- debug output -->
+		<call-template name="eoa:debug">
+			<with-param name="module" select="'xpath_unique_expr_advanced'"/>
+			<with-param name="message">
+			<for-each select="$paths">
+				<value-of select="f:apply(f:print_path(), .)"/>
+				<if test="position() != last()">
+					<text>, </text>
+				</if>
+			</for-each>
+			</with-param>
+		</call-template>
+		<!--
 		<if test="$debug_xpath_unique_expr_advanced">
 			<variable name="paths_as_str" as="xs:string">
 				<value-of separator=", ">
@@ -86,8 +98,9 @@
 					</for-each>
 				</value-of>
 			</variable>
-			<sequence select="eoa:debug(concat($depth, 'xpath_unique_expr_advanced_rec: param: ', $paths_as_str))"/>
+			<sequence select="eoa:debug('xpath_unique_expr_advanced', concat($depth, 'xpath_unique_expr_advanced_rec: param: ', $paths_as_str))"/>
 		</if>
+		-->
 
 		<!-- 'eoa:define' elements for which there is
 			no other 'eoa:define'
@@ -101,9 +114,7 @@
 			>
 				<if test="count(current-group()) = 1">
 					<!-- debug output -->
-					<if test="$debug_xpath_unique_expr_advanced">
-						<sequence select="eoa:debug( concat($depth, 'xpath_unique_expr_advanced_rec: single: ', current-group()/rng:define/@name))"/>
-					</if>
+					<sequence select="eoa:debug( 'xpath_unique_expr_advanced', concat($depth, 'xpath_unique_expr_advanced_rec: single: ', current-group()/rng:define/@name))"/>
 					<eoa:entry>
 						<eoa:key><value-of select="current-group()/rng:define/@name"/></eoa:key>
 						<eoa:value>
@@ -132,9 +143,7 @@
 					/>
 					<if test="$unique">
 						<!-- debug output -->
-						<if test="$debug_xpath_unique_expr_advanced">
-							<sequence select="eoa:debug( concat($depth, 'xpath_unique_expr_advanced_rec: unique: ', string-join($unique/@name, ', ')))"/>
-						</if>
+						<sequence select="eoa:debug( 'xpath_unique_expr_advanced', concat($depth, 'xpath_unique_expr_advanced_rec: unique: ', string-join($unique/@name, ', ')))"/>
 					</if>
 					<for-each select="$unique">
 						<eoa:entry>
@@ -169,10 +178,8 @@
 					/>
 					<variable name="unique_neighbours" as="xs:string*" select="$structured_definitions//eoa:define[ @name = $unique_result/eoa:key and ancestor::eoa:element/@name = current-grouping-key()]/@name"/>
 					<!-- debug output -->
-					<if test="$debug_xpath_unique_expr_advanced">
-						<sequence select="eoa:debug( concat($depth, 'xpath_unique_expr_advanced_rec: ambiguous: ', string-join($ambiguous/@name, ', ')))"/>
-						<sequence select="eoa:debug( concat($depth, 'xpath_unique_expr_advanced_rec: unique neighbours: ', string-join($unique_neighbours, ', ')))"/>
-					</if>
+					<sequence select="eoa:debug( 'xpath_unique_expr_advanced', concat($depth, 'xpath_unique_expr_advanced_rec: ambiguous: ', string-join($ambiguous/@name, ', ')))"/>
+					<sequence select="eoa:debug( 'xpath_unique_expr_advanced', concat($depth, 'xpath_unique_expr_advanced_rec: unique neighbours: ', string-join($unique_neighbours, ', ')))"/>
 					<if test="$ambiguous">
 						<call-template name="distinguish_definitions">
 							<with-param name="paths" select="$paths"/>
@@ -195,9 +202,7 @@
 
 		<if test="$ambiguous_res_and_errors[self::eoa:problem]">
 			<!-- debug output -->
-			<if test="$debug_xpath_unique_expr_advanced">
-				<sequence select="eoa:warning( concat('problem of the following types ', string-join($ambiguous_res_and_errors[self::eoa:problem]/*/name(),', ')))"/>
-			</if>
+			<sequence select="eoa:warning( 'xpath_unique_expr_advanced', concat('problem of the following types ', string-join($ambiguous_res_and_errors[self::eoa:problem]/*/name(),', ')))"/>
 			<element name="problems" namespace="{$eoa_namespace}">
 				<sequence select="$ambiguous_res_and_errors[self::eoa:problem]"/>
 			</element>
@@ -325,9 +330,7 @@
 								<value-of select="$parent_map_entry/eoa:key"/>
 								<for-each select="$unique_neighbours">
 									<!-- debug output -->
-									<if test="$debug_xpath_unique_expr_advanced">
-										<sequence select="eoa:debug( concat($depth, 'printing unique neighbour', .))"/>
-									</if>
+									<sequence select="eoa:debug( 'xpath_unique_expr_advanced', concat($depth, 'printing unique neighbour', .))"/>
 									<eoa:but_not>
 										<value-of select="."/>
 									</eoa:but_not>
diff --git a/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_simple.xsl b/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_simple.xsl
index dad2571..4ec1dbb 100644
--- a/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_simple.xsl
+++ b/stylesheets/rng_to_odd/rng_to_analysis/xpath_unique_expr_simple.xsl
@@ -72,7 +72,7 @@
 	</template>
 
 	<template mode="xpath_unique_expr_simple" match="*">
-		<value-of select="eoa:error(concat('xpath_unique_expr_simple only valid for rng:define, but called with ', name()))"/>
+		<value-of select="eoa:error('xpath_unique_expr_simple', concat('xpath_unique_expr_simple only valid for rng:define, but called with ', name()))"/>
 	</template>
 
 	<!-- context: rng:define -->