[Happydoc-checkins] CVS: HappyDoc/happydoclib/formatter fileformatterbase.py,1.8,1.9

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

Update of /cvsroot/happydoc/HappyDoc/happydoclib/formatter
In directory usw-pr-cvs1:/tmp/cvs-serv28573/happydoclib/formatter

Modified Files:
	fileformatterbase.py 
Log Message:
Added trace.
Do not add path separator prefix to a filename if the file already
begins with the path separator or current directory indicator.


Index: fileformatterbase.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/formatter/fileformatterbase.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** fileformatterbase.py	10 Feb 2002 13:07:00 -0000	1.8
--- fileformatterbase.py	4 Aug 2002 12:06:06 -0000	1.9
***************
*** 222,226 ****
              output_subdir = happydoclib.path.removePrefix(docset_base_directory, output_base)
              happydoclib.TRACE.writeVar(output_subdir=output_subdir)
!             if os.name != 'nt':
                  happydoclib.TRACE.write('adding prefix for os %s' % os.name)
                  output_subdir = '%s%s' % (os.sep, output_subdir)
--- 222,232 ----
              output_subdir = happydoclib.path.removePrefix(docset_base_directory, output_base)
              happydoclib.TRACE.writeVar(output_subdir=output_subdir)
!             if ( (os.name != 'nt')
!                  and
!                  (output_subdir[0] not in (os.sep,
!                                            os.curdir,
!                                            )
!                   )
!                  ):
                  happydoclib.TRACE.write('adding prefix for os %s' % os.name)
                  output_subdir = '%s%s' % (os.sep, output_subdir)
***************
*** 246,250 ****
              # Subnode of docset
              #
!             file_name = self.getOutputNameForObject(infoObject)
              happydoclib.TRACE.writeVar(file_name=file_name)
              name = happydoclib.path.join(output_base, file_name)
--- 252,257 ----
              # Subnode of docset
              #
!             #file_name = self.getOutputNameForObject(infoObject)
!             file_name = obj_output_name
              happydoclib.TRACE.writeVar(file_name=file_name)
              name = happydoclib.path.join(output_base, file_name)