Mon Jul 8 22:28:50 MDT 2002
Update of /var/lib/cvs/fugalh/gdmxml In directory andreas:/tmp/cvs-serv12336 Modified Files: fugl.xml gdmxml.rnc gdmxml.rng Log Message: I have made some significant changes in source-related elements while adding this one source. commit by: fugalh Without followers, evil cannot spread. -- Spock, "And The Children Shall Lead", stardate 5029.5 diffs: Index: fugalh/gdmxml/fugl.xml diff -u fugalh/gdmxml/fugl.xml:1.1 fugalh/gdmxml/fugl.xml:1.2 --- fugalh/gdmxml/fugl.xml:1.1 Sat Jul 6 16:33:54 2002 +++ fugalh/gdmxml/fugl.xml Mon Jul 8 22:28:49 2002 @@ -3,6 +3,12 @@ <gdmxml xmlns="http://gdmxml.fugal.net/alpha"> <source id="film0049002"> <citation-part citation-part-type="film">0049002</citation-part> + <repository-ref idref="fhl"> + <!-- in this particular instance, it's not a call number, it's +a film + number. are we flexible enough? is this redundant information +inherent in + the format or just in this instance? --> + <call-number>0049002</call-number> + </repository-ref> </source> <source id="fladstrandmarriages" higher-source="film0049002"> <citation-part citation-part-type="title"> @@ -15,4 +21,28 @@ <citation-part-type id="title">Title</citation-part-type> <citation-part-type id="film">Film Number</citation-part-type> <citation-part-type id="page">Page</citation-part-type> + + <place id="slc"> + <existence-date>1847-</existence-date> + <place-part type="city">Salt Lake City</place-part> + <place-part type="state">Utah</place-part> + <place-part type="county">Utah</place-part> + <place-part type="country">United States of America</place-part> + <sort-order>ascending</sort-order> + <repository id="fhl"> + <name>Family History Library of the Church of Jesus Christ of Latter-day +Saints</name> + <address>35 North West Temple Street, Salt Lake City, Utah, 84150-3400</address> + <phone>800-453-3860 x22331</phone> + <hours>Monday: 7:30 A.M. to 5:00 P.M., Tuesday-Saturday: 7:30 A.M. to 10:00 +P.M.</hours> + </repository> + </place> + <place-part-type id="city">City/Town/Village</place-part-type> + <place-part-type id="state">State</place-part-type> + <place-part-type id="county">County</place-part-type> + <place-part-type id="country">Country</place-part-type> + </gdmxml> +<!-- + $Id: fugl.xml,v 1.2 2002/07/09 04:28:49 fugalh Exp $ + vim: sw=2 ts=2 +--> Index: fugalh/gdmxml/gdmxml.rnc diff -u fugalh/gdmxml/gdmxml.rnc:1.7 fugalh/gdmxml/gdmxml.rnc:1.8 --- fugalh/gdmxml/gdmxml.rnc:1.7 Sat Jul 6 16:31:41 2002 +++ fugalh/gdmxml/gdmxml.rnc Mon Jul 8 22:28:49 2002 @@ -18,11 +18,9 @@ & \group-type* & \group-type-role* & \persona* - & \place-part* + & \place* & \place-part-type* & \project* - & \repository* - & \repository-source* & \representation* & \representation-type* & \research-objective* @@ -31,7 +29,6 @@ & \search* & \source* & \source-group* - & \source-group-source* & \surety-scheme* & \surety-scheme-part* } @@ -75,7 +72,7 @@ assertion-assertion = element assertion-assertion { attribute assertion-id-low { text }, attribute assertion-id-hight { text }, - attribute sequence-number { text } + attribute sequence-number { \sequence-number } } ## CHARACTERISTIC @@ -93,7 +90,7 @@ attribute characteristic-id { xsd:IDREF }, attribute characteristic-part-type-id { xsd:IDREF }, element name { text }, - attribute sequence-number { text } + attribute sequence-number { \sequence-number } } ## CHARACTERISTIC-PART-TYPE @@ -158,7 +155,7 @@ attribute id { xsd:ID }, attribute group-type-id { xsd:IDREF }, element name { text }, - element sequence-number { text } + element sequence-number { \sequence-number } } ## PERSONA @@ -173,21 +170,21 @@ place = element place { attribute id { xsd:ID }, element existence-date { \gen-date }, - element sort-order { "ascending" | "descending" | "none" }? + \place-part+, + element sort-order { "ascending" | "descending" | "none" }, + \repository* } ## PLACE-PART place-part = element place-part { - attribute place-part-type-id { xsd:IDREF }, - attribute place-id { xsd:IDREF }, - element name { text }, - element sequence-number { text } + attribute type { xsd:IDREF }, + text } ## PLACE-PART-TYPE place-part-type = element place-part-type { attribute id { xsd:ID }, - element name { text } + text } ## PROJECT @@ -201,7 +198,6 @@ ## REPOSITORY repository = element repository { attribute id { xsd:ID }, - attribute place-id { xsd:IDREF}, element name { text }, element address { text }?, element phone { text }?, @@ -210,12 +206,10 @@ } ## REPOSITORY-SOURCE -repository-source = element repository-source { - attribute repository-id { xsd:IDREF }, - attribute source-id { xsd:IDREF }, - attribute activity-id { xsd:IDREF }, - element call-number { text }, - element description { text } +repository-ref = element repository-ref { + attribute idref { xsd:IDREF }, + element call-number { text }?, + element description { text }? } ## REPRESENTATION @@ -246,7 +240,7 @@ attribute project-id { xsd:IDREF }, element name { text }, element description { text }, - element sequence-number { text }, + element sequence-number { \sequence-number }, element priority { text }, element status { text } } @@ -288,7 +282,8 @@ attribute jurisdiction-place { xsd:IDREF }?, attribute researcher { xsd:IDREF }?, \citation-part*, - \source-group-source*, + \group-ref*, + \repository-ref*, element subject-date { \gen-date }?, element comments { text }? } @@ -300,8 +295,8 @@ } ## SOURCE-GROUP-SOURCE -source-group-source = element source-group-source { - attribute source-group-id { xsd:IDREF } +group-ref = element group-ref { + attribute idref { xsd:IDREF } } ## SURETY-SCHEME @@ -317,10 +312,11 @@ attribute surety-scheme-id { xsd:IDREF }, element name { text }, element description { text }, - element sequence-number { text } + element sequence-number { \sequence-number } } -gen-date = element gen-date { text } +gen-date = text date = \gen-date -# $Id: gdmxml.rnc,v 1.7 2002/07/06 22:31:41 fugalh Exp $ +sequence-number = xsd:integer +# $Id: gdmxml.rnc,v 1.8 2002/07/09 04:28:49 fugalh Exp $ # vim: shiftwidth=2 expandtab softtabstop=2 Index: fugalh/gdmxml/gdmxml.rng diff -u fugalh/gdmxml/gdmxml.rng:1.8 fugalh/gdmxml/gdmxml.rng:1.9 --- fugalh/gdmxml/gdmxml.rng:1.8 Sat Jul 6 16:31:41 2002 +++ fugalh/gdmxml/gdmxml.rng Mon Jul 8 22:28:49 2002 @@ -53,7 +53,7 @@ <ref name="persona"/> </zeroOrMore> <zeroOrMore> - <ref name="place-part"/> + <ref name="place"/> </zeroOrMore> <zeroOrMore> <ref name="place-part-type"/> @@ -62,12 +62,6 @@ <ref name="project"/> </zeroOrMore> <zeroOrMore> - <ref name="repository"/> - </zeroOrMore> - <zeroOrMore> - <ref name="repository-source"/> - </zeroOrMore> - <zeroOrMore> <ref name="representation"/> </zeroOrMore> <zeroOrMore> @@ -196,7 +190,9 @@ <element name="assertion-assertion"> <attribute name="assertion-id-low"/> <attribute name="assertion-id-hight"/> - <attribute name="sequence-number"/> + <attribute name="sequence-number"> + <ref name="sequence-number"/> + </attribute> </element> </define> <define name="characteristic"> @@ -240,7 +236,9 @@ <element name="name"> <text/> </element> - <attribute name="sequence-number"/> + <attribute name="sequence-number"> + <ref name="sequence-number"/> + </attribute> </element> </define> <define name="characteristic-part-type"> @@ -373,7 +371,7 @@ <text/> </element> <element name="sequence-number"> - <text/> + <ref name="sequence-number"/> </element> </element> </define> @@ -403,32 +401,28 @@ <element name="existence-date"> <ref name="gen-date"/> </element> - <optional> - <element name="sort-order"> - <choice> - <value>ascending</value> - <value>descending</value> - <value>none</value> - </choice> - </element> - </optional> + <oneOrMore> + <ref name="place-part"/> + </oneOrMore> + <element name="sort-order"> + <choice> + <value>ascending</value> + <value>descending</value> + <value>none</value> + </choice> + </element> + <zeroOrMore> + <ref name="repository"/> + </zeroOrMore> </element> </define> <define name="place-part"> <a:documentation>PLACE-PART</a:documentation> <element name="place-part"> - <attribute name="place-part-type-id"> - <data type="IDREF"/> - </attribute> - <attribute name="place-id"> + <attribute name="type"> <data type="IDREF"/> </attribute> - <element name="name"> - <text/> - </element> - <element name="sequence-number"> - <text/> - </element> + <text/> </element> </define> <define name="place-part-type"> @@ -437,9 +431,7 @@ <attribute name="id"> <data type="ID"/> </attribute> - <element name="name"> - <text/> - </element> + <text/> </element> </define> <define name="project"> @@ -467,9 +459,6 @@ <attribute name="id"> <data type="ID"/> </attribute> - <attribute name="place-id"> - <data type="IDREF"/> - </attribute> <element name="name"> <text/> </element> @@ -495,24 +484,20 @@ </optional> </element> </define> - <define name="repository-source"> + <define name="repository-ref"> <a:documentation>REPOSITORY-SOURCE</a:documentation> - <element name="repository-source"> - <attribute name="repository-id"> - <data type="IDREF"/> - </attribute> - <attribute name="source-id"> - <data type="IDREF"/> - </attribute> - <attribute name="activity-id"> + <element name="repository-ref"> + <attribute name="idref"> <data type="IDREF"/> </attribute> <element name="call-number"> <text/> </element> - <element name="description"> - <text/> - </element> + <optional> + <element name="description"> + <text/> + </element> + </optional> </element> </define> <define name="representation"> @@ -578,7 +563,7 @@ <text/> </element> <element name="sequence-number"> - <text/> + <ref name="sequence-number"/> </element> <element name="priority"> <text/> @@ -681,7 +666,10 @@ <ref name="citation-part"/> </zeroOrMore> <zeroOrMore> - <ref name="source-group-source"/> + <ref name="group-ref"/> + </zeroOrMore> + <zeroOrMore> + <ref name="repository-ref"/> </zeroOrMore> <optional> <element name="subject-date"> @@ -706,10 +694,10 @@ </element> </element> </define> - <define name="source-group-source"> + <define name="group-ref"> <a:documentation>SOURCE-GROUP-SOURCE</a:documentation> - <element name="source-group-source"> - <attribute name="source-group-id"> + <element name="group-ref"> + <attribute name="idref"> <data type="IDREF"/> </attribute> </element> @@ -744,20 +732,21 @@ <text/> </element> <element name="sequence-number"> - <text/> + <ref name="sequence-number"/> </element> </element> </define> <define name="gen-date"> - <element name="gen-date"> - <text/> - </element> + <text/> </define> <define name="date"> <ref name="gen-date"/> </define> + <define name="sequence-number"> + <data type="integer"/> + </define> </grammar> <!-- - $Id: gdmxml.rng,v 1.8 2002/07/06 22:31:41 fugalh Exp $ + $Id: gdmxml.rng,v 1.9 2002/07/09 04:28:49 fugalh Exp $ vim: shiftwidth=2 expandtab softtabstop=2 --> _______________________________________________ gdmxml mailing list [EMAIL PROTECTED] http://fugal.net/cgi-bin/mailman/listinfo/gdmxml