Changeset 6135


Ignore:
Timestamp:
15/12/09 11:51:09 (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

    r6133 r6135  
    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,baseDir): 
     35    def __init__(self, filename, ndg_dataprovider, datacentre_groups, datacentre_namespace, discovery_id,datasetName,datacentreName,datasetLastEditUpdateDate,datasetStartDateNom, datasetEndDateNom, xq, docType,baseDir,codeDir): 
    3636                  
    3737        logging.info("Setting up Postgres record for file, " + filename) 
     
    5252        self._xq = xq 
    5353        self.base_dir = baseDir 
     54        self.code_dir = codeDir 
    5455         
    5556        # simplify processing by uppercasing format at initialisation 
     
    196197        # write the query to file, to make it easier to input 
    197198        # NB, running directly at the command line leads to problems with the interpretation of $ characters 
    198         xqFile = "currentQuery" + xQueryType + ".xq"  
     199        xqFile = self.base_dir + "currentQuery" + xQueryType + ".xq"  
    199200        FileUtilities.createFile(xqFile, xquery) 
    200201         
     
    202203        # location - e.g. the OAIInfoEditor.lib.harvester - and this won't have the 
    203204        # saxon file directly on its filesystem 
    204         jarFile = pkg_resources.resource_filename('OAIBatch', SAXON_JAR_FILE) 
     205        #jarFile = pkg_resources.resource_filename('OAIBatch', SAXON_JAR_FILE) 
     206        jarFile = self.code_dir + SAXON_JAR_FILE 
    205207 
    206208        # Now do the transform 
  • TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/abstractdocumentingester.py

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