Skip to content

Disambiguate entity type label based tags #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeikoTheissen merged 9 commits into from
Sep 7, 2026
Merged

Disambiguate entity type label based tags #371

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9e2676
Deduplicate entity type label based tags
HeikoTheissen Sep 4, 2026
4ffdf2e
Disambiguate only where necessary
HeikoTheissen Sep 4, 2026
83798d3
Speed up using xsl:key
HeikoTheissen Sep 4, 2026
83f8f25
Common.Label can also be embedded (OData V2)
HeikoTheissen Sep 4, 2026
c4cd97e
Corrected indentation
HeikoTheissen Sep 4, 2026
0468074
Merge remote-tracking branch 'origin/main' into bug/duplicate-tags
HeikoTheissen Sep 4, 2026
71c5be4
Proper Muenchian grouping
HeikoTheissen Sep 7, 2026
8af3a13
Avoid global variables in xsl:key
HeikoTheissen Sep 7, 2026
5451571
Ignore labels for properties
HeikoTheissen Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions tools/V4-CSDL-to-OpenAPI.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@
<xsl:key name="namespaceQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Namespace,'.',@Name)" />
<xsl:key name="aliasQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Alias,'.',@Name)" />

<xsl:key name="label" match="//edm:Annotation[
(parent::edm:EntityType or parent::edm:Annotations[not(contains(@Target,'/'))]) and
(@Term='com.sap.vocabularies.Common.v1.Label' or
@Term=concat(/edmx:Edmx/edmx:Reference/edmx:Include[@Namespace='com.sap.vocabularies.Common.v1']/@Alias,'.Label'))]"
use="@String | edm:String" />

<!-- TODO: collect all annotations for target once in caller and pass them here -->
<xsl:template name="capability">
<xsl:param name="term" />
Expand Down Expand Up @@ -2807,6 +2813,23 @@
<xsl:choose>
<xsl:when test="$label!=''">
<xsl:value-of select="$label" />
<!-- Add entity name for disambiguation if the label occurs more than once. -->
<xsl:variable name="labelTarget" select="key('label',$label)[1]/.." />
<xsl:variable name="labelEntityType">
<xsl:choose>
<xsl:when test="$labelTarget/@Target">
<xsl:value-of select="generate-id(key('namespaceQualifiedType',$labelTarget/@Target)|key('aliasQualifiedType',$labelTarget/@Target))" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="generate-id($labelTarget)" />
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:if test="$labelEntityType != generate-id($entityType)">
<xsl:text> (</xsl:text>
<xsl:value-of select="$set/@Name" />
<xsl:text>)</xsl:text>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$set/@Name" />
Expand Down