Changeset 2512

Timestamp:

25/05/07 13:38:23 (14 years ago)

Author:

ko23

Message:

Update deployment count query

Location:

TI07-MOLES/trunk

Files:

• MOLES.xpr (modified) (2 diffs)
• StubB/XQuery/DeploymentCount.xquery (modified) (2 diffs)

TI07-MOLES/trunk/MOLES.xpr

@@ -9 +9 @@
         <folder path="eXist%20specific/xqueryLib/"/>
         <folder path="ISO19115-19139/Examples/"/>
+        <file name="StubB/XQuery/DeploymentCount.xquery"/>
         <file name="DIF/XQuery/DIF2MOLES.xquery"/>
         <file name="MDIP/XQueries/MDIP2MOLES.xquery"/>
@@ -23 +24 @@
         <file
             name="ISO19115-19139/XQuery/NDG-ISO19115-139LocalValidate.xquery"/>
-        <file name="ISO19115-WMO/XQuery/NDG-ISO19115-WMO.xquery"/>
         <file name="MDIP/XQueries/NDG-MDIP.xquery"/>
         <file name="StubB/XQuery/NDG-ObsStnStubB.xquery"/>
         <file name="DIF/Schemae/dif9-4.xsd"/>
-        <file name="ISO19115-WMO/TC211-WMO/wmo_examples/example1.xml"/>
         <file name="StubB/XQuery/NDG-ObsStnStubBnew.xquery"/>
         <file name="v1Schema/Schemae/ndgmetadata1.2.4.xsd"/>
         <file name="v1Schema/Schemae/ndgmetadata1.2.5.xsd"/>
         <file name="v1Schema/Schemae/ndgmetadata1.3.xsd"/>
-        <file name="DIF/XQuery/test.xquery"/>
-        <file name="StubB/XQuery/testquery.xquery"/>
     </projectTree>
 </project>

TI07-MOLES/trunk/StubB/XQuery/DeploymentCount.xquery

@@ -3 +3 @@
 element table {
 for $Act in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
-[exists(dgActivity)]
+[exists(dgActivity/ActivityDeployment)]
 order by count($Act/dgActivity/ActivityDeployment) descending 
 return 
@@ -14 +14 @@
 },
 element table {
-for $Act in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
-[exists(dgDataProductionTool)]
-order by count($Act/dgDataProductionTool/DPTDeployment) descending 
+for $DPT in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
+[exists(dgDataProductionTool/DPTDeployment)]
+order by count($DPT/dgDataProductionTool/DPTDeployment) descending 
 return 
 element tr {
-element td {data($Act/dgMetadataID/localIdentifier)}
+element td {data($DPT/dgMetadataID/localIdentifier)}
 , 
-element td {data($Act/name)},
-element td {data(count($Act/dgDataProductionTool/DPTDeployment))}
+element td {data($DPT/name)},
+element td {data(count($DPT/dgDataProductionTool/DPTDeployment))}
 }
 },
 element table {
-for $Act in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
-[exists(dgObservationStation)]
-order by count($Act/dgObservationStation/ObsStnDeployment) descending 
+for $ObsStn in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
+[exists(dgObservationStation/ObsStationDeployment)]
+order by count($ObsStn/dgObservationStation/ObsStationDeployment) descending 
 return 
 element tr {
-element td {data($Act/dgMetadataID/localIdentifier)}
+element td {data($ObsStn/dgMetadataID/localIdentifier)}
 , 
-element td {data($Act/name)},
-element td {data(count($Act/dgObservationStation/ObsStnDeployment))}
+element td {data($ObsStn/name)},
+element td {data(count($ObsStn/dgObservationStation/ObsStationDeployment))}
 }
 },
 element table {
-for $Act in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
-[exists(dgDataProductionTool)]
-order by count($Act/dgDataEntity/RelatedDeployment) descending 
+for $DE in collection('/db/ndg_B_metadata/badc.nerc.ac.uk')/dgMetadata/dgMetadataRecord
+[exists(dgDataEntity/RelatedDeployment)]
+order by count($DE/dgDataEntity/RelatedDeployment) descending 
 return 
 element tr {
-element td {data($Act/dgMetadataID/localIdentifier)}
+element td {data($DE/dgMetadataID/localIdentifier)}
 , 
-element td {data($Act/name)},
-element td {data(count($Act/dgDataEntity/RelatedDeployment))}
+element td {data($DE/name)},
+element td {data(count($DE/dgDataEntity/RelatedDeployment))}
 }
 }