NewsML-G2 v2.31 (#15)

* hasInstrument now works on <concept> and <assert>, and is deprecated on <organisationDetails>. Equivalent updates to dev schema, generator, unit tests, XML Schema docs Fixes #98.

MAINTENANCE.md

@@ -48,21 +48,24 @@ Steps to create and release an update to the standard:
     supported by the Core version of the standard)
 10. Run `release-tools/test-newsml-examples.sh` which runs `xmllint` over the
     examples folder to make sure no errors have been introduced.
-11. Use XML Spy to create XML Schema documentation from the master XSD schema
+11. Run `tests/runtests.py` to run the unit tests and make sure that the new
+    version doesn't break any old test cases. You should also write new unit
+    tests for the changes being added, if you haven't already.
+12. Use XML Spy to create XML Schema documentation from the master XSD schema
     file and the "individual" schemas. Save them to
     `specification/XML-Schema-Doc-Power`.
-12. Print-to-PDF change requests from dev.iptc.org for inclusion in release pack
+13. Print-to-PDF change requests from dev.iptc.org for inclusion in release pack
     to be sent to delegates, if necessary.
-13. Run the script to move all files to the release folder and create ZIP files
+14. Run the script to move all files to the release folder and create ZIP files
     of the release: `release-tools/create-release.sh`
-14. Commit and push all changes to GitHub: `git push origin -u my-new-branch`
+15. Commit and push all changes to GitHub: `git push origin -u my-new-branch`
     (Our `.gitignore` file already suppresses sending ZIP files to GitHub.)
-15. Create a pull request from the branch on GitHub.com.
+16. Create a pull request from the branch on GitHub.com.
 
 ### After the Standards Committee approves the new version:
 
 1.  Update the APPROVED_DATE in `release-tools/newsmlg2-config-vars.sh`
-2.  Run the above steps 3, 5, 7, 8, 10, 11, 13, 14 again to update files with
+2.  Run the above steps 3, 5, 7, 8, 10, 12, 14, 15 again to update files with
     the approval date (this should be quick, just running scripts, except for
     the XML Spy documentation step)
 3.  Merge the pull request into master on GitHub
@@ -71,4 +74,11 @@ Steps to create and release an update to the standard:
     Schema documentation.
 6.  Update the http://dev.iptc.org/G2-Approved-Changes page documenting the
     changes made.
-7.  Tag the release in GitHub (git tag N.NN.N, git push --tags)
+7.  Tag the release in GitHub: `git tag N.NN.N`, `git push --tags`)
+
+### To update unit tests:
+
+1.  Create a new dev schema referring to the latest schema version, in the
+    `dev-schema` folder.
+2.  Update the `tests/run-tests.PY` script to refer to the new version.
+3.  Make a new folder in `tests/unit_test_files` and put new tests there.

README.md

@@ -9,7 +9,7 @@ The GitHub repository
 ([https://github.com/iptc/newsml-g2](https://github.com/iptc/newsml-g2)
 provides all NewsML-G2 files in the master branch.
 
-This is version 2.30, approved by the IPTC Standards Committee in October 2021.
+This is version 2.31, approved by the IPTC Standards Committee in October 2022.
 
 The files of the current and of previous versions (from 2.23 on) can be retrieved
 as GitHub releases from

dev-schema/NewsML-G2dev_0.6_nar231.xsd

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+IPTC - International Press Telecommunications Council
+25 Southampton Buildings, London WC2A 1AL, United Kingdom
+www.iptc.org
+This document is published under the Creative Commons Attribution 4.0 licence.
+See the full license agreement at http://creativecommons.org/licenses/by/4.0/
+By obtaining, using and/or copying this document, you (the licensee) agree that
+you have read, understood, and will comply with the terms and conditions of the
+license.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="https://iptc.org/std-dev/nar/" xmlns:nar="http://iptc.org/std/nar/2006-10-01/" targetNamespace="https://iptc.org/std-dev/nar/" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.6" xml:lang="en">
+	<xs:annotation>
+		<xs:documentation>This XML Schema is created for a NewsML-G2 development namespace with the URI https://iptc.org/std-dev/nar/. It imports a NewsML-G2 2.x XML Schema and its elements build on attributes, attribute groups and elements defined by it.
+		</xs:documentation>
+		<xs:documentation>NewsML-G2 Dev 0.6 XML Schema - UNDER CONSTRUCTION</xs:documentation>
+		<xs:documentation>Date of creation of this XML Schema document revision: 2022-10-11</xs:documentation>
+		<xs:documentation>Last change: update to be based on 2.31 schema</xs:documentation>
+		<xs:documentation>Created by Michael Steidl</xs:documentation>
+		<xs:documentation>Revised by Brendan Quinn</xs:documentation>
+	</xs:annotation>
+	<xs:import namespace="http://iptc.org/std/nar/2006-10-01/" schemaLocation="https://iptc.org/std/NewsML-G2/2.31/specification/NewsML-G2_2.31-spec-All-Power.xsd"/>
+	<!-- The NewsMLG2 schema contain the NAR building blocks used for experimental NewsML-G2 -->
+	<!-- ========================================================================================= -->
+	<!--   Advice element: a wrapper of child properties, is setting role and environment -->
+	<xs:element name="advice">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="importance" type="nar:Flex1ConceptPropType" minOccurs="0"/>
+				<xs:element name="lifetime" type="nar:Flex1ConceptPropType" minOccurs="0"/>
+			</xs:sequence>
+			<xs:attributeGroup ref="nar:commonPowerAttributes"/>
+			<xs:attribute name="role" type="nar:QCodeType">
+				<xs:annotation>
+					<xs:documentation>A refinement of what kind of alternative is provided by this identifier - expressed by a QCode</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+			<xs:attribute name="roleuri" type="nar:IRIType">
+				<xs:annotation>
+					<xs:documentation>A refinement of what kind of alternative is provided by this identifier - expressed by an URI</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+			<xs:attribute name="environment" type="nar:QCodeListType" use="optional">
+				<xs:annotation>
+					<xs:documentation> A qualifier which indicates the business environment in which the identifier can be used to access the content - expressed by a QCode</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+			<xs:attribute name="environmenturi" type="nar:IRIListType" use="optional">
+				<xs:annotation>
+					<xs:documentation> A qualifier which indicates the business environment in which the identifier can be used to access the content - expressed by a URI</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<!-- ========================================================================================= -->
+</xs:schema>

examples/LISTING_12_Knowledge_Item_for_Access_Codes.xml

@@ -3,10 +3,10 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20090202:ncdki-accesscode" version="11"
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power" >
     <catalogRef
         href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_13_Complete_Catalog_Item.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20130517:catalog"
     version="31" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power" 
     xml:lang="en-GB">
     <catalogRef

examples/LISTING_14_Event_sent_as_a_Concept_Item.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20160422:qqwpiruuew4711" 
     version="11"
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en">
     <catalogRef href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_15_Two_Related_Events_in_a_Knowledge_Item.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20101019:qqwpiruuew4712" 
     version="11"
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en">
     <catalogRef href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_16_A_Set_of_Events_carried_in_a_News_Item.xml

@@ -3,9 +3,9 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20090122:qqwpiruuew4711"
-    version="11" standard="NewsML-G2" standardversion="2.30" conformance="power"
+    version="11" standard="NewsML-G2" standardversion="2.31" conformance="power"
     xml:lang="en">
     <catalogRef href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />
     <itemMeta>

examples/LISTING_18_Planning_Item_at_PCL.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20101025:gbmrmdreis4711" 
     version="11"
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en">
     <catalogRef href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_1_A_NewsML-G2_News_Item.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:acmenews.com:20161018:US-FINANCE-FED"
     version="11" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en-GB">
     <catalogRef

examples/LISTING_20_Planning_Item_with_delivery_at_PCL.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:iptc.org:20101025:gbmrmdreis4711" 
     version="11"
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en">
     <catalogRef href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_21_A_complete_sample_SportsML-G2_document.xml

@@ -3,8 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nitf="http://iptc.org/std/NITF/2006-10-18/"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" standard="NewsML-G2"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
-    standardversion="2.30" version="1" conformance="power" xml:lang="en-US"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
+    standardversion="2.31" version="1" conformance="power" xml:lang="en-US"
     guid="urn:newsml:sportsml.org:20160502:xt.prog.20150606005942-43710-16.068-event-stats-progressive">
     <catalogRef
         href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_22_Sports_story_in_NewsML-G2NITF.xml

@@ -3,12 +3,12 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="tag:xmlteam.com,2016:xt.5932656-preview"
     version="11"
     xmlns:xts="www.xmlteam.com" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power" 
     xml:lang="en-US">
     <catalogRef

examples/LISTING_23_SportsML-G2_Package.xml

@@ -3,12 +3,12 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:iptc.org:20161019:sports1" version="11"
     xmlns:xts="www.xmlteam.com" 
     conformance="power" 
     standard="NewsML-G2"
-    standardversion="2.30" 
+    standardversion="2.31" 
     xml:lang="en-US">
     <catalogRef
         href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_26_Embedded_photo_metadata_fields_mapped_to_NewsML-G2.xml

@@ -2,11 +2,11 @@
 <newsItem xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="tag:acmenews.com,2008:WORLD-NEWS:USA20081208098658"
     version="11" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power">
     <catalogRef
         href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />

examples/LISTING_27_Company_Financial_Information.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:acmenews.com:20161019:201003230594296001"
     version="11" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power"
     xml:lang="en-US">
     <catalogRef

examples/LISTING_29_Hop_History.xml

@@ -3,11 +3,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="urn:newsml:acmenews.com:20161019T1205:HOP-HISTORY-EXAMPLE"
     version="11" 
     standard="NewsML-G2"
-    standardversion="2.30" xml:lang="en-US">
+    standardversion="2.31" xml:lang="en-US">
     <catalogRef
         href="http://www.iptc.org/std/catalog/catalog.IPTC-G2-Standards_32.xml" />
     <catalogRef href="http://www.acmenews.com/synd/catalogs/anmcodes.xml" />

examples/LISTING_3A_Photo_in_NewsML-G2_(URI_sibling_attributes).xml

@@ -2,11 +2,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="tag:gettyimages.com,2010:GYI0062134533"
     version="11" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power" 
     xml:lang="en-US">
     <catalogRef

examples/LISTING_3_Photo_in_NewsML-G2.xml

@@ -2,11 +2,11 @@
     xmlns="http://iptc.org/std/nar/2006-10-01/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://iptc.org/std/nar/2006-10-01/ 
-        ./NewsML-G2_2.30-spec-All-Power.xsd"
+        ./NewsML-G2_2.31-spec-All-Power.xsd"
     guid="tag:gettyimages.com,2010:GYI0062134533"
     version="11" 
     standard="NewsML-G2" 
-    standardversion="2.30" 
+    standardversion="2.31" 
     conformance="power" 
     xml:lang="en-US">
     <catalogRef