Thu Aug 15 20:15:39 MDT 2002
Update of /var/lib/cvs/fugalh/gdmxml In directory andreas:/tmp/cvs-serv31776 Modified Files: fugl.xml gdmxml.rnc gdmxml.rng Log Message: Reimplemented repository-source as discussed on the mailing list. Took out activity-id from repository-source and added an id attribute to repository-source. Removed source-id and repository-id from search and added repository-source-id. This will allow the same flexibility as the GDM without the duplication. commit by: fugalh Military secrets are the most fleeting of all. -- Spock, "The Enterprise Incident", stardate 5027.4 diffs: Index: fugalh/gdmxml/fugl.xml diff -u fugalh/gdmxml/fugl.xml:1.2 fugalh/gdmxml/fugl.xml:1.3 --- fugalh/gdmxml/fugl.xml:1.2 Mon Jul 8 22:28:49 2002 +++ fugalh/gdmxml/fugl.xml Thu Aug 15 20:15:38 2002 @@ -3,13 +3,16 @@ <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> + <repository-source + id="fhl_film0049002" + source-id="film0049002" + repository-id="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-source> <source id="fladstrandmarriages" higher-source="film0049002"> <citation-part citation-part-type="title"> Marriages in Fladstrand Parish @@ -43,6 +46,6 @@ </gdmxml> <!-- - $Id: fugl.xml,v 1.2 2002/07/09 04:28:49 fugalh Exp $ - vim: sw=2 ts=2 + $Id: fugl.xml,v 1.3 2002/08/16 02:15:38 fugalh Exp $ + vim: sw=2 smarttab --> Index: fugalh/gdmxml/gdmxml.rnc diff -u fugalh/gdmxml/gdmxml.rnc:1.8 fugalh/gdmxml/gdmxml.rnc:1.9 --- fugalh/gdmxml/gdmxml.rnc:1.8 Mon Jul 8 22:28:49 2002 +++ fugalh/gdmxml/gdmxml.rnc Thu Aug 15 20:15:38 2002 @@ -21,6 +21,7 @@ & \place* & \place-part-type* & \project* + & \repository-source* & \representation* & \representation-type* & \research-objective* @@ -206,8 +207,12 @@ } ## REPOSITORY-SOURCE -repository-ref = element repository-ref { - attribute idref { xsd:IDREF }, +# changed from gdm: Does not refer to activity and has an id attribute. SEARCH +# refers to repository-source by this id. +repository-source = element repository-source { + attribute id { xsd:ID }, + attribute source-id { xsd:IDREF }, + attribute repository-id { xsd:IDREF }, element call-number { text }?, element description { text }? } @@ -267,10 +272,12 @@ } ## SEARCH +# Changed from the gdm: refers to repository-source by repository-source-id +# instead of referring to repository and source directly. This cuts down on +# duplication. Likewise, activity is not referrenced by repository-source search = element search { attribute activity-id { xsd:IDREF }, - attribute source-id { xsd:IDREF }, - attribute repository-id { xsd:IDREF }, + attribute repository-source-id { xsd:IDREF }, element searched-for { text } } @@ -283,7 +290,6 @@ attribute researcher { xsd:IDREF }?, \citation-part*, \group-ref*, - \repository-ref*, element subject-date { \gen-date }?, element comments { text }? } @@ -318,5 +324,5 @@ gen-date = text date = \gen-date sequence-number = xsd:integer -# $Id: gdmxml.rnc,v 1.8 2002/07/09 04:28:49 fugalh Exp $ +# $Id: gdmxml.rnc,v 1.9 2002/08/16 02:15:38 fugalh Exp $ # vim: shiftwidth=2 expandtab softtabstop=2 Index: fugalh/gdmxml/gdmxml.rng diff -u fugalh/gdmxml/gdmxml.rng:1.9 fugalh/gdmxml/gdmxml.rng:1.10 --- fugalh/gdmxml/gdmxml.rng:1.9 Mon Jul 8 22:28:49 2002 +++ fugalh/gdmxml/gdmxml.rng Thu Aug 15 20:15:38 2002 @@ -62,6 +62,9 @@ <ref name="project"/> </zeroOrMore> <zeroOrMore> + <ref name="repository-source"/> + </zeroOrMore> + <zeroOrMore> <ref name="representation"/> </zeroOrMore> <zeroOrMore> @@ -86,9 +89,6 @@ <ref name="source-group"/> </zeroOrMore> <zeroOrMore> - <ref name="source-group-source"/> - </zeroOrMore> - <zeroOrMore> <ref name="surety-scheme"/> </zeroOrMore> <zeroOrMore> @@ -484,15 +484,27 @@ </optional> </element> </define> - <define name="repository-ref"> + <!-- + changed from gdm: Does not refer to activity and has an id attribute. SEARCH + refers to repository-source by this id. + --> + <define name="repository-source"> <a:documentation>REPOSITORY-SOURCE</a:documentation> - <element name="repository-ref"> - <attribute name="idref"> + <element name="repository-source"> + <attribute name="id"> + <data type="ID"/> + </attribute> + <attribute name="source-id"> <data type="IDREF"/> </attribute> - <element name="call-number"> - <text/> - </element> + <attribute name="repository-id"> + <data type="IDREF"/> + </attribute> + <optional> + <element name="call-number"> + <text/> + </element> + </optional> <optional> <element name="description"> <text/> @@ -619,16 +631,18 @@ </optional> </element> </define> + <!-- + Changed from the gdm: refers to repository-source by repository-source-id + instead of referring to repository and source directly. This cuts down on + duplication. Likewise, activity is not referrenced by repository-source + --> <define name="search"> <a:documentation>SEARCH</a:documentation> <element name="search"> <attribute name="activity-id"> <data type="IDREF"/> </attribute> - <attribute name="source-id"> - <data type="IDREF"/> - </attribute> - <attribute name="repository-id"> + <attribute name="repository-source-id"> <data type="IDREF"/> </attribute> <element name="searched-for"> @@ -668,9 +682,6 @@ <zeroOrMore> <ref name="group-ref"/> </zeroOrMore> - <zeroOrMore> - <ref name="repository-ref"/> - </zeroOrMore> <optional> <element name="subject-date"> <ref name="gen-date"/> @@ -747,6 +758,6 @@ </define> </grammar> <!-- - $Id: gdmxml.rng,v 1.9 2002/07/09 04:28:49 fugalh Exp $ + $Id: gdmxml.rng,v 1.10 2002/08/16 02:15:38 fugalh Exp $ vim: shiftwidth=2 expandtab softtabstop=2 --> _______________________________________________ gdmxml mailing list [EMAIL PROTECTED] http://fugal.net/cgi-bin/mailman/listinfo/gdmxml