[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset base.py,1.18,1.19

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9914/happydoclib/docset

Modified Files:
	base.py 
Log Message:
Multi-file docset should quietly ignore function nodes, assuming they
are included in the file-level node output.  Also, when we do skip a
node, print the node name instead of the node filename (we might not
be skipping the whole file).


Index: base.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/base.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** base.py	16 Mar 2003 20:17:30 -0000	1.18
--- base.py	16 Apr 2006 23:23:37 -0000	1.19
***************
*** 280,286 ****
          """
          mimetype, encoding = packageTreeNode.getMimeType()
!         filename = packageTreeNode.getInputFilename()
!         self.statusMessage('Skiping unrecognized file %s with mimetype %s' % (
!             filename,
              mimetype,
              ))
--- 280,286 ----
          """
          mimetype, encoding = packageTreeNode.getMimeType()
!         full_name = packageTreeNode.getCanonicalName()
!         self.statusMessage('Skipping %s with unrecognized mimetype %s' % (
!             full_name,
              mimetype,
              ))
***************
*** 373,376 ****
--- 373,377 ----
              ('image/jpeg'              , 'copyInputFileToOutput'),
              ('image/png'               , 'copyInputFileToOutput'),
+             ('application/x-function'  , 'noopHandler'),
              ]
          for mimetype, writer_name in mimetype_writers:
***************
*** 469,472 ****
--- 470,478 ----
          return
  
+     def noopHandler(self, packageTreeNode):
+         """Handler that does nothing.
+         """
+         return
+ 
      def processDirectory(self, packageTreeNode):
          """Handler for application/x-directory nodes.