[eml-cvs] eml/lib eml.jar
Matt Jones
jones at nceas.ucsb.edu
Wed Oct 2 07:47:51 PDT 2002
Hey Chris,
Interesting that you started working on IDs and their documentation -- I
had agreed to do that during yesterdays conference call. I was
working on a different approach, mainly to define an AttributeGroup in
resource that contains and documents the three attributes (id, system,
scope) and then use that attribute group throughout eml. So, I'm
planning on blowing away most of your ID changes unless you see a reason
not to do it the way I proposed. Thanks for the feedback,
Matt
Christopher Jones wrote:
> cjones 02/10/01 22:40:42
>
> Modified: . buildDocBook.xsl eml-access.xsd eml-attribute.xsd
> eml-constraint.xsd eml-coverage.xsd
> eml-dataTable.xsd eml-dataset.xsd eml-entity.xsd
> eml-literature.xsd eml-party.xsd eml-physical.xsd
> eml-project.xsd eml-protocol.xsd eml-resource.xsd
> eml-software.xsd eml-spatialRaster.xsd
> eml-spatialReference.xsd eml-storedProcedure.xsd
> eml-view.xsd eml.xsd
> lib eml.jar
> Log:
> In eml-coverage.xsd:
>
> 1) Converted TemporalCoverage refs to complexTypes in order to be consistent
> with the other xsd's.
>
> 2) made IdentifierName in TaxonomicCoverage of type rp:ResponsibleParty, by just
> removing the originator element (which was redundant)
>
> These are partial fixes to Bug 589
>
> In looking at the documentation for eml-coverage, the <xs:attribute>s of id and
> system consistently were not documented (as well in all the other xsd's.
> However, the scope <xs:attribute> is drawn from res:ScopeType, and so is
> documented in eml-resource.xsd. Instead of documenting all of these repeating
> attributes, I created two SimpleTypes in eml-resource, one IDType, the other
> SystemType. I changed each <xs:attribute name="id" ...> to be of type IDType.
> Likewise for system. Now, they work similarly to ScopeType, and are documented
> in one location. I used <xs:list itemType="xs:string /> to do this.
>
> Lastly, I *didn't* make this change in eml-spatialVector.xsd yet, because there
> are problems with it validating due to David's overwrite. I don't think he's
> fixed the problem yet, so I'm just going to wait to change that file so he
> doesn't have to deal with even more conflicts. I'll do it later.
>
> Revision Changes Path
> 1.42 +14 -40 eml/buildDocBook.xsl
>
> Index: buildDocBook.xsl
> ===================================================================
> RCS file: /cvs/eml/buildDocBook.xsl,v
> retrieving revision 1.41
> retrieving revision 1.42
> diff -u -r1.41 -r1.42
> --- buildDocBook.xsl 30 Sep 2002 21:58:37 -0000 1.41
> +++ buildDocBook.xsl 2 Oct 2002 05:40:41 -0000 1.42
> @@ -14,9 +14,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: berkley $'
> - '$Date: 2002/09/30 21:58:37 $'
> - '$Revision: 1.41 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.42 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -325,44 +325,18 @@
> in both eml-spatialRaster and eml-spatialVector. It is described
> here in relation to those two modules.
> </para>
> - <section>
> - <title>
> - The eml-dataTable module - Logical information
> - about data table entities
> - </title>
> - <para>
> - The eml-dataTable module is used to describe the logical
> - characteristics of each tabular set of information in a dataset. A
> - series of comma-sparated text files may be considered a dataset,
> - and each file would subsequently be considered a dataTable entity
> - within the dataset. Since the eml-dataTable module extends the
> - eml-entity module, it uses all of the common entity elements to
> - describe the table, along with a few elements specific to just data
> - table entities. The eml-dataTable module allows for the
> - description of each attribute (column/field/variable) within the
> - data table through the use of the eml-attribute module. Likewise,
> - there are fields used to describe the physical distribution of the
> - data table, it's overall coverage, the methodology used in creating
> - the data, and other logical structure information such as its
> - orientation, case sensitivity, etc.
> - </para>
> - </section>
> - <section>
> - <title>
> - The eml-spatialRaster module -
> - </title>
> - <para>
> - <emphasis>This section is not yet complete.</emphasis>
> - </para>
> - </section>
> - <section>
> - <title>
> - The eml-spatialVector module -
> - </title>
> - <para>
> - <emphasis>This section is not yet complete.</emphasis>
> - </para>
> - </section>
> + <!-- Get the eml-dataTable module description from the xsd file -->
> + <xsl:apply-templates
> + select="document('eml-dataTable.xsd')//doc:moduleDescription/*"
> + mode="copy"/>
> + <!-- Get the eml-spatialRaster module description from the xsd file -->
> + <xsl:apply-templates
> + select="document('eml-spatialRaster.xsd')//doc:moduleDescription/*"
> + mode="copy"/>
> + <!-- Get the eml-spatialVector module description from the xsd file -->
> + <xsl:apply-templates
> + select="document('eml-spatialVector.xsd')//doc:moduleDescription/*"
> + mode="copy"/>
> <section>
> <title>
> The eml-spatialReference module -
>
>
>
> 1.58 +4 -4 eml/eml-access.xsd
>
> Index: eml-access.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-access.xsd,v
> retrieving revision 1.57
> retrieving revision 1.58
> diff -u -r1.57 -r1.58
> --- eml-access.xsd 24 Sep 2002 06:10:38 -0000 1.57
> +++ eml-access.xsd 2 Oct 2002 05:40:41 -0000 1.58
> @@ -24,8 +24,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.57 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.58 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -163,8 +163,8 @@
> </xs:choice>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> <xs:attribute name="order" use="optional" default="allowFirst">
>
>
>
> 1.68 +6 -6 eml/eml-attribute.xsd
>
> Index: eml-attribute.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-attribute.xsd,v
> retrieving revision 1.67
> retrieving revision 1.68
> diff -u -r1.67 -r1.68
> --- eml-attribute.xsd 30 Sep 2002 15:30:08 -0000 1.67
> +++ eml-attribute.xsd 2 Oct 2002 05:40:41 -0000 1.68
> @@ -33,9 +33,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: berkley $'
> - '$Date: 2002/09/30 15:30:08 $'
> - '$Revision: 1.67 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.68 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -131,7 +131,7 @@
> maxOccurs="unbounded" />
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> </xs:complexType>
> <xs:complexType name="AttributeType">
> <xs:annotation>
> @@ -872,8 +872,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.40 +13 -7 eml/eml-constraint.xsd
>
> Index: eml-constraint.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-constraint.xsd,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -r1.39 -r1.40
> --- eml-constraint.xsd 24 Sep 2002 06:10:38 -0000 1.39
> +++ eml-constraint.xsd 2 Oct 2002 05:40:41 -0000 1.40
> @@ -1,7 +1,13 @@
> <?xml version="1.0"?>
> -<xs:schema targetNamespace="eml://ecoinformatics.org/constraint-2.0.0rc1" xmlns="eml://ecoinformatics.org/constraint-2.0.0rc1" xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1" xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
> - <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1" schemaLocation="eml-documentation.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1" schemaLocation="eml-resource.xsd"/>
> +<xs:schema targetNamespace="eml://ecoinformatics.org/constraint-2.0.0rc1"
> + xmlns="eml://ecoinformatics.org/constraint-2.0.0rc1"
> + xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1"
> + xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema">
> + <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + schemaLocation="eml-documentation.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1"
> + schemaLocation="eml-resource.xsd"/>
> <xs:annotation>
> <xs:documentation>
> '$RCSfile: eml-constraint.xsd,v $'
> @@ -19,8 +25,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.39 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.40 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -372,8 +378,8 @@
> </xs:complexType>
> </xs:element>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional" default="document"/>
> </xs:complexType>
> <xs:simpleType name="CardinalityChildOccurancesType">
>
>
>
> 1.65 +83 -99 eml/eml-coverage.xsd
>
> Index: eml-coverage.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-coverage.xsd,v
> retrieving revision 1.64
> retrieving revision 1.65
> diff -u -r1.64 -r1.65
> --- eml-coverage.xsd 24 Sep 2002 06:10:38 -0000 1.64
> +++ eml-coverage.xsd 2 Oct 2002 05:40:41 -0000 1.65
> @@ -1,9 +1,19 @@
> <?xml version="1.0"?>
> -<xs:schema targetNamespace="eml://ecoinformatics.org/coverage-2.0.0rc1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cit="eml://ecoinformatics.org/literature-2.0.0rc1" xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1" xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1" xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1" xmlns="eml://ecoinformatics.org/coverage-2.0.0rc1">
> - <xs:import namespace="eml://ecoinformatics.org/literature-2.0.0rc1" schemaLocation="eml-literature.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1" schemaLocation="eml-documentation.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1" schemaLocation="eml-party.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1" schemaLocation="eml-resource.xsd"/>
> +<xs:schema targetNamespace="eml://ecoinformatics.org/coverage-2.0.0rc1"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
> + xmlns:cit="eml://ecoinformatics.org/literature-2.0.0rc1"
> + xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1"
> + xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1"
> + xmlns="eml://ecoinformatics.org/coverage-2.0.0rc1">
> + <xs:import namespace="eml://ecoinformatics.org/literature-2.0.0rc1"
> + schemaLocation="eml-literature.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + schemaLocation="eml-documentation.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1"
> + schemaLocation="eml-party.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1"
> + schemaLocation="eml-resource.xsd"/>
> <xs:annotation>
> <xs:documentation>
> '$RCSfile: eml-coverage.xsd,v $'
> @@ -21,8 +31,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.64 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.65 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -135,7 +145,7 @@
> <xs:complexType>
> <xs:complexContent>
> <xs:extension base="TemporalCoverage">
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:extension>
> @@ -160,7 +170,7 @@
> <xs:complexType>
> <xs:complexContent>
> <xs:extension base="TaxonomicCoverage">
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:extension>
> @@ -170,8 +180,8 @@
> </xs:choice>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
> @@ -211,11 +221,66 @@
> </xs:appinfo>
> </xs:annotation>
> </xs:element>
> - <xs:element ref="rangeOfDates" maxOccurs="unbounded"/>
> + <xs:element name="rangeOfDates">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>Range of dates/times</doc:tooltip>
> + <doc:summary>Means of encoding a range of dates and
> + times.</doc:summary>
> + <doc:description>The 'RangeOfDatesType' field is intended to be used for
> + describing a range of dates and/or times. It may be used multiple times
> + to document multiple date ranges. It allows for two 'singleDateTime'
> + fields, the first to be used as the beginning dateTime, and the second
> + to be used as the ending dateTime of the range.</doc:description>
> + <doc:example>Please see the examples from the 'singleDateTime'
> + field for specific examples.</doc:example>
> + <doc:lineage>FGDC-STD-001-1998:
> + /metadata/time_period_information/rngdates</doc:lineage>
> + </xs:appinfo>
> + </xs:annotation>
> + <xs:complexType>
> + <xs:sequence>
> + <xs:element name="beginDate" type="SingleDateTimeType">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>Begin Date</doc:tooltip>
> + <doc:summary>A single time stamp signifying the beginning of
> + some time period</doc:summary>
> + <doc:description>A single time stamp signifying the beginning of
> + some time period. There is a choice between two
> + options: a calendar date with a time, or a geologic
> + age.</doc:description>
> + <doc:example>Please see the individual sub-elements for
> + example.</doc:example>
> + <doc:lineage>FGDC-STD-001-1998:
> + /metadata/time_period_information/sngdate</doc:lineage>
> + </xs:appinfo>
> + </xs:annotation>
> + </xs:element>
> + <xs:element name="endDate" type="SingleDateTimeType">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>End Date</doc:tooltip>
> + <doc:summary>A single time stamp signifying the end of
> + some time period</doc:summary>
> + <doc:description>A single time stamp signifying the end of
> + some time period. There is a choice between two
> + options: a calendar date with a time, or a geologic
> + age.</doc:description>
> + <doc:example>Please see the individual sub-elements for
> + example.</doc:example>
> + <doc:lineage>FGDC-STD-001-1998:
> + /metadata/time_period_information/sngdate</doc:lineage>
> + </xs:appinfo>
> + </xs:annotation>
> + </xs:element>
> + </xs:sequence>
> + </xs:complexType>
> + </xs:element>
> </xs:choice>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> </xs:complexType>
> <xs:complexType name="SingleDateTimeType">
> <xs:annotation>
> @@ -428,62 +493,6 @@
> </xs:element>
> </xs:choice>
> </xs:complexType>
> - <xs:element name="rangeOfDates">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Range of dates/times</doc:tooltip>
> - <doc:summary>Means of encoding a range of dates and
> - times.</doc:summary>
> - <doc:description>The 'rangeOfDates' field is intended to be used for
> - describing a range of dates and/or times. It may be used multiple times
> - to document multiple date ranges. It allows for two 'singleDateTime'
> - fields, the first to be used as the beginning dateTime, and the second
> - to be used as the ending dateTime of the range.</doc:description>
> - <doc:example>Please see the examples from the 'singleDateTime'
> - field for specific examples.</doc:example>
> - <doc:lineage>FGDC-STD-001-1998:
> - /metadata/time_period_information/rngdates</doc:lineage>
> - </xs:appinfo>
> - </xs:annotation>
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element name="beginDate" type="SingleDateTimeType">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Begin Date</doc:tooltip>
> - <doc:summary>A single time stamp signifying the beginning of
> - some time period</doc:summary>
> - <doc:description>A single time stamp signifying the beginning of
> - some time period. There is a choice between two
> - options: a calendar date with a time, or a geologic
> - age.</doc:description>
> - <doc:example>Please see the individual sub-elements for
> - example.</doc:example>
> - <doc:lineage>FGDC-STD-001-1998:
> - /metadata/time_period_information/sngdate</doc:lineage>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:element>
> - <xs:element name="endDate" type="SingleDateTimeType">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>End Date</doc:tooltip>
> - <doc:summary>A single time stamp signifying the end of
> - some time period</doc:summary>
> - <doc:description>A single time stamp signifying the end of
> - some time period. There is a choice between two
> - options: a calendar date with a time, or a geologic
> - age.</doc:description>
> - <doc:example>Please see the individual sub-elements for
> - example.</doc:example>
> - <doc:lineage>FGDC-STD-001-1998:
> - /metadata/time_period_information/sngdate</doc:lineage>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:element>
> - </xs:sequence>
> - </xs:complexType>
> - </xs:element>
> <xs:complexType name="GeographicCoverage">
> <xs:annotation>
> <xs:appinfo>
> @@ -872,8 +881,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
> @@ -1045,7 +1054,8 @@
> </xs:appinfo>
> </xs:annotation>
> </xs:element>
> - <xs:element name="identifierName" maxOccurs="unbounded">
> + <xs:element name="identifierName" type="rp:ResponsibleParty"
> + maxOccurs="unbounded">
> <xs:annotation>
> <xs:appinfo>
> <doc:tooltip>Identifier's Name</doc:tooltip>
> @@ -1058,32 +1068,6 @@
> taxonomic_system/identifier</doc:lineage>
> </xs:appinfo>
> </xs:annotation>
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element name="originator" type="rp:ResponsibleParty"
> - maxOccurs="unbounded">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Originator</doc:tooltip>
> - <doc:summary>A person or organization asociated with
> - this resource.</doc:summary>
> - <doc:description>The 'originator' element provides
> - the full name of the person, organization, or
> - position associated with the resource. Typically, the
> - originator role is set to "owner" to indicate the
> - list of parties who "own" the resource, but other
> - roles such as "principal investigator", "author", and
> - "editor" are provided.</doc:description>
> - <doc:example>Please see the examples within the sub
> - fields for the responsible party.</doc:example>
> - <doc:lineage>This element was derived from elements
> - described in the FGDC-STD-001.1-1999 standard
> - (nbii-fgdc-std-001.1-1999)</doc:lineage>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:element>
> - </xs:sequence>
> - </xs:complexType>
> </xs:element>
> <xs:element name="taxonomicProcedures" type="xs:string">
> <xs:annotation>
> @@ -1224,7 +1208,7 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> </xs:complexType>
> <xs:element name="taxonomicClassification">
> <xs:annotation>
>
>
>
> 1.32 +30 -12 eml/eml-dataTable.xsd
>
> Index: eml-dataTable.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-dataTable.xsd,v
> retrieving revision 1.31
> retrieving revision 1.32
> diff -u -r1.31 -r1.32
> --- eml-dataTable.xsd 1 Oct 2002 23:43:33 -0000 1.31
> +++ eml-dataTable.xsd 2 Oct 2002 05:40:41 -0000 1.32
> @@ -30,9 +30,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: blankman $'
> - '$Date: 2002/10/01 23:43:33 $'
> - '$Revision: 1.31 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.32 $'
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation; either version 2 of the License, or
> @@ -48,12 +48,30 @@
> <xs:appinfo>
> <doc:moduleDocs>
> <doc:moduleName>eml-dataTable</doc:moduleName>
> - <doc:moduleDescription>The EML dataTable Module defines the logical
> - characteristics of every dataTable in the dataset. Each attribute of
> - the table is described using a structure documented in eml-attribute.
> - This module is for basic table information only. A data table can be a
> - text file, a single data table in a spreadsheet, or a table in a
> - database.</doc:moduleDescription>
> + <doc:moduleDescription>
> + <section xmlns="">
> + <title>
> + The eml-dataTable module - Logical information
> + about data table entities
> + </title>
> + <para>
> + The eml-dataTable module is used to describe the logical
> + characteristics of each tabular set of information in a dataset. A
> + series of comma-sparated text files may be considered a dataset,
> + and each file would subsequently be considered a dataTable entity
> + within the dataset. Since the eml-dataTable module extends the
> + eml-entity module, it uses all of the common entity elements to
> + describe the table, along with a few elements specific to just data
> + table entities. The eml-dataTable module allows for the
> + description of each attribute (column/field/variable) within the
> + data table through the use of the eml-attribute module. Likewise,
> + there are fields used to describe the physical distribution of the
> + data table, it's overall coverage, the methodology used in creating
> + the data, and other logical structure information such as its
> + orientation, case sensitivity, etc.
> + </para>
> + </section>
> + </doc:moduleDescription>
> <doc:recommendedUsage>The EML dataTable Module is used to document
> datasets with one or more data tables.</doc:recommendedUsage>
> <doc:standAlone>yes</doc:standAlone>
> @@ -154,8 +172,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.43 +46 -18 eml/eml-dataset.xsd
>
> Index: eml-dataset.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-dataset.xsd,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -u -r1.42 -r1.43
> --- eml-dataset.xsd 24 Sep 2002 06:10:38 -0000 1.42
> +++ eml-dataset.xsd 2 Oct 2002 05:40:41 -0000 1.43
> @@ -1,18 +1,46 @@
> <?xml version="1.0"?>
> -<xs:schema targetNamespace="eml://ecoinformatics.org/dataset-2.0.0rc1" xmlns:v="eml://ecoinformatics.org/view-2.0.0rc1" xmlns:sp="eml://ecoinformatics.org/storedProcedure-2.0.0rc1" xmlns:sv="eml://ecoinformatics.org/spatialVector-2.0.0rc1" xmlns:md="eml://ecoinformatics.org/methods-2.0.0rc1" xmlns:sr="eml://ecoinformatics.org/spatialRaster-2.0.0rc1" xmlns:proj="eml://ecoinformatics.org/project-2.0.0rc1" xmlns:dat="eml://ecoinformatics.org/dataTable-2.0.0rc1" xmlns:ent="eml://ecoinformatics.org/entity-2.0.0rc1" xmlns:acc="eml://ecoinformatics.org/access-2.0.0rc1" xmlns="eml://ecoinformatics.org/dataset-2.0.0rc1" xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1" xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1" xmlns:txt="eml://ecoinformatics.org/text-2.0.0rc1" xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
> - <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1" schemaLocation="eml-documentation.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1" schemaLocation="eml-resource.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1" schemaLocation="eml-party.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/access-2.0.0rc1" schemaLocation="eml-access.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/entity-2.0.0rc1" schemaLocation="eml-entity.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/dataTable-2.0.0rc1" schemaLocation="eml-dataTable.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/project-2.0.0rc1" schemaLocation="eml-project.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/methods-2.0.0rc1" schemaLocation="eml-methods.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/spatialRaster-2.0.0rc1" schemaLocation="eml-spatialRaster.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/spatialVector-2.0.0rc1" schemaLocation="eml-spatialVector.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/storedProcedure-2.0.0rc1" schemaLocation="eml-storedProcedure.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/text-2.0.0rc1" schemaLocation="eml-text.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/view-2.0.0rc1" schemaLocation="eml-view.xsd"/>
> +<xs:schema targetNamespace="eml://ecoinformatics.org/dataset-2.0.0rc1"
> + xmlns:v="eml://ecoinformatics.org/view-2.0.0rc1"
> + xmlns:sp="eml://ecoinformatics.org/storedProcedure-2.0.0rc1"
> + xmlns:sv="eml://ecoinformatics.org/spatialVector-2.0.0rc1"
> + xmlns:md="eml://ecoinformatics.org/methods-2.0.0rc1"
> + xmlns:sr="eml://ecoinformatics.org/spatialRaster-2.0.0rc1"
> + xmlns:proj="eml://ecoinformatics.org/project-2.0.0rc1"
> + xmlns:dat="eml://ecoinformatics.org/dataTable-2.0.0rc1"
> + xmlns:ent="eml://ecoinformatics.org/entity-2.0.0rc1"
> + xmlns:acc="eml://ecoinformatics.org/access-2.0.0rc1"
> + xmlns="eml://ecoinformatics.org/dataset-2.0.0rc1"
> + xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1"
> + xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1"
> + xmlns:txt="eml://ecoinformatics.org/text-2.0.0rc1"
> + xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema">
> + <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + schemaLocation="eml-documentation.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1"
> + schemaLocation="eml-resource.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1"
> + schemaLocation="eml-party.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/access-2.0.0rc1"
> + schemaLocation="eml-access.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/entity-2.0.0rc1"
> + schemaLocation="eml-entity.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/dataTable-2.0.0rc1"
> + schemaLocation="eml-dataTable.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/project-2.0.0rc1"
> + schemaLocation="eml-project.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/methods-2.0.0rc1"
> + schemaLocation="eml-methods.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/spatialRaster-2.0.0rc1"
> + schemaLocation="eml-spatialRaster.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/spatialVector-2.0.0rc1"
> + schemaLocation="eml-spatialVector.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/storedProcedure-2.0.0rc1"
> + schemaLocation="eml-storedProcedure.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/text-2.0.0rc1"
> + schemaLocation="eml-text.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/view-2.0.0rc1"
> + schemaLocation="eml-view.xsd"/>
> <xs:annotation>
> <xs:documentation>
> '$RCSfile: eml-dataset.xsd,v $'
> @@ -30,8 +58,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.42 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.43 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -324,8 +352,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
>
>
>
> 1.70 +5 -5 eml/eml-entity.xsd
>
> Index: eml-entity.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-entity.xsd,v
> retrieving revision 1.69
> retrieving revision 1.70
> diff -u -r1.69 -r1.70
> --- eml-entity.xsd 24 Sep 2002 06:51:03 -0000 1.69
> +++ eml-entity.xsd 2 Oct 2002 05:40:41 -0000 1.70
> @@ -43,8 +43,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:51:03 $'
> - '$Revision: 1.69 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.70 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -136,8 +136,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
> @@ -177,7 +177,7 @@
> <xs:complexType>
> <xs:simpleContent>
> <xs:extension base="xs:string">
> - <xs:attribute name="system" type="xs:string" use="optional">
> + <xs:attribute name="system" type="res:SystemType" use="optional">
> <xs:annotation>
> <xs:appinfo>
> <doc:tooltip>Identifier System</doc:tooltip>
>
>
>
> 1.42 +4 -4 eml/eml-literature.xsd
>
> Index: eml-literature.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-literature.xsd,v
> retrieving revision 1.41
> retrieving revision 1.42
> diff -u -r1.41 -r1.42
> --- eml-literature.xsd 24 Sep 2002 06:10:38 -0000 1.41
> +++ eml-literature.xsd 2 Oct 2002 05:40:41 -0000 1.42
> @@ -37,8 +37,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.41 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.42 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -337,8 +337,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.37 +6 -6 eml/eml-party.xsd
>
> Index: eml-party.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-party.xsd,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -r1.36 -r1.37
> --- eml-party.xsd 24 Sep 2002 06:10:38 -0000 1.36
> +++ eml-party.xsd 2 Oct 2002 05:40:41 -0000 1.37
> @@ -26,8 +26,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.36 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.37 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -318,8 +318,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
> @@ -477,8 +477,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.49 +9 -9 eml/eml-physical.xsd
>
> Index: eml-physical.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-physical.xsd,v
> retrieving revision 1.48
> retrieving revision 1.49
> diff -u -r1.48 -r1.49
> --- eml-physical.xsd 1 Oct 2002 23:51:21 -0000 1.48
> +++ eml-physical.xsd 2 Oct 2002 05:40:41 -0000 1.49
> @@ -28,9 +28,9 @@
> The David and Lucile Packard Foundation
>
> For Details: http://knb.ecoinformatics.org/
> - '$Author: jones $'
> - '$Date: 2002/10/01 23:51:21 $'
> - '$Revision: 1.48 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.49 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -955,8 +955,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
> @@ -1132,8 +1132,8 @@
> </xs:annotation>
> </xs:element>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType"
> use="optional" default="document"/>
> </xs:complexType>
> @@ -1258,8 +1258,8 @@
> </xs:choice>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
>
>
>
> 1.67 +5 -5 eml/eml-project.xsd
>
> Index: eml-project.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-project.xsd,v
> retrieving revision 1.66
> retrieving revision 1.67
> diff -u -r1.66 -r1.67
> --- eml-project.xsd 30 Sep 2002 15:30:08 -0000 1.66
> +++ eml-project.xsd 2 Oct 2002 05:40:41 -0000 1.67
> @@ -37,9 +37,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: berkley $'
> - '$Date: 2002/09/30 15:30:08 $'
> - '$Revision: 1.66 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.67 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -448,8 +448,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.48 +5 -5 eml/eml-protocol.xsd
>
> Index: eml-protocol.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-protocol.xsd,v
> retrieving revision 1.47
> retrieving revision 1.48
> diff -u -r1.47 -r1.48
> --- eml-protocol.xsd 1 Oct 2002 16:06:16 -0000 1.47
> +++ eml-protocol.xsd 2 Oct 2002 05:40:41 -0000 1.48
> @@ -34,9 +34,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: blankman $'
> - '$Date: 2002/10/01 16:06:16 $'
> - '$Revision: 1.47 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.48 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -95,8 +95,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
>
>
>
> 1.68 +79 -33 eml/eml-resource.xsd
>
> Index: eml-resource.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-resource.xsd,v
> retrieving revision 1.67
> retrieving revision 1.68
> diff -u -r1.67 -r1.68
> --- eml-resource.xsd 1 Oct 2002 22:12:42 -0000 1.67
> +++ eml-resource.xsd 2 Oct 2002 05:40:41 -0000 1.68
> @@ -1,9 +1,19 @@
> <?xml version="1.0"?>
> -<xs:schema targetNamespace="eml://ecoinformatics.org/resource-2.0.0rc1" xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:txt="eml://ecoinformatics.org/text-2.0.0rc1" xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1" xmlns:cov="eml://ecoinformatics.org/coverage-2.0.0rc1" xmlns="eml://ecoinformatics.org/resource-2.0.0rc1">
> - <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1" schemaLocation="eml-documentation.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1" schemaLocation="eml-party.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/coverage-2.0.0rc1" schemaLocation="eml-coverage.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/text-2.0.0rc1" schemaLocation="eml-text.xsd"/>
> +<xs:schema targetNamespace="eml://ecoinformatics.org/resource-2.0.0rc1"
> + xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
> + xmlns:txt="eml://ecoinformatics.org/text-2.0.0rc1"
> + xmlns:rp="eml://ecoinformatics.org/party-2.0.0rc1"
> + xmlns:cov="eml://ecoinformatics.org/coverage-2.0.0rc1"
> + xmlns="eml://ecoinformatics.org/resource-2.0.0rc1">
> + <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + schemaLocation="eml-documentation.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/party-2.0.0rc1"
> + schemaLocation="eml-party.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/coverage-2.0.0rc1"
> + schemaLocation="eml-coverage.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/text-2.0.0rc1"
> + schemaLocation="eml-text.xsd"/>
> <xs:annotation>
> <xs:documentation>
> '$RCSfile: eml-resource.xsd,v $'
> @@ -20,9 +30,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: jones $'
> - '$Date: 2002/10/01 22:12:42 $'
> - '$Revision: 1.67 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.68 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -107,24 +117,7 @@
> <xs:complexType>
> <xs:simpleContent>
> <xs:extension base="xs:string">
> - <xs:attribute name="system" type="xs:string" use="optional">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Identifier System</doc:tooltip>
> - <doc:summary>The system in which this id is
> - relevant</doc:summary>
> - <doc:description>The computing system within which this
> - identifier has relevance. Generally, the identifier would
> - be unique within the "system" and would be sufficient to
> - retrieve the entity from the system. The system is often a
> - URL or URI that identifies the main entry point for the
> - data management system.</doc:description>
> - <doc:example>
> - http://knb.ecoinformatics.org/knb/</doc:example>
> - <doc:lineage>As of EML 2.0.0</doc:lineage>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:attribute>
> + <xs:attribute name="system" type="SystemType" use="optional"/>
> </xs:extension>
> </xs:simpleContent>
> </xs:complexType>
> @@ -485,7 +478,60 @@
> </xs:annotation>
> <xs:union memberTypes="xs:gYear xs:date"/>
> </xs:simpleType>
> + <xs:simpleType name="IDType">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>Identifer</doc:tooltip>
> + <doc:summary>A unique identifier for this additional
> + metadata that can be used to reference it elsewhere.
> + </doc:summary>
> + <doc:description>A unique identifier for this additional
> + metadata that can be used to reference it elsewhere.
> + This is a formal field in that it is an error to provide
> + a value for the id attribute that is not unique within
> + the document's set of id attributes. This is designed to
> + allow other portions of the metadata to reference this
> + section formally.</doc:description>
> + <doc:example>knb.343.22</doc:example>
> + </xs:appinfo>
> + </xs:annotation>
> + <xs:list itemType="xs:string"/>
> + </xs:simpleType>
> + <xs:simpleType name="SystemType">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>Identifer System</doc:tooltip>
> + <doc:summary>The data management system within which an
> + identifier is in scope and therefore unique.
> + </doc:summary>
> + <doc:description>The data management system within which an
> + identifier is in scope and therefore unique. This is typically
> + a URL (Uniform Resource Locator) that indicates a data
> + management system. All identifers that share a system must
> + be unique. In other words, if the same identifier is used in
> + two locations with identical systems, then by definition the
> + objects at which they point are in fact the same object.
> + </doc:description>
> + <doc:example>http://metacat.somewhere.org/svc/mc/</doc:example>
> + </xs:appinfo>
> + </xs:annotation>
> + <xs:list itemType="xs:string"/>
> + </xs:simpleType>
> <xs:simpleType name="ScopeType">
> + <xs:annotation>
> + <xs:appinfo>
> + <doc:tooltip>Identifer Scope</doc:tooltip>
> + <doc:summary>The scope of the identifier.</doc:summary>
> + <doc:description>The scope of the identifier. Scope is generally
> + set to either "system", meaning that it is scoped according to
> + the "system" attribute, or "document" if it is only to be in scope
> + within this single document instance. In this particular use of
> + scope, it is FIXED to be "system" because the packageId is
> + required and always has the scope of the required "system".
> + </doc:description>
> + <doc:example>system</doc:example>
> + </xs:appinfo>
> + </xs:annotation>
> <xs:restriction base="xs:string">
> <xs:enumeration value="system"/>
> <xs:enumeration value="document"/>
> @@ -669,8 +715,8 @@
> </xs:annotation>
> </xs:element>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="IDType" use="optional"/>
> + <xs:attribute name="system" type="SystemType" use="optional"/>
> <xs:attribute name="scope" type="ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
> @@ -812,8 +858,8 @@
> </xs:choice>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="IDType" use="optional"/>
> + <xs:attribute name="system" type="SystemType" use="optional"/>
> <xs:attribute name="scope" type="ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
> @@ -863,7 +909,7 @@
> <xs:complexType>
> <xs:simpleContent>
> <xs:extension base="xs:string">
> - <xs:attribute name="system" type="xs:string" use="optional">
> + <xs:attribute name="system" type="SystemType" use="optional">
> <xs:annotation>
> <xs:appinfo>
> <doc:tooltip>Scheme System</doc:tooltip>
> @@ -1000,8 +1046,8 @@
> </xs:annotation>
> </xs:element>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="IDType" use="optional"/>
> + <xs:attribute name="system" type="SystemType" use="optional"/>
> <xs:attribute name="scope" type="ScopeType" use="optional"
> default="document"/>
> </xs:complexType>
>
>
>
> 1.32 +4 -4 eml/eml-software.xsd
>
> Index: eml-software.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-software.xsd,v
> retrieving revision 1.31
> retrieving revision 1.32
> diff -u -r1.31 -r1.32
> --- eml-software.xsd 24 Sep 2002 06:10:38 -0000 1.31
> +++ eml-software.xsd 2 Oct 2002 05:40:41 -0000 1.32
> @@ -31,8 +31,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.31 $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.32 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -392,8 +392,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.30 +5 -5 eml/eml-spatialRaster.xsd
>
> Index: eml-spatialRaster.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-spatialRaster.xsd,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -r1.29 -r1.30
> --- eml-spatialRaster.xsd 1 Oct 2002 18:03:01 -0000 1.29
> +++ eml-spatialRaster.xsd 2 Oct 2002 05:40:41 -0000 1.30
> @@ -31,9 +31,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: blankman $'
> - '$Date: 2002/10/01 18:03:01 $'
> - '$Revision: 1.29 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:41 $'
> + '$Revision: 1.30 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -431,8 +431,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.25 +14 -7 eml/eml-spatialReference.xsd
>
> Index: eml-spatialReference.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-spatialReference.xsd,v
> retrieving revision 1.24
> retrieving revision 1.25
> diff -u -r1.24 -r1.25
> --- eml-spatialReference.xsd 2 Oct 2002 00:53:08 -0000 1.24
> +++ eml-spatialReference.xsd 2 Oct 2002 05:40:42 -0000 1.25
> @@ -1,7 +1,14 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<xs:schema targetNamespace="eml://ecoinformatics.org/spatialReference-2.0.0rc1" xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="eml://ecoinformatics.org/spatialReference-2.0.0rc1" xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1" elementFormDefault="unqualified">
> - <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1" schemaLocation="eml-documentation.xsd"/>
> - <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1" schemaLocation="eml-resource.xsd"/>
> +<xs:schema targetNamespace="eml://ecoinformatics.org/spatialReference-2.0.0rc1"
> + xmlns:res="eml://ecoinformatics.org/resource-2.0.0rc1"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
> + xmlns="eml://ecoinformatics.org/spatialReference-2.0.0rc1"
> + xmlns:doc="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + elementFormDefault="unqualified">
> + <xs:import namespace="eml://ecoinformatics.org/documentation-2.0.0rc1"
> + schemaLocation="eml-documentation.xsd"/>
> + <xs:import namespace="eml://ecoinformatics.org/resource-2.0.0rc1"
> + schemaLocation="eml-resource.xsd"/>
> <xs:annotation>
> <xs:documentation>
> '$RCSfile: eml-spatialReference.xsd,v $'
> @@ -18,9 +25,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: mccartne $'
> - '$Date: 2002/10/02 00:53:08 $'
> - '$Revision: 1.24 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:42 $'
> + '$Revision: 1.25 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -2283,8 +2290,8 @@
> </xs:sequence>
> <xs:element name="references"/>
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional"/>
> - <xs:attribute name="system" type="xs:string" use="optional"/>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> + <xs:attribute name="system" type="res:SystemType" use="optional"/>
> <xs:attribute name="scope" type="res:ScopeType" use="optional" default="document"/>
> </xs:complexType>
> <xs:element name="horizCoordSys" type="horizCoordSysType">
>
>
>
> 1.29 +6 -6 eml/eml-storedProcedure.xsd
>
> Index: eml-storedProcedure.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-storedProcedure.xsd,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -r1.28 -r1.29
> --- eml-storedProcedure.xsd 2 Oct 2002 00:30:04 -0000 1.28
> +++ eml-storedProcedure.xsd 2 Oct 2002 05:40:42 -0000 1.29
> @@ -42,9 +42,9 @@
> The David and Lucile Packard Foundation
> For Details: http://knb.ecoinformatics.org/
>
> - '$Author: blankman $'
> - '$Date: 2002/10/02 00:30:04 $'
> - '$Revision: 1.28 $'
> + '$Author: cjones $'
> + '$Date: 2002/10/02 05:40:42 $'
> + '$Revision: 1.29 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -125,8 +125,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.29 +4 -4 eml/eml-view.xsd
>
> Index: eml-view.xsd
> ===================================================================
> RCS file: /cvs/eml/eml-view.xsd,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -r1.28 -r1.29
> --- eml-view.xsd 24 Sep 2002 06:10:38 -0000 1.28
> +++ eml-view.xsd 2 Oct 2002 05:40:42 -0000 1.29
> @@ -43,8 +43,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.28 $'
> + '$Date: 2002/10/02 05:40:42 $'
> + '$Revision: 1.29 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -122,8 +122,8 @@
> </xs:sequence>
> <xs:element name="references" type="xs:string" />
> </xs:choice>
> - <xs:attribute name="id" type="xs:string" use="optional" />
> - <xs:attribute name="system" type="xs:string" use="optional" />
> + <xs:attribute name="id" type="res:IDType" use="optional" />
> + <xs:attribute name="system" type="res:SystemType" use="optional" />
> <xs:attribute name="scope" type="res:ScopeType" use="optional"
> default="document" />
> </xs:complexType>
>
>
>
> 1.38 +5 -40 eml/eml.xsd
>
> Index: eml.xsd
> ===================================================================
> RCS file: /cvs/eml/eml.xsd,v
> retrieving revision 1.37
> retrieving revision 1.38
> diff -u -r1.37 -r1.38
> --- eml.xsd 24 Sep 2002 06:10:38 -0000 1.37
> +++ eml.xsd 2 Oct 2002 05:40:42 -0000 1.38
> @@ -38,8 +38,8 @@
> For Details: http://knb.ecoinformatics.org/
>
> '$Author: cjones $'
> - '$Date: 2002/09/24 06:10:38 $'
> - '$Revision: 1.37 $'
> + '$Date: 2002/10/02 05:40:42 $'
> + '$Revision: 1.38 $'
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -311,24 +311,7 @@
> </xs:annotation>
> </xs:any>
> </xs:sequence>
> - <xs:attribute name="id" type="xs:string" use="optional">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Identifer</doc:tooltip>
> - <doc:summary>A unique identifier for this additional
> - metadata that can be used to reference it elsewhere.
> - </doc:summary>
> - <doc:description>A unique identifier for this additional
> - metadata that can be used to reference it elsewhere.
> - This is a formal field in that it is an error to provide
> - a value for the id attribute that is not unique within
> - the document's set of id attributes. This is designed to
> - allow other portions of the metadata to reference this
> - section formally.</doc:description>
> - <doc:example>knb.343.22</doc:example>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:attribute>
> + <xs:attribute name="id" type="res:IDType" use="optional"/>
> </xs:complexType>
> </xs:element>
> </xs:sequence>
> @@ -350,25 +333,7 @@
> </xs:appinfo>
> </xs:annotation>
> </xs:attribute>
> - <xs:attribute name="system" type="xs:string" use="required">
> - <xs:annotation>
> - <xs:appinfo>
> - <doc:tooltip>Identifer System</doc:tooltip>
> - <doc:summary>The data management system within which an
> - identifier is in scope and therefore unique.
> - </doc:summary>
> - <doc:description>The data management system within which an
> - identifier is in scope and therefore unique. This is typically
> - a URL (Uniform Resource Locator) that indicates a data
> - management system. All identifers that share a system must
> - be unique. In other words, if the same identifier is used in
> - two locations with identical systems, then by definition the
> - objects at which they point are in fact the same object.
> - </doc:description>
> - <doc:example>http://metacat.somewhere.org/svc/mc/</doc:example>
> - </xs:appinfo>
> - </xs:annotation>
> - </xs:attribute>
> + <xs:attribute name="system" type="res:SystemType" use="required"/>
> <xs:attribute name="scope" type="res:ScopeType" fixed="system">
> <xs:annotation>
> <xs:appinfo>
>
>
>
> 1.6 +25 -26 eml/lib/eml.jar
>
> <<Binary file>>
>
>
> _______________________________________________
> eml-cvs mailing list
> eml-cvs at ecoinformatics.org
> http://www.ecoinformatics.org/mailman/listinfo/eml-cvs
--
*******************************************************************
Matt Jones jones at nceas.ucsb.edu
http://www.nceas.ucsb.edu/ Fax: 425-920-2439 Ph: 907-789-0496
National Center for Ecological Analysis and Synthesis (NCEAS)
Interested in ecological informatics? http://www.ecoinformatics.org
*******************************************************************
More information about the Eml-dev
mailing list