Author: markus Date: 2006-07-17 21:43:13 +0200 (Mon, 17 Jul 2006) New Revision: 546

Modified: trunk/protocol/examples/capabilities_response.xml trunk/protocol/tapir.xsd Log: use static & dynamic output models as terminology in capabilities

Modified: trunk/protocol/examples/capabilities_response.xml =================================================================== --- trunk/protocol/examples/capabilities_response.xml 2006-07-17 19:37:12 UTC (rev 545) +++ trunk/protocol/examples/capabilities_response.xml 2006-07-17 19:43:13 UTC (rev 546) @@ -1,102 +1,101 @@ -<?xml version="1.0" encoding="UTF-8"?> -<response xmlns="http://rs.tdwg.org/tapir/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://rs.tdwg.org/tapir/1.0 http://ww2.biocase.org/svn/tapir/trunk/protocol/tapir.xsd%22%3E - <header> - <source accesspoint="http://accesspoint_url" sendtime="2005-11-11T12:23:56.023+01:00"> - <software name="TAPIR_Implementation" version="1.0"/> - </source> - </header> - <capabilities> - <operations> - <ping/> - <metadata/> - <capabilities/> - <view> - <queryTemplates> - <queryTemplate location="http://url_to_searchtemplateA"/> - <queryTemplate location="http://url_to_searchtemplateB"/> - <queryTemplate location="http://url_to_inventorytemplate"/> - </queryTemplates> - </view> - <inventory/> - <search> - <predefinedOutputModels> - <outputModel location="http://url_to_raw_outputmodelA"/> - <outputModel location="http://url_to_raw_outputmodelB"/> - </predefinedOutputModels> - <customOutputModels accepted="false"/> - </search> - </operations> - <filter> - <encoding> - <expression> - <concept/> - <literal/> - <parameter/> - <variable/> - <arithmetic> - <add/> - <sub/> - </arithmetic> - </expression> - <booleanOperators> - <logical> - <not/> - <and/> - <or/> - </logical> - <comparative> - <equals/> - <greaterThan/> - <greaterThanOrEquals/> - <lessThan/> - <lessThanOrEquals/> - <in/> - <isNull/> - <like/> - </comparative> - </booleanOperators> - </encoding> - </filter> - <concepts> - <conceptNameServers> - <primary location="http://url_to_primary_concept_server"/> - <secondary location="http://url_to_secondary_concept_server"/> - </conceptNameServers> - <schema namespace="http://www.tdwg.org/schemas/abcd/1.2" - location="http://www.bgbm.org/TDWG/CODATA/Schema/ABCD-1.20.xsd%22%3E - <mappedConcept - id="/DataSets/DataSet/DatasetDerivations/DatasetDerivation/DateSupplied" - searchable="true"/> - <mappedConcept - id="/DataSets/DataSet/DatasetDerivations/DatasetDerivation/Description" - searchable="true"/> - </schema> - <schema namespace="http://digir.net/schema/conceptual/darwin/extension/curatorial/1.0" - location="http://digir.net/schema/conceptual/darwin/extension/curatorial/1.0/curatoria... - <mappedConcept id="/CatalogNumberNumeric" searchable="true" mandatory="true"/> - <mappedConcept id="/IdentifiedBy" searchable="true"/> - </schema> - </concepts> - - <variables> - <environment> - <timestamp/> - <lastUpdate/> - <date/> - <datasourceName/> - <accessPoint/> - </environment> - </variables> - - <settings> - <minQueryTermLength>2</minQueryTermLength> - <maxElementRepetitions>10</maxElementRepetitions> - <maxElementLevels>20</maxElementLevels> - <maxResponseTags>500</maxResponseTags> - <maxResponseSize>500</maxResponseSize> - </settings> - - </capabilities> -</response> +<?xml version="1.0" encoding="UTF-8"?> +<response xmlns="http://rs.tdwg.org/tapir/1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://rs.tdwg.org/tapir/1.0 http://ww2.biocase.org/svn/tapir/trunk/protocol/tapir.xsd%22%3E + <header> + <source accesspoint="http://accesspoint_url" sendtime="2005-11-11T12:23:56.023+01:00"> + <software name="TAPIR_Implementation" version="1.0"/> + </source> + </header> + <capabilities> + <operations> + <ping/> + <metadata/> + <capabilities/> + <view> + <queryTemplates> + <queryTemplate location="http://url_to_searchtemplateA"/> + <queryTemplate location="http://url_to_searchtemplateB"/> + <queryTemplate location="http://url_to_inventorytemplate"/> + </queryTemplates> + </view> + <inventory/> + <search> + <staticOutputModels> + <outputModel location="http://url_to_raw_outputmodelA"/> + <outputModel location="http://url_to_raw_outputmodelB"/> + </staticOutputModels> + </search> + </operations> + <filter> + <encoding> + <expression> + <concept/> + <literal/> + <parameter/> + <variable/> + <arithmetic> + <add/> + <sub/> + </arithmetic> + </expression> + <booleanOperators> + <logical> + <not/> + <and/> + <or/> + </logical> + <comparative> + <equals/> + <greaterThan/> + <greaterThanOrEquals/> + <lessThan/> + <lessThanOrEquals/> + <in/> + <isNull/> + <like/> + </comparative> + </booleanOperators> + </encoding> + </filter> + <concepts> + <conceptNameServers> + <server location="http://url_to_primary_concept_server"/> + <server location="http://url_to_secondary_concept_server"/> + </conceptNameServers> + <schema namespace="http://www.tdwg.org/schemas/abcd/1.2" + location="http://www.bgbm.org/TDWG/CODATA/Schema/ABCD-1.20.xsd%22%3E + <mappedConcept + id="/DataSets/DataSet/DatasetDerivations/DatasetDerivation/DateSupplied" + searchable="true"/> + <mappedConcept + id="/DataSets/DataSet/DatasetDerivations/DatasetDerivation/Description" + searchable="true"/> + </schema> + <schema namespace="http://digir.net/schema/conceptual/darwin/extension/curatorial/1.0" + location="http://digir.net/schema/conceptual/darwin/extension/curatorial/1.0/curatoria... + <mappedConcept id="/CatalogNumberNumeric" searchable="true" required="true"/> + <mappedConcept id="/IdentifiedBy" searchable="true"/> + </schema> + </concepts> + + <variables> + <environment> + <timestamp/> + <lastUpdate/> + <date/> + <datasourceName/> + <accessPoint/> + </environment> + </variables> + + <settings> + <minQueryTermLength>2</minQueryTermLength> + <maxElementRepetitions>10</maxElementRepetitions> + <maxElementLevels>20</maxElementLevels> + <maxResponseTags>500</maxResponseTags> + <maxResponseSize>500</maxResponseSize> + </settings> + + </capabilities> +</response>

Modified: trunk/protocol/tapir.xsd =================================================================== --- trunk/protocol/tapir.xsd 2006-07-17 19:37:12 UTC (rev 545) +++ trunk/protocol/tapir.xsd 2006-07-17 19:43:13 UTC (rev 546) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- $Id$ --> -<xsd:schema targetNamespace="http://res.tdwg.org/tapir/1.0" - xmlns="http://res.tdwg.org/tapir/1.0" +<xsd:schema targetNamespace="http://rs.tdwg.org/tapir/1.0" + xmlns="http://rs.tdwg.org/tapir/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/"