Sat Jul 6 16:31:42 MDT 2002
Update of /var/lib/cvs/fugalh/gdmxml In directory andreas:/tmp/cvs-serv28966 Modified Files: gdmxml.rnc gdmxml.rng Log Message: Made some changes to source. Changes similar to these will trickle through the rest of the schema as I finish up the instance document. commit by: fugalh I don't know half of you half as well as I should like; and I like less than half of you half as well as you deserve. -- J. R. R. Tolkien diffs: Index: fugalh/gdmxml/gdmxml.rnc diff -u fugalh/gdmxml/gdmxml.rnc:1.6 fugalh/gdmxml/gdmxml.rnc:1.7 --- fugalh/gdmxml/gdmxml.rnc:1.6 Wed Jul 3 17:42:36 2002 +++ fugalh/gdmxml/gdmxml.rnc Sat Jul 6 16:31:41 2002 @@ -1,6 +1,7 @@ # gdmxml - an XML schema for the GENTECH Genealogical Data Model # Copyright 2002 Hans Fugal +default namespace = "http://gdmxml.fugal.net/alpha" start = element gdmxml { \activity* & \administrative-task* @@ -9,7 +10,6 @@ & \characteristic* & \characteristic-part* & \characteristic-part-type* - & \citation-part* & \citation-part-type* & \event* & \event-type* @@ -104,15 +104,14 @@ ## CITATION-PART citation-part = element citation-part { - attribute source-id { xsd:IDREF }, - attribute citation-part-type-id { xsd:IDREF }, - element value { text } + attribute citation-part-type { xsd:IDREF }, + text } ## CITATION-PART-TYPE citation-part-type = element citation-part-type { attribute id { xsd:ID }, - element name { text } + text } ## EVENT @@ -225,11 +224,10 @@ # mime-type here? attribute representation-type-id { xsd:IDREF }, # href? - element physical-file-code { text }, # mime-type? perhaps for electronic but what about paper, tombstone, etc.? element medium { text }, # allow inline content that isn't text? - element content { text }, + (element content { text } | element physical-file-code { text }), element comments { text } } @@ -285,12 +283,14 @@ ## SOURCE source = element source { attribute id { xsd:ID }, - attribute higher-source-id { xsd:IDREF }, - attribute subject-place-id { xsd:IDREF }, - attribute jurisdiction-place-id { xsd:IDREF }, - attribute researcher-id { xsd:IDREF }, - element subject-date { \gen-date }, - element comments { text } + attribute higher-source { xsd:IDREF }?, + attribute subject-place { xsd:IDREF }?, + attribute jurisdiction-place { xsd:IDREF }?, + attribute researcher { xsd:IDREF }?, + \citation-part*, + \source-group-source*, + element subject-date { \gen-date }?, + element comments { text }? } ## SOURCE-GROUP @@ -301,7 +301,6 @@ ## SOURCE-GROUP-SOURCE source-group-source = element source-group-source { - attribute id { xsd:ID }, attribute source-group-id { xsd:IDREF } } @@ -321,5 +320,7 @@ element sequence-number { text } } -# $Id: gdmxml.rnc,v 1.6 2002/07/03 23:42:36 fugalh Exp $ +gen-date = element gen-date { text } +date = \gen-date +# $Id: gdmxml.rnc,v 1.7 2002/07/06 22:31:41 fugalh Exp $ # vim: shiftwidth=2 expandtab softtabstop=2 Index: fugalh/gdmxml/gdmxml.rng diff -u fugalh/gdmxml/gdmxml.rng:1.7 fugalh/gdmxml/gdmxml.rng:1.8 --- fugalh/gdmxml/gdmxml.rng:1.7 Wed Jul 3 17:42:37 2002 +++ fugalh/gdmxml/gdmxml.rng Sat Jul 6 16:31:41 2002 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> - <!-- - gdmxml - an XML schema for the GENTECH Genealogical Data Model - Copyright 2002 Hans Fugal - --> +<!-- + gdmxml - an XML schema for the GENTECH Genealogical Data Model + Copyright 2002 Hans Fugal +--> +<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" +ns="http://gdmxml.fugal.net/alpha" xmlns="http://relaxng.org/ns/structure/1.0" +datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <start> <element name="gdmxml"> <interleave> @@ -29,9 +29,6 @@ <ref name="characteristic-part-type"/> </zeroOrMore> <zeroOrMore> - <ref name="citation-part"/> - </zeroOrMore> - <zeroOrMore> <ref name="citation-part-type"/> </zeroOrMore> <zeroOrMore> @@ -260,15 +257,10 @@ <define name="citation-part"> <a:documentation>CITATION-PART</a:documentation> <element name="citation-part"> - <attribute name="source-id"> + <attribute name="citation-part-type"> <data type="IDREF"/> </attribute> - <attribute name="citation-part-type-id"> - <data type="IDREF"/> - </attribute> - <element name="value"> - <text/> - </element> + <text/> </element> </define> <define name="citation-part-type"> @@ -277,9 +269,7 @@ <attribute name="id"> <data type="ID"/> </attribute> - <element name="name"> - <text/> - </element> + <text/> </element> </define> <define name="event"> @@ -535,18 +525,22 @@ <attribute name="representation-type-id"> <data type="IDREF"/> </attribute> - <!-- href? --> - <element name="physical-file-code"> - <text/> - </element> - <!-- mime-type? perhaps for electronic but what about paper, tombstone, etc.? --> + <!-- + href? + mime-type? perhaps for electronic but what about paper, tombstone, etc.? + --> <element name="medium"> <text/> </element> <!-- allow inline content that isn't text? --> - <element name="content"> - <text/> - </element> + <choice> + <element name="content"> + <text/> + </element> + <element name="physical-file-code"> + <text/> + </element> + </choice> <element name="comments"> <text/> </element> @@ -663,24 +657,42 @@ <attribute name="id"> <data type="ID"/> </attribute> - <attribute name="higher-source-id"> - <data type="IDREF"/> - </attribute> - <attribute name="subject-place-id"> - <data type="IDREF"/> - </attribute> - <attribute name="jurisdiction-place-id"> - <data type="IDREF"/> - </attribute> - <attribute name="researcher-id"> - <data type="IDREF"/> - </attribute> - <element name="subject-date"> - <ref name="gen-date"/> - </element> - <element name="comments"> - <text/> - </element> + <optional> + <attribute name="higher-source"> + <data type="IDREF"/> + </attribute> + </optional> + <optional> + <attribute name="subject-place"> + <data type="IDREF"/> + </attribute> + </optional> + <optional> + <attribute name="jurisdiction-place"> + <data type="IDREF"/> + </attribute> + </optional> + <optional> + <attribute name="researcher"> + <data type="IDREF"/> + </attribute> + </optional> + <zeroOrMore> + <ref name="citation-part"/> + </zeroOrMore> + <zeroOrMore> + <ref name="source-group-source"/> + </zeroOrMore> + <optional> + <element name="subject-date"> + <ref name="gen-date"/> + </element> + </optional> + <optional> + <element name="comments"> + <text/> + </element> + </optional> </element> </define> <define name="source-group"> @@ -697,9 +709,6 @@ <define name="source-group-source"> <a:documentation>SOURCE-GROUP-SOURCE</a:documentation> <element name="source-group-source"> - <attribute name="id"> - <data type="ID"/> - </attribute> <attribute name="source-group-id"> <data type="IDREF"/> </attribute> @@ -739,8 +748,16 @@ </element> </element> </define> + <define name="gen-date"> + <element name="gen-date"> + <text/> + </element> + </define> + <define name="date"> + <ref name="gen-date"/> + </define> </grammar> <!-- - $Id: gdmxml.rng,v 1.7 2002/07/03 23:42:37 fugalh Exp $ + $Id: gdmxml.rng,v 1.8 2002/07/06 22:31:41 fugalh Exp $ vim: shiftwidth=2 expandtab softtabstop=2 --> _______________________________________________ gdmxml mailing list [EMAIL PROTECTED] http://fugal.net/cgi-bin/mailman/listinfo/gdmxml