Changeset 2334


Ignore:
Timestamp:
27/03/07 15:37:39 (12 years ago)
Author:
ko23
Message:

Corrected problem with ISO19139 showing areas

Location:
TI07-MOLES/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI07-MOLES/trunk/ISO19115-19139/XQuery/NDG-ISO19115-139.xquery

    r2269 r2334  
    1010declare namespace xsi='http://www.w3.org/2001/XMLSchema-instance';  
    1111 
    12 declare variable $targetCollection as xs:string {'TargetCollection'}; 
     12declare variable $targetCollection as xs:string {'/db/discovery'}; 
    1313declare variable $repositoryIdentifier as xs:string {'RepositoryID'}; 
    14 declare variable $localIdentifier as xs:string {'LocalID'}; 
     14declare variable $localIdentifier as xs:string {'neodc.nerc.ac.uk:DIF:NEODC_NEXTMAP'}; 
     15(: declare variable $targetCollection as xs:string {'TargetCollection'}; 
     16declare variable $repositoryIdentifier as xs:string {'RepositoryID'}; 
     17declare variable $localIdentifier as xs:string {'LocalID'}; :) 
    1518 
    1619for $DE in collection($targetCollection)/moles:dgMetadata/moles:dgMetadataRecord[ 
    1720        exists(moles:dgDataEntity)  
    18         and moles:dgMetadataID/moles:schemeIdentifier='NDG-B0'  
    19         and moles:dgMetadataID/moles:repositoryIdentifier=$repositoryIdentifier 
     21        and moles:dgMetadataID/moles:schemeIdentifier='NDG-B0' 
    2022        and moles:dgMetadataID/moles:localIdentifier=$localIdentifier] 
    2123return  
     
    191193                                                                                        element geographicIdentifier { 
    192194                                                                                                element gmd:RS_Identifier { 
    193                                                                                                         element gco:CharacterString {element code {data(dgArea/dgValidTerm)}}, 
    194                                                                                                         element gco:CharacterString {element codeSpace {data(dgArea/dgValidTermID/ParentListID)}} 
     195                                                                                                element gco:CharacterString {element code {data($geoArea/moles:dgValidTerm)}}, 
     196                                                                                                element gco:CharacterString {element codeSpace {data($geoArea/moles:dgValidTermID/moles:ParentListID)}} 
    195197                                                                                                        } 
    196198                                                                                                } 
  • TI07-MOLES/trunk/MDIP/MDIPRelated.spp

    r2236 r2334  
    88        <Folder FolderName="HTML Files" ExtStr="html;htm;xhtml;asp"/> 
    99        <Folder FolderName="DTD/Schemas" ExtStr="dtd;dcd;xdr;biz;xsd"> 
     10                <File FilePath="C:\Documents and Settings\Kevin\Desktop\NDG Subversion Repository\TI07-MOLES\trunk\DIF\Schemae\dif9-4.xsd" HomeFolder="Yes"/> 
    1011                <File FilePath=".\Schemae\MDIPMetaData_v0_5.xsd" HomeFolder="Yes"/> 
    1112                <File FilePath=".\Schemae\MDIPMetaData_v1_0.xsd" HomeFolder="Yes"/> 
    1213                <File FilePath=".\Schemae\MDIPMetaData_v1_2.xsd" HomeFolder="Yes"/> 
    1314                <File FilePath=".\..\v1Schema\Schemae\ndgmetadata1.3.xsd" HomeFolder="Yes"/> 
     15                <File FilePath="http://www.isotc211.org/schemas/2005/gmd/metadataEntity.xsd" DocFrom="URL" HomeFolder="Yes"/> 
    1416        </Folder> 
    1517        <Folder FolderName="Entities" ExtStr="ent"/> 
  • TI07-MOLES/trunk/PythonCode/wsgi/ndg_xqueries.py

    r2302 r2334  
    12981298 
    12991299ISO19139Query = ''' 
    1300 (: This will be updated to do namespaces properly when a few more are officially available... :) 
    13011300import module namespace voclib='http://ndg.nerc.ac.uk/xquery/lib/vocab' at 'xmldb:exist:///db/xqueryLib/Vocabs/vocab_xquery_lib.xquery'; 
    13021301import module namespace utillib='http://ndg.nerc.ac.uk/xquery/lib/utilities' at 'xmldb:exist:///db/xqueryLib/Utilities/utility_xquery_lib.xquery'; 
     
    13101309declare namespace xsi='http://www.w3.org/2001/XMLSchema-instance';  
    13111310 
    1312 declare variable $targetCollection as xs:string {'TargetCollection'}; 
     1311declare variable $targetCollection as xs:string {'/db/discovery'}; 
    13131312declare variable $repositoryIdentifier as xs:string {'RepositoryID'}; 
    1314 declare variable $localIdentifier as xs:string {'LocalID'}; 
     1313declare variable $localIdentifier as xs:string {'neodc.nerc.ac.uk:DIF:NEODC_NEXTMAP'}; 
     1314(: declare variable $targetCollection as xs:string {'TargetCollection'}; 
     1315declare variable $repositoryIdentifier as xs:string {'RepositoryID'}; 
     1316declare variable $localIdentifier as xs:string {'LocalID'}; :) 
    13151317 
    13161318for $DE in collection($targetCollection)/moles:dgMetadata/moles:dgMetadataRecord[ 
    13171319    exists(moles:dgDataEntity)  
    1318     and moles:dgMetadataID/moles:schemeIdentifier='NDG-B0'  
    1319     and moles:dgMetadataID/moles:repositoryIdentifier=$repositoryIdentifier 
     1320    and moles:dgMetadataID/moles:schemeIdentifier='NDG-B0' 
    13201321    and moles:dgMetadataID/moles:localIdentifier=$localIdentifier] 
    13211322return  
     
    14911492                                            element geographicIdentifier { 
    14921493                                                element gmd:RS_Identifier { 
    1493                                                     element gco:CharacterString {element code {data(dgArea/dgValidTerm)}}, 
    1494                                                     element gco:CharacterString {element codeSpace {data(dgArea/dgValidTermID/ParentListID)}} 
     1494                                                element gco:CharacterString {element code {data($geoArea/moles:dgValidTerm)}}, 
     1495                                                element gco:CharacterString {element codeSpace {data($geoArea/moles:dgValidTermID/moles:ParentListID)}} 
    14951496                                                    } 
    14961497                                                } 
  • TI07-MOLES/trunk/v1Schema/Schemae/MOLES1.spp

    r2026 r2334  
    3131                <File FilePath=".\..\..\StubB\Schemae\StubBDPT.xsd" HomeFolder="Yes"/> 
    3232                <File FilePath=".\..\..\StubB\Schemae\StubBObsStn.xsd" HomeFolder="Yes"/> 
     33                <File FilePath="http://www.isotc211.org/schemas/2005/gmd/metadataEntity.xsd" DocFrom="URL" HomeFolder="Yes"/> 
    3334        </Folder> 
    3435        <Folder FolderName="Entities" ExtStr="ent"/> 
Note: See TracChangeset for help on using the changeset viewer.