Changeset 6194 for TI01-discovery


Ignore:
Timestamp:
18/12/09 12:19:24 (10 years ago)
Author:
sdonegan
Message:

Added thread id so abstractdocumentingester.py can distinguish between calling methods

Location:
TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/abstractdocumentingester.py

    r6193 r6194  
    311311                                self._NDG_dataProvider = True 
    312312                        elif words[0] == 'feed': 
    313                                 self._IngestViaFeed = True 
     313                                self.IngestViaFeed = True 
    314314                 
    315315                datacentre_config_file.close() 
     316                 
     317                #stop ingest on this datacentre if process thread is OAI and the config says FEED 
     318                if ((self.processThread == 'OAI') and self.IngestViaFeed): 
     319                        sys.exit("Trying to ingest a FEED based centre.  Better stop now before it all gets a bit tricky!") 
     320                         
    316321                         
    317322                if self._harvest_home == "": 
  • TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/feeddocumentingester.py

    r6189 r6194  
    297297                self._error_messages = '' 
    298298                 
     299                self.processThread = 'FEED' 
     300                 
    299301                self.deName = VTD().TERM_DATA[VTD.DE_TERM].title 
    300302 
  • TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/oai_document_ingester.py

    r6186 r6194  
    5353                self._code_dir = self.processingDict['code_directory'] 
    5454                self._base_dir = self.processingDict['base_directory'] 
     55                 
     56                self.processThread = 'OAI' 
    5557                 
    5658                self._setupDataCentreDirs() 
Note: See TracChangeset for help on using the changeset viewer.