Changeset 4217 for exist

Timestamp:

22/09/08 17:31:19 (12 years ago)

Author:

cbyrom

Message:

Adjust atom to include atom type term ID as well as the vocab url - and
update the vocab data to include the terms for the various different
atom subtypes.

Location:

exist/trunk/python/ndgUtils

Files:

• models/Atom.py (modified) (6 diffs)
• models/MolesEntity.py (modified) (1 diff)
• vocabtermdata.py (modified) (3 diffs)

exist/trunk/python/ndgUtils/models/Atom.py

@@ -127 +127 @@
         if atomType:
             logging.info(" - of type '%s'" %atomType)
-        self.atomType = atomType
+        self.atomTypeID = atomType
 
         # some data have further subtypes specified
@@ -168 +168 @@
         else:
             self.VTD = VTD()
-         
+
+        if self.atomTypeID:
+            self.atomTypeName = self.VTD.TERM_DATA[self.atomTypeID].title
+
         self.ME = ME.MolesEntity()
         
@@ -187 +190 @@
 
 
+    def getValidSubTypes(self):
+        '''
+        Get list of subtypes that are valid wrt this atom type
+        '''
+        logging.debug("Lookup up subtypes for type, '%s'" %self.atomTypeID)
+        subTypes = self.VTD.SUBTYPE_TERMS.get(self.atomTypeID) or []
+        logging.debug(subTypes)
+        return subTypes
+        
+            
+
     def __addAtomTypeDataXML(self, root):
         '''
@@ -192 +206 @@
         - and lookup and add the appropriate vocab term data
         '''
-        if self.atomType:
+        if self.atomTypeID:
             logging.info("Adding atom type info to XML output")
             category = Category()
-            category.label = self.VTD.TERM_DATA[self.atomType].title
+            category.label = self.atomTypeID
             # look up the appropriate vocab term data
-            category.scheme = self.VTD.getTermCurrentVocabURL(self.atomType)
+            category.scheme = self.VTD.getTermCurrentVocabURL(self.atomTypeID)
             category.term = self.ATOM_TYPE
             root.append(category.toXML())
@@ -204 +218 @@
             logging.info("Adding atom subtype info to XML output")
             # NB subtypes not all defined, so leave this out for the moment
-            category.label = self.subtype #self.VTD.TERM_DATA[self.subtype].title
+            category.label = self.subtype
             # look up the appropriate vocab term data
-            category.scheme = 'NOT SET UP AT PRESENT'#self.VTD.getTermCurrentVocabURL(self.subtype)
+            category.scheme = self.VTD.getTermCurrentVocabURL(self.subtype)
             category.term = self.ATOM_SUBTYPE
             root.append(category.toXML())
@@ -511 +525 @@
             if cat.term == self.ATOM_TYPE:
                 logging.debug("Found atom type data")
-                self.atomType = cat.label
+                self.atomTypeID = cat.label
+                self.atomTypeName = self.VTD.TERM_DATA[cat.label].title 
                 continue
             elif cat.term == self.ATOM_SUBTYPE:

exist/trunk/python/ndgUtils/models/MolesEntity.py

@@ -176 +176 @@
         deploymentLink = DeploymentLink(contentURL, vocabURL, title=title)
 
-        logging.info(VTD.TERM_DATA[VTD.ACTIVITY_TERM].vocabURL)
         self._addDeploymentDetails(deploymentLink)
 

exist/trunk/python/ndgUtils/vocabtermdata.py

@@ -42 +42 @@
     DE_TERM = "DE"
     
+    LIDAR_TERM = "dgLidar"
+    RADAR_TERM = "dgRadar"
+    SONDE_TERM = "dgSonde"
+    NAVIGATION_TERM = "dgNavigation"
+    GAS_CHROMATOGRAPH_TERM = "dgGasChromatograph"
+    SPECTROMETER_TERM = "dgSpectrometer"
+    MASS_SPECTROMETER_TERM = "dgMassSpectrometer"
+    
+    SIMULATION_TERM = "dgSimulation"
+    ANALYSIS_TERM = "dgAnalysis"
+    MEASUREMENT_TERM = "dgMeasurement"
+    
+    DATA_COLLECTION_TERM = "dgDataCollection"
+    DATA_PROJECT_TERM = "dgDataProject"
+    DATA_CAMPAIGN_TERM = "dgDataCampaignProject"
+    DATA_INVESTIGATION_TERM = "dgDataInvestigation"
+    FLIGHT_TERM = "dgFlight"
+    CRUISE_TERM = "dgCruise"
+    FUNDING_PROGRAM_TERM = "dgFundingProgram"
+    
+    STATIONARY_PLATFORM_TERM = "dgStationaryPlatform"
+    MOVING_PLATFORM_TERM = "dgMovingPlatform"
+    LAND_STATION_TERM = "dgLandStation"
+    MOORING_TERM = "dgMooring"
+    STATION_GROUP_TERM = "dgStationGroup"
+    SHIP_TERM = "dgShip"
+    AIRCRAFT_TERM = "dgAircraft"
+    SATELLITE_TERM = "dgSatellite"
+    COMPUTER_TERM = "dgComputer"
+
     TERM_DATA = {
                  URI_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/N041', '3', title = 'Data Home Page'),
@@ -59 +89 @@
                  OBS_TERM:VocabTermItem('OBS - NOT YET SET UP', 'OBS', title = 'Observation Station'),
                  GRANULE_TERM:VocabTermItem('GRAN - NOT YET SET UP', 'GRAN', title = 'Data Granule'),
-                 DE_TERM:VocabTermItem('DE - NOT YET SET UP', 'DE', title = 'Data Entity')
+                 DE_TERM:VocabTermItem('DE - NOT YET SET UP', 'DE', title = 'Data Entity'),
+                 LIDAR_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG02', title = LIDAR_TERM),
+                 RADAR_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG03', title = RADAR_TERM),
+                 SONDE_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG04', title = SONDE_TERM),
+                 NAVIGATION_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG05', title = NAVIGATION_TERM),
+                 GAS_CHROMATOGRAPH_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG06', title = GAS_CHROMATOGRAPH_TERM),
+                 SPECTROMETER_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG07', title = SPECTROMETER_TERM),
+                 MASS_SPECTROMETER_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG08', title = MASS_SPECTROMETER_TERM),
+                 SIMULATION_TERM:VocabTermItem('NOT YET SET UP', SIMULATION_TERM, title = SIMULATION_TERM),
+                 ANALYSIS_TERM:VocabTermItem('NOT YET SET UP', ANALYSIS_TERM, title = ANALYSIS_TERM),
+                 MEASUREMENT_TERM:VocabTermItem('NOT YET SET UP', MEASUREMENT_TERM, title = MEASUREMENT_TERM),
+                 DATA_COLLECTION_TERM:VocabTermItem('NOT YET SET UP', DATA_COLLECTION_TERM, title = DATA_COLLECTION_TERM),
+                 DATA_PROJECT_TERM:VocabTermItem('NOT YET SET UP', DATA_PROJECT_TERM, title = DATA_PROJECT_TERM),
+                 DATA_CAMPAIGN_TERM:VocabTermItem('NOT YET SET UP', DATA_CAMPAIGN_TERM, title = DATA_CAMPAIGN_TERM),
+                 DATA_INVESTIGATION_TERM:VocabTermItem('NOT YET SET UP', DATA_INVESTIGATION_TERM, title = DATA_INVESTIGATION_TERM),
+                 FLIGHT_TERM:VocabTermItem('NOT YET SET UP', FLIGHT_TERM, title = FLIGHT_TERM),
+                 CRUISE_TERM:VocabTermItem('NOT YET SET UP', CRUISE_TERM, title = CRUISE_TERM),
+                 FUNDING_PROGRAM_TERM:VocabTermItem('NOT YET SET UP', FUNDING_PROGRAM_TERM, title = FUNDING_PROGRAM_TERM),
+                 
+                 STATIONARY_PLATFORM_TERM:VocabTermItem('NOT YET SET UP', STATIONARY_PLATFORM_TERM, title = STATIONARY_PLATFORM_TERM),
+                 MOVING_PLATFORM_TERM:VocabTermItem('NOT YET SET UP', MOVING_PLATFORM_TERM, title = MOVING_PLATFORM_TERM),
+                 LAND_STATION_TERM:VocabTermItem('NOT YET SET UP', LAND_STATION_TERM, title = LAND_STATION_TERM),
+                 MOORING_TERM:VocabTermItem('NOT YET SET UP', MOORING_TERM, title = MOORING_TERM),
+                 STATION_GROUP_TERM:VocabTermItem('NOT YET SET UP', STATION_GROUP_TERM, title = STATION_GROUP_TERM),
+                 SHIP_TERM:VocabTermItem('NOT YET SET UP', SHIP_TERM, title = SHIP_TERM),
+                 AIRCRAFT_TERM:VocabTermItem('NOT YET SET UP', AIRCRAFT_TERM, title = AIRCRAFT_TERM),
+                 SATELLITE_TERM:VocabTermItem('NOT YET SET UP', SATELLITE_TERM, title = SATELLITE_TERM),
+                 COMPUTER_TERM:VocabTermItem('NOT YET SET UP', COMPUTER_TERM, title = COMPUTER_TERM),
+                 
+                 #_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG09', title = _TERM),
+                 #_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG10', title = _TERM),
+                 #_TERM:VocabTermItem('http://vocab.ndg.nerc.ac.uk/term/C330', 'NG1', title = _TERM),
                  }
+
+    
+             #'dgMetSensor':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG09',
+             #'dgDOAS':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG10',
+             #'dgASOZ':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG11',
+             #'dgRadiometer':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG12',
+             #'dgFAGE':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG13',
+             #'dgImager':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG14',
+             #'dgFilter':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG15',
+             #'dgParticleCounter':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG16',
+             #'dgSampler':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG17',
+             #'dgOtherInstrumentType':'http://vocab.ndg.nerc.ac.uk/term/C330/0/NG99',
+             #'dgModel':'dgModel - NOT YET SET UP',
+             #'dgInstrument':'dgInstrument - NOT YET SET UP'
+
+
+    
+    # A dictionary to group the various valid subtypes of atoms - grouped by their
+    # main type
+    SUBTYPE_TERMS = {
+                     DPT_TERM: [
+                        TERM_DATA[LIDAR_TERM], TERM_DATA[RADAR_TERM], \
+                        TERM_DATA[SONDE_TERM], TERM_DATA[NAVIGATION_TERM], \
+                        TERM_DATA[GAS_CHROMATOGRAPH_TERM], TERM_DATA[SPECTROMETER_TERM], \
+                        TERM_DATA[MASS_SPECTROMETER_TERM]
+                        ],
+
+                     DE_TERM: [
+                        TERM_DATA[SIMULATION_TERM], TERM_DATA[ANALYSIS_TERM], \
+                        TERM_DATA[MEASUREMENT_TERM]       
+                        ],
+                     ACTIVITY_TERM: [
+                        TERM_DATA[DATA_COLLECTION_TERM], TERM_DATA[DATA_PROJECT_TERM], \
+                        TERM_DATA[DATA_CAMPAIGN_TERM], TERM_DATA[DATA_INVESTIGATION_TERM], \
+                        TERM_DATA[FLIGHT_TERM], TERM_DATA[CRUISE_TERM], \
+                        TERM_DATA[FUNDING_PROGRAM_TERM],
+                        ],
+                     OBS_TERM: [
+                        TERM_DATA[STATIONARY_PLATFORM_TERM], TERM_DATA[MOVING_PLATFORM_TERM], \
+                        TERM_DATA[LAND_STATION_TERM], TERM_DATA[MOORING_TERM], \
+                        TERM_DATA[STATION_GROUP_TERM], TERM_DATA[SHIP_TERM], \
+                        TERM_DATA[AIRCRAFT_TERM], TERM_DATA[SATELLITE_TERM], \
+                        TERM_DATA[COMPUTER_TERM] 
+                        ]
+                     }
+             
+
+
+    
     
     ONE_HOUR = 3600.0
@@ -75 +185 @@
         logging.info("VocabTermData object set up")
 
+
+    def getTermFromTitle(self, title):
+        '''
+        Given a term title/label, get back the related term id
+        @param title: title/label of term id to retrieve
+        @raise ValueError: if more than one title or no title is returned  
+        '''
+        termID = []
+        for val in self.TERM_DATA.itervalues():
+            if val.title == title:
+                termID.append(val.termID)
+        
+        if len(termID) != 1:
+            errorMessage = "Error: could not accurately determine the vocab term \
+                ID for the label, '%s' - %s values returned" %(title, len(termID))
+            logging.error(errorMessage)
+            raise ValueError(errorMessage)
+
+        return termID[0]
+        
 
     def _getVocabDataPage(self):