Changeset 811

Timestamp:

21/04/06 11:02:21 (15 years ago)

Author:

ko23

Message:

Modifications from 1.02.03:

addition of Citation data type;
addition of dgPolygon2DType;
addition of dgCourse2DType;
addition of dgPoint2DType;
addition of dgDataQuality to dgDataSummary;
addition of dgDataUseNotice to dgDataQuality;
addition of dgPolygon2D to dgSpatialCoverage;
addition of dgCourse2D to dgSpatialCoverage/dgCourse;
extension of dgSecurityConditionType to allow plain English explanatory text.
requirement for a deployment to have an end date removed;
correct spelling of "principal";
correct spelling of "DataProvenance?" to "dgMetadataProvenance".

Will be tagged in a week's time (20060428) to allow time for comment.

Location:

TI07-MOLES

Files:

• tags/Schemae (added)
• tags/Schemae/ndgmetadata1.2.3.xsd (added)
• trunk/DIF/XQuery/NDG-DIF.xquery (modified) (5 diffs)
• trunk/v1Schema/Schemae/ndgmetadata1.2.3.xsd (added)
• trunk/v1Schema/Schemae/ndgmetadata1.2.4.xsd (added)

TI07-MOLES/trunk/DIF/XQuery/NDG-DIF.xquery

@@ -1 @@
-for $DE in collection('/db/ndg_B_metadata')/dgMetadata/dgMetadataRecord[dgDataEntity!='' and dgMetadataID/schemeIdentifier='NDG-B0' and dgMetadataID/repositoryIdentifier='repositoryID' and dgMetadataID/localIdentifier='localID']
+for $DE in collection('/db/ndg_B_metadata')/dgMetadata/dgMetadataRecord[exists('dgDataEntity') and dgMetadataID/schemeIdentifier='NDG-B0' and dgMetadataID/repositoryIdentifier='www.npm.ac.uk' and dgMetadataID/localIdentifier='recordID.0']
 return
         <DIF>
@@ -5 +5 @@
         <Entry_Title>{string($DE/name)}</Entry_Title>
         <Parameters>
-        {for $StructuredKeyword in ($DE//(dgStructuredKeyword | dgStdParameterMeasured))
-                where (($DE//(dgStructuredKeyword | dgStdParameterMeasured)/dgValidTermID/ParentListID='http://gcmd.gsfc.nasa.gov/Resources/valids/gcmd_parameters.html'        or $DE//(dgStructuredKeyword | dgStdParameterMeasured)/dgValidTermID/ParentListID='http://gcmd.gsfc.nasa.gov/Resources/valids/projects.html') and ($DE//(dgStructuredKeyword | dgStdParameterMeasured)/ListLevel = 0))
+        {for $StructuredKeyword in ($DE//(dgStructuredKeyword | dgStdParameterMeasured)[dgValidTermID/ParentListID='http://gcmd.gsfc.nasa.gov/Resources/valids/gcmd_parameters.html' and ListLevel = 0])
                 return if (exists($StructuredKeyword/*/dgValidTerm)) then (
                 <Parameter>
-                        {string($StructuredKeyword/*/dgValidTerm)}
-                        {if (exists($StructuredKeyword//dgValidSubterm) and $StructuredKeyword//dgValidSubterm != '' and $StructuredKeyword//dgValidSubterm != ' ') then (
+                        <Category>{string($StructuredKeyword/*/dgValidTerm)}</Category>
+                        {if (exists($StructuredKeyword//dgValidSubterm) 
+                                and $StructuredKeyword//dgValidSubterm != '' 
+                                and $StructuredKeyword//dgValidSubterm != ' ') then (
                         for $Subterm in $StructuredKeyword//dgValidSubterm[exists(dgValidTerm)]
                         where exists($Subterm/dgValidSubterm)
                                 order by $Subterm/ListLevel
-                                return concat(' &gt; ', string($Subterm/dgValidSubterm/dgValidTerm))
+                                return 
+                                        if ($Subterm/ListLevel=1) then (<Topic>{string($Subterm/dgValidSubterm/dgValidTerm)}</Topic>) 
+                                        else (
+                                        if ($Subterm/ListLevel=2) then (<Term>{string($Subterm/dgValidSubterm/dgValidTerm)}</Term>) 
+                                        else (
+                                        if ($Subterm/ListLevel=3) then (<Variable>{string($Subterm/dgValidSubterm/dgValidTerm)}</Variable>) 
+                                        else (
+                                        if ($Subterm/ListLevel=4) then (<Detailed_Variable>{string($Subterm/dgValidSubterm/dgValidTerm)}</Detailed_Variable>) 
+                                        else (<GCMD_Science_Valid>{string($Subterm/dgValidSubterm/dgValidTerm)}</GCMD_Science_Valid>))))
                                 )       
                         else()}
@@ -22 +31 @@
         }
         </Parameters>
-        <ISO_Topic_Category>
-        </ISO_Topic_Category>
+        {for $ISOTopicCategory in ($DE/dgStructuredKeyword[dgValidTermID/ParentListID='ISO 19115 Topic Category'])
+                return 
+                        <ISO_Topic_Category>{$ISOTopicCategory/dgValidTerm}</ISO_Topic_Category>
+        }
         {for $DataCuratorRole in $DE/dgDataEntity/dgDataRoles/dgDataCurator/dgRoleHolder[not(exists(endDate)) or endDate='']
                 return 
@@ -32 +43 @@
                                                 string(concat(string($DataCuratorRoleHolder/name/initials), ' ', string($DataCuratorRoleHolder/name/familyName)))
                                 else if (exists($DataCuratorRole/dgOrganisationID)) then
-                                        for $DataCuratorRoleHolder in collection('/db/ndg_B_metadata')/dgMetadata/dgOrganisation[(dgMetadataID/schemeIdentifier='NDG-B0' and dgMetadataID/repositoryIdentifier=$DataCuratorRole/*/repositoryIdentifier and dgMetadataID/localIdentifier=$DataCuratorRole/*/localIdentifier)]
+                                        for $DataCuratorRoleHolder in collection('/db/ndg_B_metadata')/dgMetadata/dgOrganisation[(dgMetadataID/schemeIdentifier='NDG-B0' 
+                                                and dgMetadataID/repositoryIdentifier=$DataCuratorRole/*/repositoryIdentifier 
+                                                and dgMetadataID/localIdentifier=$DataCuratorRole/*/localIdentifier)]
                                                 return 
                                                 string($DataCuratorRoleHolder/name)
@@ -43 +56 @@
         <Metadata_Version>9.4</Metadata_Version>
         </DIF>
+(: Stylus Studio meta-information - (c) 2004-2005. Progress Software Corporation. All rights reserved.
+<metaInformation>
+<scenarios ><scenario default="yes" name="StubB" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\..\My Documents\ndgBXML\ndgB.xml" outputurl="" processortype="saxon" tcpport="2233" profilemode="7" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" host="" port="8000" user="" password=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition></MapperMetaTag>
+</metaInformation>
+:)