[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset base.py,1.7,1.8

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

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1:/tmp/cvs-serv10523/happydoclib/docset

Modified Files:
	base.py 
Log Message:
Add optional argument includePath to
getOutputFilenameForPackageTreeNode() so we can get just the basename
of the output file.


Index: base.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/base.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** base.py	8 Dec 2002 16:23:52 -0000	1.7
--- base.py	8 Dec 2002 17:02:37 -0000	1.8
***************
*** 190,194 ****
          }
  
!     def getOutputFilenameForPackageTreeNode(self, packageTreeNode):
          """Returns a filename where documentation for packageTreeNode should be written.
  
--- 190,194 ----
          }
  
!     def getOutputFilenameForPackageTreeNode(self, packageTreeNode, includePath=1):
          """Returns a filename where documentation for packageTreeNode should be written.
  
***************
*** 207,210 ****
--- 207,211 ----
          trace.into('MultiFileDocSet', 'getOutputFilenameForPackageTreeNode',
                     packageTreeNode=packageTreeNode,
+                    includePath=includePath,
                     )
          
***************
*** 214,228 ****
          trace.writeVar(settings=settings)
  
!         #
!         # Get the input filename, relative to the root of the input.
!         #
!         #input_filename = packageTreeNode.getInputFilename()
!         input_filename = packageTreeNode.getRelativeFilename()
!         
!         #
!         # Add the output directory to the front of the input
!         # filename.
!         #
!         output_filename = os.path.join(self.output_directory, input_filename)
  
          if settings.get('remove_existing'):
--- 215,233 ----
          trace.writeVar(settings=settings)
  
!         if includePath:
!             #
!             # Get the input filename, relative to the root of the input.
!             #
!             input_filename = packageTreeNode.getRelativeFilename()
! 
!             #
!             # Add the output directory to the front of the input
!             # filename.
!             #
!             output_filename = os.path.join(self.output_directory, input_filename)
!             
!         else:
!             input_filename = packageTreeNode.getRelativeFilename()
!             output_filename = os.path.basename(input_filename)
  
          if settings.get('remove_existing'):
***************
*** 233,236 ****
--- 238,242 ----
          #
          normalized_output_filename = os.path.normpath(output_filename)
+             
          trace.outof(normalized_output_filename)
          return normalized_output_filename