Changeset 144


Ignore:
Timestamp:
05/06/09 15:31:11 (6 years ago)
Author:
jon
Message:

Correcting several bugs in refactor

Location:
collective.imstransport/trunk/collective/imstransport/utilities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • collective.imstransport/trunk/collective/imstransport/utilities/ccreader.py

    r143 r144  
    6666                         
    6767                        # Check if item is in organizations section 
    68                         import pdb; pdb.set_trace() 
    69                         if hashref in [org[0] for org in orgdata]: 
    70                             orgDict[hashref]['excludeFromNav'] == False 
    71  
    72                     self.parseFile(file, objDict, hashref, id, path) 
     68                        if hashref in [org for org in orgdata if org]: 
     69                            objDict[hashref]['excludeFromNav'] = False 
     70 
     71                    self.parseFile(context, file, objDict, hashref, id, path) 
    7372 
    7473         
     
    7877 
    7978 
    80     def parseFile(file, objDict, hashref, id, path): 
     79    def parseFile(self, context, file, objDict, hashref, id, path): 
    8180        """ parse a file object and add data to it """ 
    8281        objDict[hashref]['file'] = file 
    8382        objDict[hashref]['id'] = id 
    8483        objDict[hashref]['path'] = path 
    85         objDict[hashref]['type'] = self.determineType(context, hashref, ccreader, objDict, file) 
    86  
    87  
    88     def determineType(self, context, hashref, ccreader, objDict, filename): 
     84        objDict[hashref]['type'] = self.determineType(context, hashref, objDict, file) 
     85 
     86 
     87    def determineType(self, context, hashref, objDict, filename): 
    8988        """ Determine the type of the incoming object """ 
    9089 
  • collective.imstransport/trunk/collective/imstransport/utilities/ccwriter.py

    r143 r144  
    144144            else: 
    145145                data = '' 
     146 
    146147        if self.destination: 
    147148            self.destination.writeFile(path, data) 
Note: See TracChangeset for help on using the changeset viewer.