SF.net SVN: orm:[1321] trunk/ORMModel/ObjectModel

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

Revision: 1321
          http://orm.svn.sourceforge.net/orm/?rev=1321&view=rev
Author:   mcurland
Date:     2008-08-15 15:07:50 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Equality constraint double stating FactType in second sequence. Data entry fix from [1315]. refs #286

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs
    trunk/ORMModel/ObjectModel/VerbalizationGenerator.xml

Modified: trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs
===================================================================
--- trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs	2008-08-14 21:36:23 UTC (rev 1320)
+++ trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs	2008-08-15 15:07:50 UTC (rev 1321)
@@ -8079,7 +8079,7 @@
 					{
 						sbTemp.Length = 0;
 					}
-					for (int RoleIter2 = 0; RoleIter2 < columnArity; ++RoleIter2)
+					for (int RoleIter2 = 0; RoleIter2 < 1; ++RoleIter2)
 					{
 						RoleBase primaryRole = includedSequenceRoles[RoleIter2];
 						parentFact = primaryRole.FactType;

Modified: trunk/ORMModel/ObjectModel/VerbalizationGenerator.xml
===================================================================
--- trunk/ORMModel/ObjectModel/VerbalizationGenerator.xml	2008-08-14 21:36:23 UTC (rev 1320)
+++ trunk/ORMModel/ObjectModel/VerbalizationGenerator.xml	2008-08-15 15:07:50 UTC (rev 1321)
@@ -1112,7 +1112,7 @@
 									</IterateRoles>
 								</IterateSequences>
 								<IterateSequences listStyle="null" pass="notFirst">
-									<IterateRoles match="constraintRoles" listStyle="null">
+									<IterateRoles match="constraintRoles" listStyle="null" pass="first">
 										<Fact readingChoice="PreferPrimaryLeadReading">
 											<PredicateReplacement match="included">
 												<Snippet ref="DefiniteArticle"/>


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