Wed Jul 3 09:27:21 MDT 2002
Update of /var/lib/cvs/fugalh/gdmxml
In directory andreas:/tmp/cvs-serv5674
Modified Files:
gdmxml.rnc gdmxml.rng
Log Message:
Changed from c: to xsd: per convention.
commit by: fugalh
"Never laugh at live dragons, Bilbo you fool!" he said to himself, and it became
a favourite saying of his later, and passed into a proverb. "You aren't nearly
through this adventure yet," he added, and that was pretty true as well.
-- Bilbo Baggins, "The Hobbit" by J.R.R. Tolkien, Chapter XII
diffs:
Index: fugalh/gdmxml/gdmxml.rnc
diff -u fugalh/gdmxml/gdmxml.rnc:1.3 fugalh/gdmxml/gdmxml.rnc:1.4
--- fugalh/gdmxml/gdmxml.rnc:1.3 Tue Jul 2 19:20:39 2002
+++ fugalh/gdmxml/gdmxml.rnc Wed Jul 3 09:27:21 2002
@@ -2,12 +2,11 @@
# Copyright 2002 Hans Fugal
# rng compatibility for ID/IDREF(S)
-datatypes c = "http://relaxng.org/ns/compatibility/datatypes/1.0";
## ACTIVITY
activity =
element activity {
- attribute id { c:ID },
- attribute researcher_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute researcher_id { xsd:IDREF },
attribute type { "administrative_task" | "search" },
attribute status { text },
attribute priority { text },
@@ -18,15 +17,15 @@
## ADMINISTRATIVE-TASK
administrative_task = element administrative_task {
- attribute activity_id { c:IDREF }
+ attribute activity_id { xsd:IDREF }
}
## ASSERTION
assertion = element assertion {
- attribute id { c:ID },
- attribute surety_scheme_part_id { c:IDREF },
- attribute researcher_id { c:IDREF },
- attribute source_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute surety_scheme_part_id { xsd:IDREF },
+ attribute researcher_id { xsd:IDREF },
+ attribute source_id { xsd:IDREF },
\assertion_subject,
\assertion_subject,
@@ -35,7 +34,7 @@
element disproved { empty }?
}
assertion_subject = element assertion_subject {
- attribute id { c:ID },
+ attribute id { xsd:ID },
attribute type { "persona" | "event" | "characteristic" | "group" }
}
@@ -48,8 +47,8 @@
## CHARACTERISTIC
characteristic = element characteristic {
- attribute id { c:ID },
- attribute place_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute place_id { xsd:IDREF },
\characteristic_date,
element sort_order { "ascending" | "descending" | "none" }?
}
@@ -57,59 +56,59 @@
## CHARACTERISTIC-PART
characteristic_part = element characteristic_part {
- attribute id { c:ID },
- attribute characteristic_id { c:IDREF },
- attribute characteristic_part_type_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute characteristic_id { xsd:IDREF },
+ attribute characteristic_part_type_id { xsd:IDREF },
element name { text },
attribute sequence_number { text }
}
## CHARACTERISTIC-PART-TYPE
characteristic_part_type = element characteristic_part_type {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## CITATION-PART
citation_part = element citation_part {
- attribute source_id { c:IDREF },
- attribute citation_part_type_id { c:IDREF },
+ attribute source_id { xsd:IDREF },
+ attribute citation_part_type_id { xsd:IDREF },
element value { text }
}
## CITATION-PART-TYPE
citation_part_type = element citation_part_type {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## EVENT
event = element event {
- attribute id { c:ID },
- attribute event_type_id { c:IDREF },
- attribute place_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute event_type_id { xsd:IDREF },
+ attribute place_id { xsd:IDREF },
element name { text },
element date { \gen_date }
}
## EVENT-TYPE
event_type = element event_type {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## EVENT-TYPE-ROLE
event_type_role = element event_type_role {
- attribute id { c:ID },
- attribute event_type_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute event_type_id { xsd:IDREF },
element name { text }
}
## GROUP
group = element group {
- attribute id { c:ID },
- attribute group_type_id { c:IDREF },
- attribute place_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute group_type_id { xsd:IDREF },
+ attribute place_id { xsd:IDREF },
element name { text },
element date { \gen_date },
element criteria { text }
@@ -117,22 +116,22 @@
## GROUP-TYPE
group_type = element group_type {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text },
element sort_order { "ascending" | "descending" | "none" }?
}
## GROUP-TYPE-ROLE
group_type_role = element group_type_role {
- attribute id { c:ID },
- attribute group_type_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute group_type_id { xsd:IDREF },
element name { text },
element sequence_number { text }
}
## PERSONA
persona = element persona {
- attribute id { c:ID },
+ attribute id { xsd:ID },
\persona_name,
element description_comments { text }
}
@@ -140,28 +139,28 @@
## PLACE
place = element place {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element existence_date { \gen_date },
element sort_order { "ascending" | "descending" | "none" }?
}
## PLACE-PART
place_part = element place_part {
- attribute place_part_type_id { c:IDREF },
- attribute place_id { c:IDREF },
+ attribute place_part_type_id { xsd:IDREF },
+ attribute place_id { xsd:IDREF },
element name { text },
element sequence_number { text }
}
## PLACE-PART-TYPE
place_part_type = element place_part_type {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## PROJECT
project = element project {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text },
element description { text },
element client_data { text }?
@@ -169,8 +168,8 @@
## REPOSITORY
repository = element repository {
- attribute id { c:ID },
- attribute place_id { c:IDREF},
+ attribute id { xsd:ID },
+ attribute place_id { xsd:IDREF},
element name { text },
element address { text }?,
element phone { text }?,
@@ -180,18 +179,18 @@
## REPOSITORY-SOURCE
repository_source = element repository_source {
- attribute repository_id { c:IDREF },
- attribute source_id { c:IDREF },
- attribute activity_id { c:IDREF },
+ attribute repository_id { xsd:IDREF },
+ attribute source_id { xsd:IDREF },
+ attribute activity_id { xsd:IDREF },
element call_number { text },
element description { text }
}
## REPRESENTATION
representation = element representation {
- attribute source_id { c:IDREF },
+ attribute source_id { xsd:IDREF },
# mime-type here?
- attribute representation_type_id { c:IDREF },
+ attribute representation_type_id { xsd:IDREF },
# href?
element physical-file-code { text },
# mime-type? perhaps for electronic but what about paper, tombstone, etc.?
@@ -206,14 +205,14 @@
# it seems a mime-type might suffice for this...
# "Contains a list of the types of representations of evidence, such as text,
# a TIF bitmap, a GIF bitmap, a WAV file, or other forms."
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## RESEARCH-OBJECTIVE
research_objective = element research_objective {
- attribute id { c:ID },
- attribute project_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute project_id { xsd:IDREF },
element name { text },
element description { text },
element sequence_number { text },
@@ -223,13 +222,13 @@
## RESEARCH-OBJECTIVE-ACTIVITY
research_objective_activity = element research_objective_activity {
- attribute research_objective_id { c:IDREF },
- attribute activity_id { c:IDREF }
+ attribute research_objective_id { xsd:IDREF },
+ attribute activity_id { xsd:IDREF }
}
## RESEARCHER
researcher = element researcher {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text },
element address { text },
element comments { text }?
@@ -237,57 +236,57 @@
## RESEARCHER-PROJECT
researcher_project = element researcher_project {
- attribute researcher_id { c:IDREF },
- attribute project_id { c:IDREF },
+ attribute researcher_id { xsd:IDREF },
+ attribute project_id { xsd:IDREF },
element role { text }?
}
## SEARCH
search = element search {
- attribute activity_id { c:IDREF },
- attribute source_id { c:IDREF },
- attribute repository_id { c:IDREF },
+ attribute activity_id { xsd:IDREF },
+ attribute source_id { xsd:IDREF },
+ attribute repository_id { xsd:IDREF },
element searched_for { text }
}
## SOURCE
source = element source {
- attribute id { c:ID },
- attribute higher_source_id { c:IDREF },
- attribute subject_place_id { c:IDREF },
- attribute jurisdiction_place_id { c:IDREF },
- attribute researcher_id { c:IDREF },
+ 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 }
}
## SOURCE-GROUP
source_group = element source_group {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text }
}
## SOURCE-GROUP-SOURCE
source_group_source = element source_group_source {
- attribute id { c:ID },
- attribute source_group_id { c:IDREF }
+ attribute id { xsd:ID },
+ attribute source_group_id { xsd:IDREF }
}
## SURETY-SCHEME
surety_scheme = element surety_scheme {
- attribute id { c:ID },
+ attribute id { xsd:ID },
element name { text },
element description { text }
}
## SURETY-SCHEME-PART
surety_scheme_part = element surety_scheme_part {
- attribute id { c:ID },
- attribute surety_scheme_id { c:IDREF },
+ attribute id { xsd:ID },
+ attribute surety_scheme_id { xsd:IDREF },
element name { text },
element description { text },
element sequence_number { text }
}
-# $Id: gdmxml.rnc,v 1.3 2002/07/03 01:20:39 fugalh Exp $
+# $Id: gdmxml.rnc,v 1.4 2002/07/03 15:27:21 fugalh Exp $
# vim: shiftwidth=2 expandtab softtabstop=2
Index: fugalh/gdmxml/gdmxml.rng
diff -u fugalh/gdmxml/gdmxml.rng:1.4 fugalh/gdmxml/gdmxml.rng:1.5
--- fugalh/gdmxml/gdmxml.rng:1.4 Tue Jul 2 19:20:39 2002
+++ fugalh/gdmxml/gdmxml.rng Wed Jul 3 09:27:21 2002
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- gdmxml - an XML schema for the GENTECH Genealogical Data Model
- Copyright 2002 Hans Fugal
--->
-<!-- rng compatibility for ID/IDREF(S) -->
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0";
xmlns="http://relaxng.org/ns/structure/1.0";
datatypeLibrary="http://relaxng.org/ns/compatibility/datatypes/1.0";>
+<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
+ -->
+ <!-- rng compatibility for ID/IDREF(S) -->
<define name="activity">
<a:documentation>ACTIVITY</a:documentation>
<element name="activity">
@@ -640,6 +640,6 @@
</define>
</grammar>
<!--
- $Id: gdmxml.rng,v 1.4 2002/07/03 01:20:39 fugalh Exp $
+ $Id: gdmxml.rng,v 1.5 2002/07/03 15:27:21 fugalh Exp $
vim: shiftwidth=2 expandtab softtabstop=2
-->
_______________________________________________
gdmxml mailing list
[EMAIL PROTECTED]
http://fugal.net/cgi-bin/mailman/listinfo/gdmxml
