- From: CVS User jkosek <cvsmail@w3.org>
- Date: Tue, 27 Nov 2012 14:14:04 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv19729
Modified Files:
its20-types.rnc its20.rnc
Log Message:
Removed provenance ...Pointer attributes, implements ACTION-325
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/27 11:34:11 1.3
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/27 14:14:03 1.4
@@ -101,56 +101,30 @@
its-provenanceRecordsRefPointer.type = its-relative-selector.type
-its-personPointer.type = its-relative-selector.type
-
its-person.type = xsd:string
-its-personRefPointer.type = its-relative-selector.type
-
its-personRef.type = xsd:anyURI
-its-orgPointer.type = its-relative-selector.type
-
its-org.type = xsd:string
-its-orgRefPointer.type = its-relative-selector.type
-
its-orgRef.type = xsd:anyURI
-its-toolPointer.type = its-relative-selector.type
-
its-tool.type = xsd:string
-its-toolRefPointer.type = its-relative-selector.type
-
its-toolRef.type = xsd:anyURI
-its-revPersonPointer.type = its-relative-selector.type
-
its-revPerson.type = xsd:string
-its-revPersonRefPointer.type = its-relative-selector.type
-
its-revPersonRef.type = xsd:anyURI
-its-revOrgPointer.type = its-relative-selector.type
-
its-revOrg.type = xsd:string
-its-revOrgRefPointer.type = its-relative-selector.type
-
its-revOrgRef.type = xsd:anyURI
-its-revToolPointer.type = its-relative-selector.type
-
its-revTool.type = xsd:string
-its-revToolRefPointer.type = its-relative-selector.type
-
its-revToolRef.type = xsd:anyURI
-its-provRefPointer.type = its-relative-selector.type
-
its-provRef.type = xsd:anyURI
its-externalResourceRefPointer.type = its-relative-selector.type
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/27 11:34:11 1.6
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/27 14:14:03 1.7
@@ -93,6 +93,10 @@
its-attribute.provRef = attribute its:provRef { its-provRef.type }
its-attribute.provRef.nons = attribute provRef { its-provRef.type }
+its-attribute.provenanceRecordsRef = attribute its:provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
+its-attribute.provenanceRecordsRef.nons = attribute provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
+
+
its-attribute.locQualityIssuesRef = attribute its:locQualityIssuesRef { its-locQualityIssuesRef.type }
its-attribute.locQualityIssuesRef.nons = attribute locQualityIssuesRef { its-locQualityIssuesRef.type }
@@ -189,6 +193,16 @@
its-attribute.disambigClassRef? &
((its-attribute.disambigSource, its-attribute.disambigIdent) | its-attribute.disambigIdentRef)? &
its-attribute.localeFilterList? &
+ ((
+ (its-attribute.person | its-attribute.personRef )? &
+ (its-attribute.org | its-attribute.orgRef )? &
+ (its-attribute.tool | its-attribute.toolRef )? &
+ (its-attribute.revPerson | its-attribute.revPersonRef )? &
+ (its-attribute.revOrg | its-attribute.revOrgRef )? &
+ (its-attribute.revTool | its-attribute.revToolRef )? &
+ its-attribute.provRef?)
+ |
+ its-attribute.provenanceRecordsRef)? &
(its-attribute.locQualityIssuesRef
|
((its-attribute.locQualityIssueType | its-attribute.locQualityIssueComment | (its-attribute.locQualityIssueType & its-attribute.locQualityIssueComment)) &
@@ -212,6 +226,15 @@
its-attribute.disambigClassRef.nons? &
((its-attribute.disambigSource.nons, its-attribute.disambigIdent.nons) | its-attribute.disambigIdentRef.nons)? &
its-attribute.localeFilterList.nons? &
+ ((
+ (its-attribute.person.nons | its-attribute.personRef.nons )? &
+ (its-attribute.org.nons | its-attribute.orgRef.nons )? &
+ (its-attribute.tool.nons | its-attribute.toolRef.nons )? &
+ (its-attribute.revPerson.nons | its-attribute.revPersonRef.nons )? &
+ (its-attribute.revOrg.nons | its-attribute.revOrgRef.nons )? &
+ (its-attribute.revTool.nons | its-attribute.revToolRef.nons )? &
+ its-attribute.provRef.nons?)
+ | its-attribute.provenanceRecordsRef)? &
(its-attribute.locQualityIssuesRef.nons
|
((its-attribute.locQualityIssueType.nons | its-attribute.locQualityIssueComment.nons | (its-attribute.locQualityIssueType.nons & its-attribute.locQualityIssueComment.nons)) &
@@ -398,7 +421,18 @@
its-attribute.selector,
its-attribute.localeFilterList.nons
-# FIXME: Provenance
+its-provRule =
+ ## Rule about the Provenance data category.
+ element provRule {
+ its-provRule.content, its-provRule.attributes
+ }
+
+its-provRule.content = empty
+its-provRule.attributes =
+ its-attribute.selector,
+ its-attribute.provenanceRecordsRefPointer.nons
+
+its-attribute.provenanceRecordsRefPointer.nons = attribute provenanceRecordsRefPointer { its-relative-selector.type }
# FIXME: TextAnalyisAnnotation
@@ -490,7 +524,17 @@
its-attribute.storageSizePointer.nons = attribute storageSizePointer { its-relative-selector.type }
its-attribute.storageEncodingPointer.nons = attribute storageEncodingPointer { its-relative-selector.type }
-its-standoff = its-provenanceRecord
+its-standoff = its-provenanceRecords
+
+its-provenanceRecords = element its:provenanceRecords { its-provenanceRecord+ }
-its-provenanceRecord = element its:provenanceRecord { empty } #FIXME
+its-provenanceRecord = element its:provenanceRecord { its-provenanceRecord.attributes }
+its-provenanceRecord.attributes =
+ (its-attribute.person.nons | its-attribute.personRef.nons )? &
+ (its-attribute.org.nons | its-attribute.orgRef.nons )? &
+ (its-attribute.tool.nons | its-attribute.toolRef.nons )? &
+ (its-attribute.revPerson.nons | its-attribute.revPersonRef.nons )? &
+ (its-attribute.revOrg.nons | its-attribute.revOrgRef.nons )? &
+ (its-attribute.revTool.nons | its-attribute.revToolRef.nons )? &
+ its-attribute.provRef.nons?
Received on Tuesday, 27 November 2012 14:14:10 UTC