Changeset 6133


Ignore:
Timestamp:
15/12/09 11:35:51 (10 years ago)
Author:
sdonegan
Message:

Further debugs w.r.t non local file handling

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

Legend:

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

    r5846 r6133  
    3333         
    3434    #def __init__(self, filename, ndg_dataprovider, datacentre_groups, datacentre_namespace, discovery_id, xq, docType): 
    35     def __init__(self, filename, ndg_dataprovider, datacentre_groups, datacentre_namespace, discovery_id,datasetName,datacentreName,datasetLastEditUpdateDate,datasetStartDateNom, datasetEndDateNom, xq, docType): 
     35    def __init__(self, filename, ndg_dataprovider, datacentre_groups, datacentre_namespace, discovery_id,datasetName,datacentreName,datasetLastEditUpdateDate,datasetStartDateNom, datasetEndDateNom, xq, docType,baseDir): 
    3636                  
    3737        logging.info("Setting up Postgres record for file, " + filename) 
     
    5151        self.discovery_id = discovery_id 
    5252        self._xq = xq 
     53        self.base_dir = baseDir 
     54         
    5355        # simplify processing by uppercasing format at initialisation 
    5456        self.docType = docType.upper()     
     
    258260 
    259261        # NB, use temporary directories to do the keyword additions 
    260         tmpDir = os.getcwd() + "/tmp/" 
     262        tmpDir = self.baseDir + "/tmp/" 
    261263        tmpKeywordsDir = os.getcwd() + "/keywordsAdded/" 
    262264        FileUtilities.setUpDir(tmpDir) 
  • TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/abstractdocumentingester.py

    r6132 r6133  
    158158                                                            self._datacentre_groups, self._datacentre_namespace, \ 
    159159                                                            discoveryID,datasetName,datacentreName,datasetLastEditUpdateDate,datasetStartDateNom,datasetEndDateNom, \ 
    160                                                             self._xq, self._datacentre_format) 
     160                                                            self._xq, self._datacentre_format,self._base_dir) 
    161161                        #import pdb 
    162162                        #pdb.set_trace() 
Note: See TracChangeset for help on using the changeset viewer.