From 68dd0706a8c16caaf7dcf09fd2ed22aa0c5cc124 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitzm@lovullo.com>
Date: Wed, 5 Jul 2017 13:42:10 -0400
Subject: [PATCH] Simplify unknown source field map detection

Simple refactoring.  Code still is terrible.

* src/current/compiler/map.xsl (lvmc:validate-ui) [lvm:program-map]:
  Factor common expressions.
---
 src/current/compiler/map.xsl | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/current/compiler/map.xsl b/src/current/compiler/map.xsl
index 65e3190a..012a945f 100644
--- a/src/current/compiler/map.xsl
+++ b/src/current/compiler/map.xsl
@@ -929,31 +929,19 @@
 <template match="lvm:program-map" mode="lvmc:validate-ui">
   <param name="ui" />
 
+  <variable name="knowns" as="xs:string*"
+            select="$ui//lvp:question/@id,
+                    $ui//lvp:external/@id,
+                    $ui//lvp:calc/@id" />
+
 
   <!-- get a list of unknown source mappings -->
   <!-- TODO: this is a mess -->
   <variable name="unknown-pre" select="
-      .//lvm:pass[
-        not( @name=($ui//lvp:question/@id|$ui//lvp:external/@id) )
-        and not( @name=$ui//lvp:calc/@id )
-      ]
-      |
-      .//lvm:map[
-        @from
-        and not( @from=($ui//lvp:question/@id|$ui//lvp:external/@id) )
-        and not( @from=$ui//lvp:calc/@id )
-      ]
-      |
-      .//lvm:from[
-        not( @name=($ui//lvp:question/@id|$ui//lvp:external/@id) )
-        and not( @name=$ui//lvp:calc/@id )
-      ]
-      |
-      .//lvm:set[
-        @each
-        and not( @each=($ui//lvp:question/@id|$ui//lvp:external/@id) )
-        and not( @each=$ui//lvp:calc/@id )
-      ]
+      .//lvm:pass[ not( @name = $knowns ) ],
+      .//lvm:map[ @from and not( @from = $knowns ) ],
+      .//lvm:from[ not( @name = $knowns ) ],
+      .//lvm:set[ @each and not( @each = $knowns ) ]
     " />
 
   <variable name="unknown"