Changeset 2056

Timestamp:

25/01/07 16:40:40 (12 years ago)

Author:

ko23

Message:

Second element Address case fixed

Location:

TI07-MOLES/trunk

Files:

• DIF/XQuery/DIF2MOLES.xquery (modified) (3 diffs)
• DIF/XQuery/NDG-DIF.xquery (modified) (1 diff)
• Documents/IDIssuesinNDG.doc (modified) (previous)
• MDIP/XQueries/MDIP2MOLES.xquery (modified) (1 diff)
• PythonCode/wsgi/ndg_xqueries.py (modified) (1 diff)

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

@@ -7 +7 @@
 declare namespace xsi='http://www.w3.org/2001/XMLSchema-instance'; 
 declare namespace f='http://ndg.nerc.ac.uk/moles/localfunctions';
-
+(: Replacable parameters :)
 declare variable $input_collection as xs:string {'TargetCollection'};
-
+declare variable $input_repository as xs:string {'Input_Repository_Code'};
+declare variable $input_repository_local as xs:string {'Input_Repository_LocalID'};
+declare variable $input_entry_id as xs:string {'Input_Entry_ID'};
+declare variable $output_local_id as xs:string {'Output_LocalID'};
+(: Vocab stubs :)
 declare variable $unknown_vocab_id as xs:string {'http://vocab.ndg.nerc.ac.uk/null'};
-
 declare variable $bodc_parameter_discovery_vocab as xs:string {'http://vocab.ndg.nerc.ac.uk/P021'};
-
-declare variable $cf_standard_names as xs:string {'http://www.cgd.ucar.edu/cms/eaton/cf-metadata/standard_name.html'};
-
-(: declare variable $gcmd_science_valids as xs:string {'http://gcmd.gsfc.nasa.gov/Resources/valids/gcmd_parameters.html'}; :)
+declare variable $cf_standard_names as xs:string {'http://vocab.ndg.nerc.ac.uk/P071'};
 declare variable $gcmd_science_valids as xs:string {'http://vocab.ndg.nerc.ac.uk/P041'};
 declare variable $gcmd_project_valids as xs:string {'http://gcmd.gsfc.nasa.gov/Resources/valids/projects.html'};
@@ -22 +22 @@
 declare variable $gcmd_paleotemporal_valids as xs:string {'http://gcmd.gsfc.nasa.gov/Resources/valids/paleotemporal.html'};
 declare variable $gcmd_iso_topic_list as xs:string {'http://gcmd.gsfc.nasa.gov/Resources/valids/iso_topic_list.html'};
-
-(: declare variable $iso_topic_list as xs:string {'http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_TopicCategoryCode'}; :)
 declare variable $iso_topic_list as xs:string {'http://vocab.ndg.nerc.ac.uk/P051'};
-
 declare variable $ndg_data_provider_vocab as xs:string {'http://vocab.ndg.nerc.ac.uk/N010'};
-
-declare variable $input_repository as xs:string {'Input_Repository_Code'};
-declare variable $input_repository_local as xs:string {'Input_Repository_LocalID'};
-declare variable $input_entry_id as xs:string {'Input_Entry_ID'};
-declare variable $output_local_id as xs:string {'Output_LocalID'};
 
 declare function f:fix-coord($e as element()) as element() 
@@ -56 +48 @@
 } ;
 
+declare function f:spot-vocab($vocab_root as xs:string, $vocab_uri as xs:string) as xs:boolean 
+(: See if the vocab pointed if from the vocab pointed at by the vocab_root :)
+{
+iif ($vocab_root = substring($vocab_uri, 1, string-length($vocab_root))) then  
+        true()
+else
+        false()
+} ;
+
 for $DIF in collection($input_collection)/dif:DIF[dif:Entry_ID=$input_entry_id]
 return

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

@@ -211 +211 @@
                                     element Contact_Address {
                                         for $addressline in $DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:addressline
-                                            return element address {data($addressline)},
+                                            return element Address {data($addressline)},
                                                             if (exists($DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:city)) then 
                                             element City {string($DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:city)}

TI07-MOLES/trunk/MDIP/XQueries/MDIP2MOLES.xquery

@@ -60 +60 @@
                 else $e
         else  $e
+} ;
+
+declare function f:spot-vocab($vocab_root as xs:string, $vocab_uri as xs:string) as xs:boolean 
+(: See if the vocab pointed if from the vocab pointed at by the vocab_root :)
+{
+if ($vocab_root = substring($vocab_uri, 1, string-length($vocab_root))) then  
+        true()
+else
+        false()
 } ;
 

TI07-MOLES/trunk/PythonCode/wsgi/ndg_xqueries.py

@@ -302 +302 @@
 element Contact_Address {
 for $addressline in $DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:addressline
-return element address {data($addressline)},
+return element Address {data($addressline)},
 if (exists($DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:city)) then 
 element City {string($DataCuratorRoleHolder/moles:contactDetails/moles:address/moles:city)}