simon/adl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

A number of minor bugfixes whilst getting SRU Hospitality to work with current ADL. I'm confident these are all bugfixes and they will have no adverse effect on other cutomers systems (the only system that might be affected is ASL and I shall check this).

Browse source
This commit is contained in:
sb 2009-01-28 18:03:42 +00:00
parent ee4ae42fc4
commit 78964a814e
4 changed files with 118 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ADL.sln
View file

@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CygnetToolkit", "..\CygnetT
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{45578889-14A2-4A53-8391-0596369CCBA5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{45578889-14A2-4A53-8391-0596369CCBA5}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{535E325C-7823-497E-A990-E3331C64681F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B41EED-23C8-4DEF-B113-46A426346E45}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B41EED-23C8-4DEF-B113-46A426346E45}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
@ -16,9 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProjectSection EndProjectSection
EndProject EndProject
Global Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ADL.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
@ -36,10 +33,10 @@ Global
{45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU {45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.Build.0 = Release|Any CPU {45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.Build.0 = Release|Any CPU
{535E325C-7823-497E-A990-E3331C64681F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{535E325C-7823-497E-A990-E3331C64681F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{535E325C-7823-497E-A990-E3331C64681F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{535E325C-7823-497E-A990-E3331C64681F}.Release|Any CPU.Build.0 = Release|Any CPU {D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

5
UnitTests/obj/Debug/UnitTests.csproj.FileListAbsolute.txt
View file

@ -3,3 +3,8 @@ C:\Projects\UnitTests\bin\Debug\UnitTests.pdb
C:\Projects\UnitTests\obj\Debug\ResolveAssemblyReference.cache C:\Projects\UnitTests\obj\Debug\ResolveAssemblyReference.cache
C:\Projects\UnitTests\obj\Debug\UnitTests.exe C:\Projects\UnitTests\obj\Debug\UnitTests.exe
C:\Projects\UnitTests\obj\Debug\UnitTests.pdb C:\Projects\UnitTests\obj\Debug\UnitTests.pdb
C:\Projects\ADL\UnitTests\bin\Debug\UnitTests.exe
C:\Projects\ADL\UnitTests\bin\Debug\UnitTests.pdb
C:\Projects\ADL\UnitTests\obj\Debug\ResolveAssemblyReference.cache
C:\Projects\ADL\UnitTests\obj\Debug\UnitTests.exe
C:\Projects\ADL\UnitTests\obj\Debug\UnitTests.pdb

28
transforms/adl2canonical.xslt
View file

@ -20,8 +20,8 @@
explicitly state the permission, even if it is 'none'. explicitly state the permission, even if it is 'none'.
$Author: sb $ $Author: sb $
$Revision: 1.5 $ $Revision: 1.6 $
$Date: 2008-10-02 10:52:40 $ $Date: 2009-01-28 18:03:43 $
--> -->
<xsl:stylesheet version="1.0" <xsl:stylesheet version="1.0"
@ -74,7 +74,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT * THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT
* BE MANUALLY EDITED. * BE MANUALLY EDITED.
* *
* Generated using adl2canonical.xslt <xsl:value-of select="substring('$Revision: 1.5 $', 12)"/> * Generated using adl2canonical.xslt <xsl:value-of select="substring('$Revision: 1.6 $', 12)"/>
* *
*************************************************************************** ***************************************************************************
</xsl:comment> </xsl:comment>
@ -258,7 +258,7 @@
<!-- children copied through in legal order, to ensure the document remains valid --> <!-- children copied through in legal order, to ensure the document remains valid -->
<xsl:apply-templates select="adl:documentation"/> <xsl:apply-templates select="adl:documentation"/>
<!-- unroll the properties --> <!-- unroll the properties -->
<xsl:call-template name="unroll-properties"/> <xsl:call-template name="unroll-properties-no-lists"/>
<xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field| <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
adl:fieldgroup|adl:auxlist|adl:verb| adl:fieldgroup|adl:auxlist|adl:verb|
adl:permission|adl:pragma"/> adl:permission|adl:pragma"/>
@ -414,6 +414,26 @@
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
<!-- unroll all the explicit properties in the ancestor entity of
the context (assumed to be form, page or list) into a list of fields, ommitting
those properties which are inherently lists -->
<xsl:template name="unroll-properties-no-lists">
<xsl:for-each select="ancestor::adl:entity/descendant::adl:property">
<xsl:choose>
<xsl:when test="@type='list'"/>
<xsl:when test="@type='link'"/>
<xsl:otherwise>
<field>
<xsl:attribute name="property">
<xsl:value-of select="@name"/>
</xsl:attribute>
</field>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:template>
<!-- unroll all the user-distinct properties in the ancestor entity of <!-- unroll all the user-distinct properties in the ancestor entity of
the context (assumed to be form, page or list) into a list of fields. the context (assumed to be form, page or list) into a list of fields.
NOTE that n-to-n properties cannot currently be user-distinct and are NOTE that n-to-n properties cannot currently be user-distinct and are

185
transforms/adl2views.xslt
View file

@ -13,8 +13,8 @@
Transform ADL into velocity view templates Transform ADL into velocity view templates
$Author: sb $ $Author: sb $
$Revision: 1.17 $ $Revision: 1.18 $
$Date: 2009-01-28 12:10:02 $ $Date: 2009-01-28 18:03:43 $
--> -->
<!-- WARNING WARNING WARNING: Do NOT reformat this file! <!-- WARNING WARNING WARNING: Do NOT reformat this file!
Whitespace (or lack of it) is significant! --> Whitespace (or lack of it) is significant! -->
@ -124,7 +124,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>, Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
</xsl:comment> </xsl:comment>
<xsl:call-template name="maybe-delete"> <xsl:call-template name="maybe-delete">
<xsl:with-param name="entity" select="."/> <xsl:with-param name="entity" select="."/>
@ -161,7 +161,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>, Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
<xsl:value-of select="/adl:application/@revision"/> <xsl:value-of select="/adl:application/@revision"/>
</xsl:comment> </xsl:comment>
@ -244,7 +244,7 @@
Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
<xsl:value-of select="/adl:application/@revision"/> <xsl:value-of select="/adl:application/@revision"/>
</xsl:comment> </xsl:comment>
@ -366,7 +366,7 @@
Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
<xsl:value-of select="/adl:application/@revision"/> <xsl:value-of select="/adl:application/@revision"/>
</xsl:comment> </xsl:comment>
@ -624,7 +624,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="@properties='listed'"> <xsl:when test="@properties='listed'">
<xsl:comment>auxlist for with listed fields</xsl:comment> <xsl:comment>auxlist for with listed fields: <xsl:value-of select="$farent/@name"/></xsl:comment>
<xsl:call-template name="internal-with-fields-list"> <xsl:call-template name="internal-with-fields-list">
<xsl:with-param name="entity" select="//adl:entity[@name=$farent]"/> <xsl:with-param name="entity" select="//adl:entity[@name=$farent]"/>
<xsl:with-param name="fields" select="adl:field"/> <xsl:with-param name="fields" select="adl:field"/>
@ -632,7 +632,7 @@
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:comment>auxlist with computed fields</xsl:comment> <xsl:comment>auxlist with computed fields: <xsl:value-of select="$farent/@name"/></xsl:comment>
<xsl:call-template name="internal-with-properties-list"> <xsl:call-template name="internal-with-properties-list">
<xsl:with-param name="entity" select="//adl:entity[@name=$farent]"/> <xsl:with-param name="entity" select="//adl:entity[@name=$farent]"/>
<xsl:with-param name="properties" select="//adl:entity[@name=$farent]//adl:property[(@distinct='user' or @distinct='all') and not( @type='link' or @type='list')]"/> <xsl:with-param name="properties" select="//adl:entity[@name=$farent]//adl:property[(@distinct='user' or @distinct='all') and not( @type='link' or @type='list')]"/>
@ -972,7 +972,7 @@
Auto generated Velocity list for <xsl:value-of select="@name"/>, Auto generated Velocity list for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
</xsl:comment> </xsl:comment>
#capturefor( title) #capturefor( title)
@ -1010,7 +1010,7 @@
Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/> Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
</xsl:comment> </xsl:comment>
<xsl:call-template name="install-scripts"/> <xsl:call-template name="install-scripts"/>
</head> </head>
@ -1093,21 +1093,15 @@
<table> <table>
<tr> <tr>
<xsl:for-each select="$fields"> <xsl:for-each select="$fields">
<xsl:choose> <xsl:variable name="field" select="."/>
<xsl:when test="@type='list'"> <th>
<!-- suppress layout of columns which are themselves lists --> <xsl:call-template name="showprompt">
</xsl:when> <xsl:with-param name="node" select="."/>
<xsl:otherwise> <xsl:with-param name="fallback" select="@property"/>
<th> <xsl:with-param name="entity" select="$entity"/>
<xsl:call-template name="showprompt"> <xsl:with-param name="locale" select="$locale"/>
<xsl:with-param name="node" select="."/> </xsl:call-template>
<xsl:with-param name="fallback" select="@property"/> </th>
<xsl:with-param name="entity" select="$entity"/>
<xsl:with-param name="locale" select="$locale"/>
</xsl:call-template>
</th>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each> </xsl:for-each>
<xsl:for-each select="$entity/adl:form"> <xsl:for-each select="$entity/adl:form">
<th>-</th> <th>-</th>
@ -1116,52 +1110,49 @@
<xsl:if test="$can-search = 'true'"> <xsl:if test="$can-search = 'true'">
<tr class="search"> <tr class="search">
<xsl:for-each select="$fields"> <xsl:for-each select="$fields">
<xsl:choose> <xsl:variable name="field" select="."/>
<xsl:when test="@type='list'"> <td class="search">
<!-- suppress layout of columns which are themselves lists --> <xsl:variable name="size">
</xsl:when> <xsl:choose>
<xsl:otherwise> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='string'">
<td class="search">
<xsl:variable name="pname" select="@property"/>
<xsl:variable name="property" select="$entity//adl:property[@name=$pname]"/>
<xsl:variable name="size">
<xsl:choose> <xsl:choose>
<xsl:when test="$property/@type='string'"> <xsl:when test="$entity//adl:property[@name=$field/@property]/@size &gt; 20">20</xsl:when>
<xsl:choose> <xsl:otherwise>
<xsl:when test="$property/@size &gt; 20">20</xsl:when> <xsl:value-of select="$entity//adl:property[@name=$field/@property]/@size"/>
<xsl:otherwise> </xsl:otherwise>
<xsl:value-of select="$property/@size"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:when test="$property/@type='integer'">8</xsl:when>
<xsl:when test="$property/@type='real'">8</xsl:when>
<xsl:when test="$property/@type='money'">8</xsl:when>
<!-- xsl:when test="$property/@type='message'">20</xsl:when doesn't work yet -->
<xsl:when test="$property/@type='text'">20</xsl:when>
<!-- xsl:when test="$property/@type='enity'">20</xsl:when doesn't work yet -->
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:when>
<xsl:if test="$size != 0"> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='integer'">8</xsl:when>
<input> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='real'">8</xsl:when>
<xsl:attribute name="name"> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='money'">8</xsl:when>
<xsl:value-of select="concat('search_',$property/@name)"/> <!-- xsl:when test="$entity//adl:property[@name=$field/@property]/@type='message'">20</xsl:when doesn't work yet -->
</xsl:attribute> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='text'">20</xsl:when>
<xsl:attribute name="size"> <!-- xsl:when test="$entity//adl:property[@name=$field/@property]/@type='enity'">20</xsl:when doesn't work yet -->
<xsl:value-of select="$size"/> <xsl:otherwise>0</xsl:otherwise>
</xsl:attribute> </xsl:choose>
<xsl:attribute name="value"> </xsl:variable>
<xsl:value-of select="concat( '$!search_', $property/@name)"/> <xsl:if test="$size != 0">
</xsl:attribute> <input>
</input> <xsl:attribute name="name">
</xsl:if> <xsl:value-of select="concat('search_',$entity//adl:property[@name=$field/@property]/@name)"/>
</td> </xsl:attribute>
</xsl:otherwise> <xsl:attribute name="size">
</xsl:choose> <xsl:value-of select="$size"/>
</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of select="concat( '$!search_', $entity//adl:property[@name=$field/@property]/@name)"/>
</xsl:attribute>
</input>
</xsl:if>
</td>
</xsl:for-each> </xsl:for-each>
</tr> </tr>
</xsl:if> </xsl:if>
<xsl:if test="not( $entity/@name)">
<xsl:message terminate="yes">
Unknown entity whilst trying to generate list
</xsl:message>
</xsl:if>
#foreach( <xsl:value-of select="concat( '$', $entity/@name)"/> in <xsl:value-of select="concat('$', $instance-list)"/>) #foreach( <xsl:value-of select="concat( '$', $entity/@name)"/> in <xsl:value-of select="concat('$', $instance-list)"/>)
#if ( $velocityCount % 2 == 0) #if ( $velocityCount % 2 == 0)
#set( $oddity = "even") #set( $oddity = "even")
@ -1170,40 +1161,32 @@
#end #end
<tr class="$oddity"> <tr class="$oddity">
<xsl:for-each select="$fields"> <xsl:for-each select="$fields">
<xsl:variable name="pname" select="@property"/> <xsl:variable name="field" select="."/>
<xsl:variable name="property" select="$entity//adl:property[@name=$pname]"/> <td>
<xsl:choose> <xsl:choose>
<xsl:when test="@type='list'"> <xsl:when test="not( $entity//adl:property[@name=$field/@property]/@name)">
<!-- suppress layout of columns which are themselves lists --> <!-- shouldn't happen. There is definitely a bug here, because it does happen - but it shouldn't -->
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type = 'date'">
<td> #if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>)
<xsl:choose> <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>.ToString( 'd')
<xsl:when test="not( $property/@name)"> #end
<!-- shouldn't happen. There is definitely a bug here, because it does happen - but it shouldn't --> </xsl:when>
</xsl:when> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='message'">
<xsl:when test="$property/@type = 'date'"> #if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>)
#if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>) $t.Msg( <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>)
<xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>.ToString( 'd') #end
#end </xsl:when>
</xsl:when> <xsl:when test="$entity//adl:property[@name=$field/@property]/@type='entity'">
<xsl:when test="$property/@type='message'"> #if( <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>)
#if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>) <xsl:value-of select="concat( '$', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name, '.UserIdentifier')"/>
$t.Msg( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>) #end
#end </xsl:when>
</xsl:when> <xsl:otherwise>
<xsl:when test="$property/@type='entity'"> <xsl:value-of select="concat( '$!', $entity/@name, '.', $entity//adl:property[@name=$field/@property]/@name)"/>
#if( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>) </xsl:otherwise>
<xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name, '.UserIdentifier')"/> </xsl:choose>
#end </td>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat( '$!', $entity/@name, '.', $property/@name)"/>
</xsl:otherwise>
</xsl:choose>
</td>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each> </xsl:for-each>
<xsl:variable name="keys"> <xsl:variable name="keys">
<!-- assemble keys in a Velocity-friendly format, then splice it into <!-- assemble keys in a Velocity-friendly format, then splice it into
@ -1231,7 +1214,7 @@
<td> <td>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="concat( @name, '.rails', $keys)"/> <xsl:value-of select="concat( '../', $entity/@name, '/', @name, '.rails', $keys)"/>
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="@name"/>! <xsl:value-of select="@name"/>!
</a> </a>