[CMF-checkins] CVS: CMF - Document.py:1.24

[tseaver@digicool.com]

Update of /cvs-repository/CMF/CMFDefault
In directory korak.digicool.com:/tmp/cvs-serv8849

Modified Files:
	Document.py 
Log Message:


 - Don't overwrite Subject when no 'Subject' or 'Keywords' headers
   were present (Tracker #294).



--- Updated File Document.py in package CMF --
--- Document.py	2001/06/05 15:20:33	1.23
+++ Document.py	2001/06/05 18:23:53	1.24
@@ -215,7 +215,8 @@
         self.text = body
 
         headers['Format'] = self.Format()
-        headers['Subject'] = keywordsplitter(headers)
+        new_subject = keywordsplitter(headers)
+        headers['Subject'] = new_subject or self.Subject()
         haveheader = headers.has_key
         for key, value in self.getMetadataHeaders():
             if key != 'Format' and not haveheader(key):