Changeset 7997

Timestamp:

01/12/11 10:44:15 (9 years ago)

Author:

sdonegan

Message:

Added check so will not allow service records in

File:

• TI01-discovery-Ingest/trunk/v4.3.0/ingestAutomation-upgrade/OAIBatch/ExtractISO.py (modified) (3 diffs)

TI01-discovery-Ingest/trunk/v4.3.0/ingestAutomation-upgrade/OAIBatch/ExtractISO.py

@@ -22 +22 @@
                 
                 #show actual values extracted from the XML in logging.info
-                self.showXMLvalues = True
+                self.showXMLvalues = False
                 
                 logging.info("Have initialised ISO XML Extractor")
@@ -152 +152 @@
                 elif self.resourceType == 'service':
                         logging.info("Ingesting a service metadata record!")
-                        self.datasetID = self.getElementVal(self.isoModel.fileIdentifier())
+                        #self.datasetID = self.getElementVal(self.isoModel.fileIdentifier())
+                        
+                        #NERC not yet accepting service docs so filter them out here!
+                        self.processingMsg = 'ResourceType is SERVICE- not currently accepted into the NERC DWS!'
+                        logging.error(self.processingMsg)
+                        self.validDoc = False
                 
                 if self.datasetID == 'None':
@@ -964 +969 @@
                 returnVal = 'None'
                 
-                logging.info("******************************************************************************************")
-                logging.info("Extracting xpath information for data extraction type:"  + keyMethod[0])
-                logging.info("******************************************************************************************")
+                if self.showXMLvalues:
+                        logging.info("******************************************************************************************")
+                        logging.info("Extracting xpath information for data extraction type:"  + keyMethod[0])
+                        logging.info("******************************************************************************************")