Skip to content

Commit 30c1f63

Browse files
committed
Use id attribute for product & docset
We can remove productid and setid as it all is a "id".
1 parent 667aab1 commit 30c1f63

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/docbuild/config/xml/data/product-config-schema.rnc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@ div {
403403
db:refpurpose [ "Product ID, must be unique across entire site config, used as first-level path element" ]
404404
]
405405
# TODO: Simplify to id?
406-
attribute productid { ds.type.id }
406+
# attribute productid { ds.type.id }
407+
ds.id.attr
407408

408409
ds.schemaversion.attr =
409410
## Version of the schema, verifies that Docserv² major version and version of product configuration match
@@ -452,8 +453,7 @@ ds.product =
452453
# of these ID per productconfig file.
453454
(
454455
ds.xmlbase.attr? &
455-
ds.productid.attr &
456-
ds.schemaversion.attr &
456+
ds.productid.attr & # TODO: use ds.id.attr?
457457
ds.schemaversion.attr? &
458458
ds.enabled.attr? &
459459
ds.site-section.attr? &
@@ -697,7 +697,8 @@ div {
697697
[
698698
db:refpurpose [ "Set ID, must be unique across the configuration for a single product" ]
699699
]
700-
attribute setid { ds.type.id }
700+
# attribute setid { ds.type.id }
701+
ds.id.attr
701702

702703
ds.navigation.attr =
703704
## Whether to build a navigational page for this product version
@@ -718,7 +719,7 @@ ds.docset =
718719
element docset {
719720
(
720721
ds.xmlbase.attr? &
721-
ds.setid.attr &
722+
ds.setid.attr & # TODO: use ds.id.attr?
722723
ds.lifecycle.attr &
723724
ds.navigation.attr? &
724725
ds.gated.attr?

0 commit comments

Comments
 (0)