[Freevo-cvslog] freevo/src/www html_util.py,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/freevo/freevo/src/www
In directory sc8-pr-cvs1:/tmp/cvs-serv31806

Modified Files:
	html_util.py 
Log Message:
Bugfix, the output fp was not set to sys.stdout at the time of the call, instead it used the value at startup time. sys.stdout is re-routed dynamically by the internal python webserver after the client connects.

Index: html_util.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/html_util.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** html_util.py	27 Feb 2003 02:04:33 -0000	1.5
--- html_util.py	28 Feb 2003 17:55:05 -0000	1.6
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.6  2003/02/28 17:55:05  krister
+ # Bugfix, the output fp was not set to sys.stdout at the time of the call, instead it used the value at startup time. sys.stdout is re-routed dynamically by the internal python webserver after the client connects.
+ #
  # Revision 1.5  2003/02/27 02:04:33  rshortt
  # Committed some code by Michael Ruelle which adds highlighting and file
***************
*** 60,69 ****
  
  
! def printContentType(type="text/html", fp=sys.stdout):
      if cgiIsCaller():
!         fp.write('Content-type:'+type+'\n\n\n')
  
  
! def printHeader(title="unknown page", style=None, script=None, fp=sys.stdout):
      fp.write('<html><head>\n')
      fp.write('<title>'+title+'</title>\n')
--- 63,76 ----
  
  
! def printContentType(content_type="text/html", fp=None):
!     if not fp:
!         fp = sys.stdout
      if cgiIsCaller():
!         fp.write('Content-type: %s\n\n' % content_type)
  
  
! def printHeader(title="unknown page", style=None, script=None, fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write('<html><head>\n')
      fp.write('<title>'+title+'</title>\n')
***************
*** 77,97 ****
  
  
! def tableOpen(opts="", fp=sys.stdout):
      fp.write("<table "+opts+">\n")
  
  
! def tableClose(fp=sys.stdout):
      fp.write("</table>\n")
  
  
! def tableRowOpen(opts="", fp=sys.stdout):
      fp.write("  <tr "+opts+">\n")
  
  
! def tableRowClose(fp=sys.stdout):
      fp.write("  </tr>\n")
  
  
! def tableCell(data="", opts="", fp=sys.stdout):
      fp.write("    <td "+opts+">"+data+"</td>\n")
  
--- 84,114 ----
  
  
! def tableOpen(opts="", fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("<table "+opts+">\n")
  
  
! def tableClose(fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("</table>\n")
  
  
! def tableRowOpen(opts="", fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("  <tr "+opts+">\n")
  
  
! def tableRowClose(fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("  </tr>\n")
  
  
! def tableCell(data="", opts="", fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("    <td "+opts+">"+data+"</td>\n")
  
***************
*** 109,118 ****
  
  
! def printFooter(fp=sys.stdout):
      fp.write('<hr>\n')
      fp.write("</body></html>\n")
  
  
! def printSearchForm(fp=sys.stdout):
      fp.write("""
  <form name="SearchForm" action="search.cgi" METHOD="GET">
--- 126,139 ----
  
  
! def printFooter(fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write('<hr>\n')
      fp.write("</body></html>\n")
  
  
! def printSearchForm(fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("""
  <form name="SearchForm" action="search.cgi" METHOD="GET">
***************
*** 127,131 ****
  
  
! def printLinks(fp=sys.stdout):
      fp.write("""
  <center>
--- 148,154 ----
  
  
! def printLinks(fp=None):
!     if not fp:
!         fp = sys.stdout
      fp.write("""
  <center>