Changeset 144

Timestamp:

05/06/09 15:31:11 (4 years ago)

Author:

jon

Message:

Correcting several bugs in refactor

Location:

collective.imstransport/trunk/collective/imstransport/utilities

Files:

• ccreader.py (modified) (2 diffs)
• ccwriter.py (modified) (1 diff)

collective.imstransport/trunk/collective/imstransport/utilities/ccreader.py

@@ -66 +66 @@
                         
                         # Check if item is in organizations section
-                        import pdb; pdb.set_trace()
-                        if hashref in [org[0] for org in orgdata]:
-                            orgDict[hashref]['excludeFromNav'] == False
-
-                    self.parseFile(file, objDict, hashref, id, path)
+                        if hashref in [org for org in orgdata if org]:
+                            objDict[hashref]['excludeFromNav'] = False
+
+                    self.parseFile(context, file, objDict, hashref, id, path)
 
         
@@ -78 +77 @@
 
 
-    def parseFile(file, objDict, hashref, id, path):
+    def parseFile(self, context, file, objDict, hashref, id, path):
         """ parse a file object and add data to it """
         objDict[hashref]['file'] = file
         objDict[hashref]['id'] = id
         objDict[hashref]['path'] = path
-        objDict[hashref]['type'] = self.determineType(context, hashref, ccreader, objDict, file)
-
-
-    def determineType(self, context, hashref, ccreader, objDict, filename):
+        objDict[hashref]['type'] = self.determineType(context, hashref, objDict, file)
+
+
+    def determineType(self, context, hashref, objDict, filename):
         """ Determine the type of the incoming object """
 

collective.imstransport/trunk/collective/imstransport/utilities/ccwriter.py

@@ -144 +144 @@
             else:
                 data = ''
+
         if self.destination:
             self.destination.writeFile(path, data)