Changeset 4425

Timestamp:

12/11/08 10:42:25 (11 years ago)

Author:

cbyrom

Message:

Fix problem with 'where' element name (conflicting with xquery definition) +
stop duplication of deployments data + adjust namespaces + fix variable values.

File:

• exist/trunk/xquery/atom2DIF.xq (modified) (5 diffs)

exist/trunk/xquery/atom2DIF.xq

@@ -1 @@
-declare default element namespace 'http://www.w3.org/2005/Atom';
+declare default element namespace 'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/';
+declare namespace atom = 'http://www.w3.org/2005/Atom';
 declare namespace dif = 'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/';
 declare namespace xsi='http://www.w3.org/2001/XMLSchema-instance'; 
@@ -23 +24 @@
 :)
 
-declare variable $targetCollection as xs:string := '/db/atoms';
+declare variable $targetCollection as xs:string := 'TargetCollection';
 declare variable $deploymentsCollection as xs:string := '/db/atoms';
-declare variable $repositoryIdentifier as xs:string := 'badc.nerc.ac.uk';
-declare variable $localIdentifier as xs:string := 'dataent_WLSTA';
+declare variable $repositoryIdentifier as xs:string := 'RepositoryID';
+declare variable $localIdentifier as xs:string := 'LocalID';
 declare variable $dptTerm as xs:string := 'DPT - NOT YET SET UP/None/DPT';
 declare variable $obsTerm as xs:string :=  'OBS - NOT YET SET UP/None/OBS';
-declare variable $activityTerm as xs:string :=  'ACTIVITY - NOT YET SET UP/None/OBS';
+declare variable $activityTerm as xs:string :=  'Activity - NOT YET SET UP/None/ACTIVITY';
 declare variable $granuleTerm as xs:string :=  'GRAN - NOT YET SET UP/None/GRANULE';
+declare variable $deploymentTerm as xs:string := 'NOT YET SET UP/None/Deployment';
 declare variable $uriTerm as xs:string :=  'URI';
 
-for $DE in collection($targetCollection)/entry[matches(id, concat('__ATOM__',$localIdentifier,'$'))] 
+for $DE in collection($targetCollection)/atom:entry[matches(atom:id, concat('__ATOM__',$localIdentifier,'$'))] 
 return 
 element DIF {
         attribute xsi:schemaLocation {'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/ http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/dif_v9.4.xsd'},
-        element Entry_ID {concat(string($DE/moles:entity/moles:molesISO/moles:providerID),':DIF:', tokenize(string($DE/id), '__ATOM__')[2])},
-        element Entry_Title {string($DE/title)},
+        element Entry_ID {concat(string($DE/moles:entity/moles:molesISO/moles:providerID),':DIF:', tokenize(string($DE/atom:id), '__ATOM__')[2])},
+        element Entry_Title {string($DE/atom:title)},
         element Data_Set_Citation {
-            element Dataset_Creator {string($DE/author/name)},
-            element Dataset_Title {string($DE/title)}
+            element Dataset_Creator {string($DE/atom:author/atom:name)},
+            element Dataset_Title {string($DE/atom:title)}
         },
         element Personnel {
@@ -50 +52 @@
         element Parameters { element Category {''}, element Topic {''}, element Term {''} },
 
-           for $deploymentID in ($DE/link[@rel = 'ActivityDeployment'])
-               return
-               for $atom in ($deploymentsCollection/entry[link[@href = $deploymentID] and category[@label = 'Deployment']])
-               return
-                   for $dpt in ($atom[link[@rel = $dptTerm]])
-                       return
-                    element Sensor_Name {
-                           element Long_Name {data($dpt[title])}
-                    },
-           for $deploymentID in ($DE/link[@rel = 'ActivityDeployment'])
-               return
-               for $atom in ($deploymentsCollection/entry[link[@href = $deploymentID] and category[@label = 'Deployment']])
-               return
-                   for $obs in ($atom[link[@rel =$obsTerm]])
-                       return
-                    element Source_Name {
-                           element Long_Name {data($obs[title])}
-                    },
-           for $deploymentID in ($DE/link[@rel = 'ActivityDeployment'])
-               return
-               for $atom in ($deploymentsCollection/entry[link[@href = $deploymentID] and category[@label = 'Deployment']])
-               return
-                   for $activity in ($atom[link[@rel =$activityTerm]])
-                       return
-                    element Project {
-                           element Long_Name {data($activity[title])}
-                    },
-
-           for $TemporalRange in $DE/moles:temporalRange
+   (:Top level loop over all link data in the atom that refers to deployment atoms:)
+   (: NB, slightly convoluted way of doing things to avoid item duplication :)
+        for $val in distinct-values(
+                for $deploymentID in data($DE/atom:link[@rel = $deploymentTerm]/@href)
+        return
+        (:Now look up these deployment atoms and retrieve their links - removing duplicates:)
+                for $title in (data(collection($deploymentsCollection)/atom:entry[atom:link[@href = $deploymentID] and atom:category[@label = 'Deployment']]/atom:link[@rel = $dptTerm]/@title))
+                return
+                                $title
+                        )
+        return 
+                element Sensor_Name {
+                element Long_Name {$val}
+        },
+        
+        for $val in distinct-values(
+                for $deploymentID in data($DE/atom:link[@rel = $deploymentTerm]/@href)
+        return
+                for $title in (data(collection($deploymentsCollection)/atom:entry[atom:link[@href = $deploymentID] and atom:category[@label = 'Deployment']]/atom:link[@rel = $obsTerm]/@title))
+                return
+                                $title
+                        )
+    return
+            element Source_Name {
+           element Long_Name {$val}
+            },
+   for $TemporalRange in $DE/moles:temporalRange
         return
-            element Temporal_Coverage
-                        {
-                        element Start_Date {tokenize(string($DE/moles:temporalRange), '/')[0]},
-                        element Stop_Date {tokenize(string($DE/moles:temporalRange), '/')[1]}
-                        },
+        element Temporal_Coverage
+        {
+        element Start_Date {tokenize(string($DE/moles:temporalRange), '/')[1]},
+        element Stop_Date {tokenize(string($DE/moles:temporalRange), '/')[2]}
+        },
            
-        for $BoundingBox in $DE//georss:where/gml:Envelope
+        for $BoundingBox in $DE//../gml:Envelope
         return 
             element Spatial_Coverage {
-                    element Southernmost_Latitude {data($BoundingBox/gml:lowerCorner)},
-                    element Northernmost_Latitude {tokenize(string($BoundingBox/gml:upperCorner), '')[1]},
-                    element Westernmost_Longitude {tokenize(string($BoundingBox/gml:lowerCorner), '')[0]},
-                    element Easternmost_Longitude {tokenize(string($BoundingBox/gml:upperCorner), '')[0]}
+                    element Southernmost_Latitude {tokenize(string($BoundingBox/gml:lowerCorner), ' ')[2]},
+                    element Northernmost_Latitude {tokenize(string($BoundingBox/gml:upperCorner), ' ')[2]},
+                    element Westernmost_Longitude {tokenize(string($BoundingBox/gml:lowerCorner), ' ')[1]},
+                    element Easternmost_Longitude {tokenize(string($BoundingBox/gml:upperCorner), ' ')[1]}
                 },
          
         element Data_Resolution {''},
+        
+        for $val in distinct-values(
+                for $deploymentID in data($DE/atom:link[@rel = $deploymentTerm]/@href)
+        return
+                for $title in (data(collection($deploymentsCollection)/atom:entry[atom:link[@href = $deploymentID] and atom:category[@label = 'Deployment']]/atom:link[@rel = $activityTerm]/@title))
+                return
+                                $title
+                        )
+    return
+            element Project {
+           element Long_Name {$val}
+            },
         element Quality {''},
         element Use_Constraints {''},
@@ -102 +114 @@
         element Multimedia_Sample {''},
         element Reference {''},
-        element Summary {string($DE/summary)},
-           for $link in ($DE/link[@rel = $granuleTerm])
-               return
-                    element Related_URL {
-                            element URL {data($link[@href])},
-                               element Description {data($link[@title])} 
-                               },
+        element Summary {string($DE/atom:summary)},
+    for $link in ($DE/atom:link[@rel = $granuleTerm])
+       return
+            element Related_URL {
+                    element URL {data($link[@href])},
+                       element Description {data($link[@title])} 
+                       },
 
-           for $link in ($DE/link[@rel = $uriTerm])
-               return
-                    element Related_URL {
-                            element URL {data($link[@href])},
-                               element Description {data($link[@title])}
-                               },
+   for $link in ($DE/atom:link[@rel = $uriTerm])
+       return
+            element Related_URL {
+                    element URL {data($link[@href])},
+                       element Description {data($link[@title])}
+                       },
         element Parent_DIF {''},
         element IDN_Node { element Short_Name {''} },
@@ -124 +136 @@
                 element DIF_Creation_Date {data($DE/moles:entity/moles:molesISO/moles:created)}
         else (),
-        if  (exists($DE/updated)) then 
-                element DIF_Revision_History {data($DE/updated)} (: missing updator + summary... :)
+        if  (exists($DE/atom:updated)) then 
+                element DIF_Revision_History {data($DE/atom:updated)} 
         else ()
         }