Navigation

← Previous Changeset
Next Changeset →

Changeset 46

Timestamp:

2006-02-05 12:10:31 (3 years ago)

Author:

matt

Message:

Created a new schema revision: 1.0rc2.
Added artist aliases.
Renamed "release-info" to "release-event".
Added a "sectors" attribute to "disc", containing the length of the disc.
Updated all examples to validate with the new schema.
Added an example for aliases.

Files:

mmd-schema/trunk/schema/musicbrainz_mmd-1.0rc2.rng (copied) (copied from mmd-schema/trunk/schema/musicbrainz_mmd-1.0rc1.rng) (7 diffs)
mmd-schema/trunk/test-data/valid/artist/Tori_Amos_2.xml (modified) (3 diffs)
mmd-schema/trunk/test-data/valid/artist/Tori_Amos_4.xml (added)
mmd-schema/trunk/test-data/valid/release/Highway_61_Revisited_1.xml (modified) (1 diff)
mmd-schema/trunk/test-data/valid/release/Little_Earthquakes_1.xml (modified) (1 diff)
mmd-schema/trunk/test-data/valid/release/Little_Earthquakes_2.xml (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

mmd-schema/trunk/schema/musicbrainz_mmd-1.0rc2.rng

r36	r46
4	4	$Id$
5	5
6		Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc1
	6	Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc2
7	7
8	8
…	…
112	112
113	113	<optional>
	114	<ref name="def_alias-list"/>
	115	</optional>
	116	<optional>
114	117	<ref name="def_release-list"/>
115	118	</optional>
…	…
169	172
170	173	<optional>
171		<ref name="def_release-~~info~~-list"/>
	174	<ref name="def_release-event-list"/>
172	175	</optional>
173	176	<optional>
…	…
272	275
273	276
	277	<define name="def_alias">
	278	<element name="alias">
	279	<text/>
	280	</element>
	281	</define>
	282
	283
274	284	<define name="def_extension">
275	285	<element>
…	…
333	343
334	344
	345	<define name="def_alias-list">
	346	<element name="alias-list">
	347	<ref name="def_list-attributes"/>
	348	<zeroOrMore>
	349	<ref name="def_alias"/>
	350	</zeroOrMore>
	351	</element>
	352	</define>
	353
	354
335	355	<define name="def_track-list">
336	356	<element name="track-list">
…	…
343	363
344	364
345		<define name="def_release-~~info~~-list">
346		<element name="release-~~info~~-list">
347		<ref name="def_list-attributes"/>
348		<zeroOrMore>
349		<element name="~~info~~">
	365	<define name="def_release-event-list">
	366	<element name="release-event-list">
	367	<ref name="def_list-attributes"/>
	368	<zeroOrMore>
	369	<element name="event">
350	370	<attribute name="date">
351	371	<ref name="def_incomplete-date"/>
…	…
370	390	</data>
371	391	</attribute>
	392	<optional>
	393	<attribute name="sectors">
	394	<data type="nonNegativeInteger"/>
	395	</attribute>
	396	</optional>
372	397	</element>
373	398	</zeroOrMore>

mmd-schema/trunk/test-data/valid/artist/Tori_Amos_2.xml

r33	r46
9	9	<title>Strange Little Girls</title>
10	10	<asin>B00005NKYQ</asin>
11		<release-~~info~~-list>
12		<~~info~~ date="2001-09-14" country="BE"/>
13		<~~info~~ date="2001-09-14" country="FI"/>
14		<~~info~~ date="2001-09-14" country="IE"/>
15		<~~info~~ date="2001-09-14" country="IT"/>
16		<~~info~~ date="2001-09-14" country="NL"/>
17		<~~info~~ date="2001-09-17" country="AU"/>
18		<~~info~~ date="2001-09-17" country="DE"/>
19		<~~info~~ date="2001-09-17" country="GB"/>
20		<~~info~~ date="2001-09-18" country="CA"/>
21		<~~info~~ date="2001-09-18" country="SE"/>
22		<~~info~~ date="2001-09-18" country="US"/>
23		<~~info~~ date="2001-09-27" country="JP"/>
24		</release-~~info~~-list>
	11	<release-event-list>
	12	<event date="2001-09-14" country="BE"/>
	13	<event date="2001-09-14" country="FI"/>
	14	<event date="2001-09-14" country="IE"/>
	15	<event date="2001-09-14" country="IT"/>
	16	<event date="2001-09-14" country="NL"/>
	17	<event date="2001-09-17" country="AU"/>
	18	<event date="2001-09-17" country="DE"/>
	19	<event date="2001-09-17" country="GB"/>
	20	<event date="2001-09-18" country="CA"/>
	21	<event date="2001-09-18" country="SE"/>
	22	<event date="2001-09-18" country="US"/>
	23	<event date="2001-09-27" country="JP"/>
	24	</release-event-list>
25	25	<disc-list count="3"/>
26	26	</release>
…	…
29	29	<asin>B00001IVJS</asin>
30	30	<artist id="c0b2500e-0cef-4130-869d-732b23ed9df5"/>
31		<release-~~info~~-list>
32		<~~info~~ date="1999-09-20" country="DE"/>
33		<~~info~~ date="1999-09-20" country="GB"/>
34		<~~info~~ date="1999-09-21" country="US"/>
35		</release-~~info~~-list>
	31	<release-event-list>
	32	<event date="1999-09-20" country="DE"/>
	33	<event date="1999-09-20" country="GB"/>
	34	<event date="1999-09-21" country="US"/>
	35	</release-event-list>
36	36	<disc-list count="2"/>
37	37	</release>
…	…
40	40	<asin>B000002IXU</asin>
41	41	<artist id="c0b2500e-0cef-4130-869d-732b23ed9df5"/>
42		<release-~~info~~-list>
43		<~~info~~ date="1994-01-28" country="DE"/>
44		<~~info~~ date="1994-01-31" country="GB"/>
45		<~~info~~ date="1994-02-01" country="US"/>
46		<~~info~~ date="1994-02-25" country="JP"/>
47		<~~info~~ date="1994-11" country="AU"/>
48		</release-~~info~~-list>
	42	<release-event-list>
	43	<event date="1994-01-28" country="DE"/>
	44	<event date="1994-01-31" country="GB"/>
	45	<event date="1994-02-01" country="US"/>
	46	<event date="1994-02-25" country="JP"/>
	47	<event date="1994-11" country="AU"/>
	48	</release-event-list>
49	49	<disc-list count="4"/>
50	50	</release>

mmd-schema/trunk/test-data/valid/release/Highway_61_Revisited_1.xml

r41	r46
10	10	<life-span begin="1941-05-24"/>
11	11	</artist>
12		<release-~~info~~-list>
13		<~~info~~ date="1965-08-30" country="US"/>
14		<~~info~~ date="2004-03-29" country="GB"/>
15		</release-~~info~~-list>
	12	<release-event-list>
	13	<event date="1965-08-30" country="US"/>
	14	<event date="2004-03-29" country="GB"/>
	15	</release-event-list>
16	16	<disc-list>
17	17	<disc id="FftPVconhVin9JjU8gwBZh_YolU-"/>

mmd-schema/trunk/test-data/valid/release/Little_Earthquakes_1.xml

r33	r46
10	10	<life-span begin="1963-08-22"/>
11	11	</artist>
12		<release-~~info~~-list>
13		<~~info~~ date="1992-01-13" country="GB"/>
14		<~~info~~ date="1992-01-17" country="DE"/>
15		<~~info~~ date="1992-02-25" country="US"/>
16		</release-~~info~~-list>
	12	<release-event-list>
	13	<event date="1992-01-13" country="GB"/>
	14	<event date="1992-01-17" country="DE"/>
	15	<event date="1992-02-25" country="US"/>
	16	</release-event-list>
17	17	<disc-list>
18	18	<disc id="ILKp3.bZmvoMO7wSrq1cw7WatfA-"/>

mmd-schema/trunk/test-data/valid/release/Little_Earthquakes_2.xml

r33	r46
9	9	<life-span begin="1963-08-22"/>
10	10	</artist>
11		<release-~~info~~-list>
12		<~~info~~ date="1992-01-13" country="GB"/>
13		<~~info~~ date="1992-01-17" country="DE"/>
14		<~~info~~ date="1992-02-25" country="US"/>
15		</release-~~info~~-list>
	11	<release-event-list>
	12	<event date="1992-01-13" country="GB"/>
	13	<event date="1992-01-17" country="DE"/>
	14	<event date="1992-02-25" country="US"/>
	15	</release-event-list>
16	16	<disc-list>
17	17	<disc id="ILKp3.bZmvoMO7wSrq1cw7WatfA-"/>