Changeset 239

Timestamp:

02/23/08 07:08:10 (4 years ago)

Author:

will

Message:

Bug fixes for the XSLTransformer (ignore resource-directory-exists errors with just a warning) and the Resource class (resource types weren't being added to the XML)

Location:

trunk/src/core/puredocs/core

Files:

• chain.py (modified) (1 diff)
• resource.py (modified) (1 diff)

trunk/src/core/puredocs/core/chain.py

@@ -280 +280 @@
         # XXX: Again, since we're chunking, just use outpath.
         # Otherwise, we'd need some checks here.
-        shutil.copytree(self.resources, os.path.join(outpath, "resources"))
+        try:
+            shutil.copytree(self.resources, os.path.join(outpath, "resources"))
+        except OSError:
+            # XXX: This is probably a file exists error.  Not entirely
+            # sure what to do here.  Right now, we'll assume that the
+            # file exists because the resources are already there.
+            # In the future, it might be necessary to use a more robust
+            # API than shutils to check the contents of an existing file
+            # and do whatever appropriate
+            self.logger.warning("Resources directory (%s) already exists."
+                    "Not copying." % os.path.join(outpath, "resources"))
 
         # Do this so that this plugin passes silently.  It doesn't

trunk/src/core/puredocs/core/resource.py

@@ -90 +90 @@
             # Create our element within the PureDocs namespace
             self.__element = NSElement("resource", "puredocs")
+            self.__element.set("type", unicode(type))
             self.__element.set("mimetype", mimetype)
             self.doc = doc