SF.net SVN: orm:[1417] trunk

[<mcu...@us...>]

Revision: 1417
          http://orm.svn.sourceforge.net/orm/?rev=1417&view=rev
Author:   mcurland
Date:     2009-11-17 23:44:42 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
 * Fixed relational bridge issue with alternate assimilation paths failing to resolve. refs #328
 * Fixed question provider generation with glyph offsets on the root element
 * Matched file case in some build files

Modified Paths:
--------------
    trunk/CustomProperties/CustomProperties.csproj
    trunk/ORMModel/Transforms/SurveyQuestionProvider.xslt
    trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs
    trunk/Tools/NUBuildVS/NUBuildVS.csproj

Modified: trunk/CustomProperties/CustomProperties.csproj
===================================================================
--- trunk/CustomProperties/CustomProperties.csproj	2009-11-02 20:18:02 UTC (rev 1416)
+++ trunk/CustomProperties/CustomProperties.csproj	2009-11-17 23:44:42 UTC (rev 1417)
@@ -54,7 +54,7 @@
     <Compile Include="CustomPropertiesManager.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CustomPropertiesManager.designer.cs">
+    <Compile Include="CustomPropertiesManager.Designer.cs">
       <DependentUpon>CustomPropertiesManager.cs</DependentUpon>
     </Compile>
     <Compile Include="CustomProperty.SerializationExtensions.cs">
@@ -66,13 +66,13 @@
     <Compile Include="DefinitionEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DefinitionEditor.designer.cs">
+    <Compile Include="DefinitionEditor.Designer.cs">
       <DependentUpon>DefinitionEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="EditCustomEnumOrDescription.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="EditCustomEnumOrDescription.designer.cs">
+    <Compile Include="EditCustomEnumOrDescription.Designer.cs">
       <DependentUpon>EditCustomEnumOrDescription.cs</DependentUpon>
     </Compile>
     <Compile Include="GeneratedCode\DomainClasses.cs">
@@ -93,7 +93,7 @@
     <Compile Include="GroupEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="GroupEditor.designer.cs">
+    <Compile Include="GroupEditor.Designer.cs">
       <DependentUpon>GroupEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="NameChangedEventArgs.cs" />

Modified: trunk/ORMModel/Transforms/SurveyQuestionProvider.xslt
===================================================================
--- trunk/ORMModel/Transforms/SurveyQuestionProvider.xslt	2009-11-02 20:18:02 UTC (rev 1416)
+++ trunk/ORMModel/Transforms/SurveyQuestionProvider.xslt	2009-11-17 23:44:42 UTC (rev 1417)
@@ -900,13 +900,15 @@
 			<xsl:when test="$offset">
 				<xsl:variable name="afterQuestion" select="string($offset/@afterSurveyQuestion)"/>
 				<xsl:choose>
-					<xsl:when test="$afterQuestion">
+					<xsl:when test="$afterQuestion or ($lastAnswer and $ApplyLastAnswer)">
 						<xsl:variable name="referencedOffsetFragment">
-							<xsl:call-template name="ResolveOffset">
-								<xsl:with-param name="ImageMap" select="$AllQuestions[@questionType=$afterQuestion]/qp:*[self::qp:sequentialImageMap | self::qp:explicitImageMap]"/>
-								<xsl:with-param name="AllQuestions" select="$AllQuestions"/>
-								<xsl:with-param name="ApplyLastAnswer" select="true()"/>
-							</xsl:call-template>
+							<xsl:if test="$afterQuestion">
+								<xsl:call-template name="ResolveOffset">
+									<xsl:with-param name="ImageMap" select="$AllQuestions[@questionType=$afterQuestion]/qp:*[self::qp:sequentialImageMap | self::qp:explicitImageMap]"/>
+									<xsl:with-param name="AllQuestions" select="$AllQuestions"/>
+									<xsl:with-param name="ApplyLastAnswer" select="true()"/>
+								</xsl:call-template>
+							</xsl:if>
 						</xsl:variable>
 						<xsl:variable name="referencedOffset" select="exsl:node-set($referencedOffsetFragment)/child::*"/>
 						<xsl:variable name="localOffsetFragment">

Modified: trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs
===================================================================
--- trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs	2009-11-02 20:18:02 UTC (rev 1416)
+++ trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs	2009-11-17 23:44:42 UTC (rev 1417)
@@ -816,8 +816,13 @@
 		/// </param>
 		private static void GenerateReferenceConstraint(Table sourceTable, ConceptType targetConceptType, string referenceConstraintName, PathStack<ConceptTypeChild> sourceTableStartingPath)
 		{
-			Table targetTable = GetTargetTableForReferenceConstraint(targetConceptType);
-			if (targetTable == null)
+			Table targetTable;
+			List<Column> sourceColumns;
+			if (null == (targetTable = GetTargetTableForReferenceConstraint(targetConceptType)) ||
+				// Find the columns in the source table that start with the correct path. These will already be in the correct
+				// order, since we create them based off the order in the preferred identifier of the target concept type. This
+				// can be empty for secondary assimilation paths.
+				null == (sourceColumns = GetColumnsForStartingPath(sourceTable, sourceTableStartingPath)))
 			{
 				return;
 			}
@@ -828,10 +833,6 @@
 			referenceConstraint.SourceTable = sourceTable;
 			referenceConstraint.TargetTable = targetTable;
 
-			// Find the columns in the source table that start with the correct path. These will already be in the correct
-			// order, since we create them based off the order in the preferred identifier of the target concept type.
-			List<Column> sourceColumns = GetColumnsForStartingPath(sourceTable, sourceTableStartingPath);
-			Debug.Assert(sourceColumns.Count > 0);
 			Column[] targetColumns = new Column[sourceColumns.Count];
 
 			// Find the target column for each source column.
@@ -1032,12 +1033,12 @@
 		/// </summary>
 		private static List<Column> GetColumnsForStartingPath(Table table, PathStack<ConceptTypeChild> startingPath)
 		{
-			List<Column> columns = new List<Column>();
+			List<Column> columns = null;
 			foreach (Column column in table.ColumnCollection)
 			{
 				if (ColumnConceptTypeChildPathStartsWith(column, startingPath))
 				{
-					columns.Add(column);
+					(columns ?? (columns = new List<Column>())).Add(column);
 				}
 			}
 			return columns;

Modified: trunk/Tools/NUBuildVS/NUBuildVS.csproj
===================================================================
--- trunk/Tools/NUBuildVS/NUBuildVS.csproj	2009-11-02 20:18:02 UTC (rev 1416)
+++ trunk/Tools/NUBuildVS/NUBuildVS.csproj	2009-11-17 23:44:42 UTC (rev 1417)
@@ -50,7 +50,7 @@
     <None Include="Neumont.Build.VisualStudio.Multitargeting.targets" />
     <None Include="Install.bat" />
     <None Include="Neumont.Build.VisualStudio.targets" />
-    <Compile Include="Tasks\VsSdkLocator.cs" />
+    <Compile Include="Tasks\VsSDKLocator.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Neumont\Neumont.Build.targets" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.