Changeset 8001

Timestamp:

02/12/11 16:24:55 (9 years ago)

Author:

sdonegan

Message:

Further updates to sort problem file logging

Location:

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

Files:

• ExtractISO.py (modified) (2 diffs)
• abstractdocumentingester.py (modified) (1 diff)

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 = False
+                self.showXMLvalues = True
                 
                 logging.info("Have initialised ISO XML Extractor")
@@ -230 +230 @@
                         self.authors_text = self.authorOb.getDelimitedStringFromList(self.authorOb.listVals)            
                         self.authors_ts_vector = self.authors_text
-                                
+                #import pdb; pdb.set_trace()    
                 self.datacentreName = self.getElementVal(self.isoModel.dataCentreName())
                 

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

@@ -984 +984 @@
                                 
                                 else:
-                                        for badFile in self.problemMessageList.keys():                                  
-                                                sqlProbFileCmd = "select add_problem_file(%s,'%s','%s');"%(self.ingestProcessID,badFile,self.problemMessageList[badFile])
-                                                        
-                                                #update ingestLogging                   
-                                                self.pgc_IngestLog.runSQLCommand(sqlProbFileCmd)                
+                                        sqlProbFileCmd = ''
+                                        for badFile in self.problemMessageList.keys():
+                                                
+                                                try:                            
+                                                        sqlProbFileCmd = "select add_problem_file(%s,'%s','%s');"%(self.ingestProcessID,badFile,self.problemMessageList[badFile])
+                                                        self.pgc_IngestLog.runSQLCommand(sqlProbFileCmd)
+                                                except:
+                                                        #might be a dodgy char in there... in which case
+                                                        logging.error("Trying to update an error report with bad characters..")
+                                                        sqlProbFileCmd = "select add_problem_file(%s,'%s','%s');"%(self.ingestProcessID,badFile,"Bad characters present!")
+                                                
+                                                        #update ingestLogging                   
+                                                        self.pgc_IngestLog.runSQLCommand(sqlProbFileCmd)