You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2010/07/12 20:12:16 UTC

svn commit: r963411 [4/4] - in /tcl/rivet/branches/2_0: ./ doc/ doc/html/ doc/xml/ rivet/ rivet/packages/calendar/ rivet/packages/commserver/ rivet/packages/dio/ rivet/packages/form/ rivet/packages/session/ rivet/packages/tclrivet/ src/apache-2/

Modified: tcl/rivet/branches/2_0/doc/html/session_package.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/session_package.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/session_package.html (original)
+++ tcl/rivet/branches/2_0/doc/html/session_package.html Mon Jul 12 18:12:14 2010
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Session Package</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="index.html" title="Apache Rivet"><link rel="prev" href="diodisplay_package.html" title="DIODisplay"><link rel="next" href="help.html" title="Resources - How to Get Help"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Session Package</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="diodisplay_package.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="help.html"><img src="images/next.png" alt="Next"></a></td></tr><
 /table></div><div class="section" title="Session Package"><div class="titlepage"><div><div><hr><h2 class="title" style="clear: both"><a name="session_package"></a>Session Package</h2></div></div></div><div class="section" title="Introduction"><div class="titlepage"><div><div><h3 class="title"><a name="id3002697"></a>Introduction</h3></div></div></div><p style="width:90%">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Session Package</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="index.html" title="Apache Rivet"><link rel="prev" href="diodisplay_package.html" title="DIODisplay"><link rel="next" href="form.html" title="Form: An HTML Form Fields Generation Utility"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Session Package</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="diodisplay_package.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="form.html"><img src="images/next.png" alt="Next
 "></a></td></tr></table></div><div class="section" title="Session Package"><div class="titlepage"><div><div><hr><h2 class="title" style="clear: both"><a name="session_package"></a>Session Package</h2></div></div></div><div class="section" title="Introduction"><div class="titlepage"><div><div><h3 class="title"><a name="id597083"></a>Introduction</h3></div></div></div><p style="width:90%">
 	This is session management code.  It provides an interface
 	to allow you to generate and track a browser's visit as a
 	"session", giving you a unique session ID and an interface
@@ -25,7 +25,7 @@
 	  All DB interfacing is done through DIO, though, so it
 	  should be relatively easy to add support for other
 	  databases.
-	</p></div><div class="section" title="Preparing To Use It"><div class="titlepage"><div><div><h3 class="title"><a name="id3002712"></a>Preparing To Use It</h3></div></div></div><p style="width:90%">Create the tables in your SQL server.  With Postgres,
+	</p></div><div class="section" title="Preparing To Use It"><div class="titlepage"><div><div><h3 class="title"><a name="id597418"></a>Preparing To Use It</h3></div></div></div><p style="width:90%">Create the tables in your SQL server.  With Postgres,
 	  do a <span style="font-family:monospace"><span class="command"><strong>psql www</strong></span></span> or whatever DB you
 	  connect as, then a backslash-i on
 	  <code class="filename">session-create.sql</code></p><p style="width:90%">(If you need to delete the tables, use <code class="filename">session-drop.sql</code>)</p><p style="width:90%">The session code by default requires a DIO handle
@@ -33,7 +33,7 @@
 	  overridden).  We get it by doing a</p><pre style="background:#ccc; margin: 2ex; margin-right: 10%;       padding: 1ex; border: dashed black 1px ; white-space: pre;      font-family: monospace; font-size: 90%;" class="programlisting">
 	      RivetServerConf ChildInitScript "package require DIO"
 	      RivetServerConf ChildInitScript "::DIO::handle Postgresql DIO -user www"
-	    </pre></div><div class="section" title="Example Usage"><div class="titlepage"><div><div><h3 class="title"><a name="id3002761"></a>Example Usage</h3></div></div></div><p style="width:90%">In your httpd.conf, add:</p><pre style="background:#ccc; margin: 2ex; margin-right: 10%;       padding: 1ex; border: dashed black 1px ; white-space: pre;      font-family: monospace; font-size: 90%;" class="programlisting">RivetServerConf ChildInitScript "package require Session; Session SESSION"</pre><p style="width:90%">
+	    </pre></div><div class="section" title="Example Usage"><div class="titlepage"><div><div><h3 class="title"><a name="id597464"></a>Example Usage</h3></div></div></div><p style="width:90%">In your httpd.conf, add:</p><pre style="background:#ccc; margin: 2ex; margin-right: 10%;       padding: 1ex; border: dashed black 1px ; white-space: pre;      font-family: monospace; font-size: 90%;" class="programlisting">RivetServerConf ChildInitScript "package require Session; Session SESSION"</pre><p style="width:90%">
 	  This tells Rivet you want to create a session object named
 	  SESSION in every child process Apache creates.</p><p style="width:90%">
 	  You can configure the session at this point using numerous
@@ -54,7 +54,7 @@
 	  additional requests are received during the session, all
 	  under the control of the key-value pairs controlling the
 	  session object.
-	</p></div><div class="section" title="Using Sessions From Your Code"><div class="titlepage"><div><div><h3 class="title"><a name="id3002827"></a>Using Sessions From Your Code</h3></div></div></div><p style="width:90%">The main methods your code will use are:</p><div class="variablelist"><dl><dt></dt><dd><div style="padding:4 ; margin-top:3 ;  margin-bottom:3 ; width:75%"><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">SESSION</span> <span style="font-weight:bold ; font-family:monospace">id</span> </div></div><div style="margin-bottom:1.5ex ; padding .5ex">
+	</p></div><div class="section" title="Using Sessions From Your Code"><div class="titlepage"><div><div><h3 class="title"><a name="id597520"></a>Using Sessions From Your Code</h3></div></div></div><p style="width:90%">The main methods your code will use are:</p><div class="variablelist"><dl><dt></dt><dd><div style="padding:4 ; margin-top:3 ;  margin-bottom:3 ; width:75%"><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">SESSION</span> <span style="font-weight:bold ; font-family:monospace">id</span> </div></div><div style="margin-bottom:1.5ex ; padding .5ex">
 		After doing a <span style="font-family:monospace"><span class="command"><strong>SESSION activate</strong></span></span>,
 		this will return a 32-byte ASCII-encoded random
 		hexadecimal string.  Every time this browser comes
@@ -81,7 +81,7 @@
 		none was set.  (Status is set to the DIO error that
 		occurred, it can be fetched using the status
 		method.)
-	      </div></div></dd></dl></div></div><div class="section" title="Session Configuration Options"><div class="titlepage"><div><div><h3 class="title"><a name="id3003035"></a>Session Configuration Options</h3></div></div></div><p style="width:90%">The following key-value pairs can be specified when a
+	      </div></div></dd></dl></div></div><div class="section" title="Session Configuration Options"><div class="titlepage"><div><div><h3 class="title"><a name="id597717"></a>Session Configuration Options</h3></div></div></div><p style="width:90%">The following key-value pairs can be specified when a
 	  session object (like SESSION above) is created:</p><div class="variablelist"><dl><dt><span class="term">sessionLifetime</span></dt><dd><div style="padding:4 ; margin-top:3 ;  margin-bottom:3 ; width:75%"><div style="margin-bottom:1.5ex ; padding .5ex">how many seconds the session will live for.
 		7200 == 2 hours
 	      </div></div></dd><dt><span class="term">sessionRefreshInterval</span></dt><dd><div style="padding:4 ; margin-top:3 ;  margin-bottom:3 ; width:75%"><div style="margin-bottom:1.5ex ; padding .5ex">
@@ -134,7 +134,7 @@
 		file handle that debugging messages will be written
 		to (default
 		<code class="varname">stdout</code>)
-	      </div></div></dd></dl></div></div><div class="section" title="Session Methods"><div class="titlepage"><div><div><h3 class="title"><a name="id3003284"></a>Session Methods</h3></div></div></div><p style="width:90%">
+	      </div></div></dd></dl></div></div><div class="section" title="Session Methods"><div class="titlepage"><div><div><h3 class="title"><a name="id597945"></a>Session Methods</h3></div></div></div><p style="width:90%">
 	  The following methods can be invoked to find out
 	  information about the current session, store and fetch
 	  server data identified with this session, etc:
@@ -173,7 +173,7 @@
 		If they don't have one or it isn't valid (timed out,
 		etc), create a session and drop a cookie on
 		them.
-	      </div></div></dd></dl></div></div><div class="section" title="Getting Additional Randomness From The Entropy File"><div class="titlepage"><div><div><h3 class="title"><a name="id3003524"></a>Getting Additional Randomness From The Entropy File</h3></div></div></div><pre style="background:#ccc; margin: 2ex; margin-right: 10%;       padding: 1ex; border: dashed black 1px ; white-space: pre;      font-family: monospace; font-size: 90%;" class="programlisting">RivetServerConf ChildInitScript "Session SESSION -entropyFile /dev/urandom \
+	      </div></div></dd></dl></div></div><div class="section" title="Getting Additional Randomness From The Entropy File"><div class="titlepage"><div><div><h3 class="title"><a name="id598171"></a>Getting Additional Randomness From The Entropy File</h3></div></div></div><pre style="background:#ccc; margin: 2ex; margin-right: 10%;       padding: 1ex; border: dashed black 1px ; white-space: pre;      font-family: monospace; font-size: 90%;" class="programlisting">RivetServerConf ChildInitScript "Session SESSION -entropyFile /dev/urandom \
   -entropyLength 10 -debugMode 1"</pre><p style="width:90%">
 	  This options say we want to get randomness from an entropy
 	  file (random data pseudo-device) of /dev/urandom, to get ten
@@ -181,4 +181,4 @@
 	  on debug mode, which will cause the SESSION object to output
 	  all manner of debugging information as it does stuff.  This
 	  has been tested on FreeBSD and appears to work.
-      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="diodisplay_package.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="help.html"><img src="images/next.png" alt="Next"></a></td></tr><tr><td width="40%" align="left" valign="top">DIODisplay </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> Resources - How to Get Help</td></tr></table></div></body></html>
+      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="diodisplay_package.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="form.html"><img src="images/next.png" alt="Next"></a></td></tr><tr><td width="40%" align="left" valign="top">DIODisplay </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> Form: An HTML Form Fields Generation Utility</td></tr></table></div></body></html>

Modified: tcl/rivet/branches/2_0/doc/html/tcl_packages.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/tcl_packages.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/tcl_packages.html (original)
+++ tcl/rivet/branches/2_0/doc/html/tcl_packages.html Mon Jul 12 18:12:14 2010
@@ -1,7 +1,11 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Rivet Tcl Packages</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="index.html" title="Apache Rivet"><link rel="prev" href="examples.html" title="Examples and Usage"><link rel="next" href="dio.html" title="DIO - Database Interface Objects"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Rivet Tcl Packages</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="examples.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="dio.html"><img src="images/next.png" alt="Next"></a></td></tr></ta
 ble></div><div class="section" title="Rivet Tcl Packages"><div class="titlepage"><div><div><hr><h2 class="title" style="clear: both"><a name="tcl_packages"></a>Rivet Tcl Packages</h2></div></div></div><p style="width:90%">
       In addition to the core Apache module, Rivet provides a number
       of Tcl packages that include potentially useful code.
-    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">commserver is a package providing a server that can be
-	used for IPC.  Still experimental.  Requires the comm package
-	from tcllib.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">dio is a database abstraction layer.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">dtcl is a compatibility package for mod_dtcl
-	applications.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">form - for creating forms.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">rivet - some additional, useful routines.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">tclrivet</div></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="examples.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="dio.html"><img src="images/next.png" alt="Next"></a></td></tr><tr><td width="40%" align="left" valign="top">Examples and Usage </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> DIO - Database Interface Objects</td></tr></table></d
 iv></body></html>
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">
+				commserver is a package providing a server that can be
+				used for IPC.  Still experimental.  Requires the comm package
+				from tcllib.
+			</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">dio is a database abstraction layer.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">
+				dtcl is a compatibility package for mod_dtcl
+				applications.
+			</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">form - for creating forms.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">rivet - some additional, useful routines.</div></li><li class="listitem"><div style="margin-bottom:1.5ex ; padding .5ex">tclrivet</div></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="examples.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="dio.html"><img src="images/next.png" alt="Next"></a></td></tr><tr><td width="40%" align="left" valign="top">Examples and Usage </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> DIO - Database Interface Objects</td></tr></table></div></body><
 /html>

Modified: tcl/rivet/branches/2_0/doc/html/unescape_string.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/unescape_string.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/unescape_string.html (original)
+++ tcl/rivet/branches/2_0/doc/html/unescape_string.html Mon Jul 12 18:12:14 2010
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>unescape_string</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="escape_shell_command.html" title="escape_shell_command"><link rel="next" href="apache_log_error.html" title="apache_log_error"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">unescape_string</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="escape_shell_command.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" hr
 ef="apache_log_error.html"><img src="images/next.png" alt="Next"></a></td></tr></table></div><div class="refentry" title="unescape_string"><div class="refentry.separator"><hr></div><a name="unescape_string"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>unescape_string &#8212; unescape escaped characters in a string.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">unescape_string</span>  ?<span style="font-family:monospace; font-weight: bold;">string</span>?</div></div></div><div class="refsect1" title="Description"><a name="id2985747"></a><h2>Description</h2><p style="width:90%">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>unescape_string</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="escape_shell_command.html" title="escape_shell_command"><link rel="next" href="apache_log_error.html" title="apache_log_error"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">unescape_string</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="escape_shell_command.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" hr
 ef="apache_log_error.html"><img src="images/next.png" alt="Next"></a></td></tr></table></div><div class="refentry" title="unescape_string"><div class="refentry.separator"><hr></div><a name="unescape_string"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>unescape_string &#8212; unescape escaped characters in a string.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">unescape_string</span>  ?<span style="font-family:monospace; font-weight: bold;">string</span>?</div></div></div><div class="refsect1" title="Description"><a name="id581284"></a><h2>Description</h2><p style="width:90%">
 	  Scans through each character in the specified string looking
 	  for escaped character sequences (characters containing a
 	  percent sign and two hexadecimal characters, unescaping them 

Modified: tcl/rivet/branches/2_0/doc/html/upgrading.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/upgrading.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/upgrading.html (original)
+++ tcl/rivet/branches/2_0/doc/html/upgrading.html Mon Jul 12 18:12:14 2010
@@ -5,8 +5,8 @@
       compatibility was not a primary goal when creating Rivet, but we
       do provide this information which may be of use to those wishing
       to upgrade from mod_dtcl or NWS installations.
-    </p><div class="section" title="mod_dtcl"><div class="titlepage"><div><div><h3 class="title"><a name="id3004523"></a>mod_dtcl</h3></div></div></div><p style="width:90%">
+    </p><div class="section" title="mod_dtcl"><div class="titlepage"><div><div><h3 class="title"><a name="id606532"></a>mod_dtcl</h3></div></div></div><p style="width:90%">
 	Rivet was originally based on the dtcl code, but it has
 	changed (improved!) quite a bit.  The concepts remain the
 	same, but many of the commands have changed.
-      </p></div><div class="section" title="NeoWebScript"><div class="titlepage"><div><div><h3 class="title"><a name="id3004339"></a>NeoWebScript</h3></div></div></div><p style="width:90%">TODO</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="internals.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Rivet Internals </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
+      </p></div><div class="section" title="NeoWebScript"><div class="titlepage"><div><div><h3 class="title"><a name="id606544"></a>NeoWebScript</h3></div></div></div><p style="width:90%">TODO</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="internals.html"><img src="images/prev.png" alt="Prev"></a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Rivet Internals </td><td width="20%" align="center"><a accesskey="h" href="index.html"><img src="images/home.png" alt="Home"></a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>

Modified: tcl/rivet/branches/2_0/doc/html/upload.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/upload.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/upload.html (original)
+++ tcl/rivet/branches/2_0/doc/html/upload.html Mon Jul 12 18:12:14 2010
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>upload</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="var.html" title="var"><link rel="next" href="load_response.html" title="load_response"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">upload</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="var.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" href="load_response.html"><img src="images/next.png" alt="Next"></a></td></tr
 ></table></div><div class="refentry" title="upload"><div class="refentry.separator"><hr></div><a name="upload"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>upload &#8212; handle a file uploaded by a client.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">upload</span>  (<span style="font-family:monospace; font-weight: bold;">channel</span> | <span style="font-family:monospace; font-weight: bold;">save</span> | <span style="font-family:monospace; font-weight: bold;">data</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">size</span> | <span style="font-family:monospace; font-weight: bold;">type</span> | <span style="font-family:monospace; font-w
 eight: bold;">filename</span>)</div></div></div><div class="refsect1" title="Description"><a name="id2983850"></a><h2>Description</h2><p style="width:90%">The upload command is for file upload manipulation.
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>upload</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="var.html" title="var"><link rel="next" href="load_response.html" title="load_response"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">upload</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="var.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" href="load_response.html"><img src="images/next.png" alt="Next"></a></td></tr
 ></table></div><div class="refentry" title="upload"><div class="refentry.separator"><hr></div><a name="upload"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>upload &#8212; handle a file uploaded by a client.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">upload</span>  (<span style="font-family:monospace; font-weight: bold;">channel</span> | <span style="font-family:monospace; font-weight: bold;">save</span> | <span style="font-family:monospace; font-weight: bold;">data</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">size</span> | <span style="font-family:monospace; font-weight: bold;">type</span> | <span style="font-family:monospace; font-w
 eight: bold;">filename</span>)</div></div></div><div class="refsect1" title="Description"><a name="id579453"></a><h2>Description</h2><p style="width:90%">The upload command is for file upload manipulation.
 	  See the relevant Apache Directives to further configure the
 	  behavior of this Rivet feature.
 	</p><div class="variablelist"><dl><dt><span class="term">

Modified: tcl/rivet/branches/2_0/doc/html/var.html
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/html/var.html?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/html/var.html (original)
+++ tcl/rivet/branches/2_0/doc/html/var.html Mon Jul 12 18:12:14 2010
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>var</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="next" href="upload.html" title="upload"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">var</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="commands.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" href="upload.html"><img src="images/next.png" alt="Next"><
 /a></td></tr></table></div><div class="refentry" title="var"><a name="var"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>var, var_qs, var_post &#8212; get the value of a form variable.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-weight: bold;">all</span>)</div></div><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-
 spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var_qs</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-weight: bold;">all</span>)</div></div><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var_post</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-
 weight: bold;">all</span>)</div></div></div><div class="refsect1" title="Description"><a name="id2983500"></a><h2>Description</h2><p style="width:90%">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>var</title><link rel="stylesheet" href="rivet.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Apache Rivet"><link rel="up" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="prev" href="commands.html" title="Rivet Tcl Commands and Variables"><link rel="next" href="upload.html" title="upload"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">var</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="commands.html"><img src="images/prev.png" alt="Prev"></a> </td><th width="60%" align="center">Rivet Tcl Commands and Variables</th><td width="20%" align="right"> <a accesskey="n" href="upload.html"><img src="images/next.png" alt="Next"><
 /a></td></tr></table></div><div class="refentry" title="var"><a name="var"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>var, var_qs, var_post &#8212; get the value of a form variable.</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-weight: bold;">all</span>)</div></div><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-
 spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var_qs</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-weight: bold;">all</span>)</div></div><div class="cmdsynopsis" style="width:80%"><div style="background:#ccccff ; margin:1ex ; padding:.4ex; padding-left: 0.8ex;   word-spacing:1ex "><span style="font-weight:bold ; font-family:monospace">var_post</span>  (<span style="font-family:monospace; font-weight: bold;">get</span> | <span style="font-family:monospace; font-weight: bold;">list</span> | <span style="font-family:monospace; font-weight: bold;">exists</span> | <span style="font-family:monospace; font-weight: bold;">number</span> | <span style="font-family:monospace; font-
 weight: bold;">all</span>)</div></div></div><div class="refsect1" title="Description"><a name="id579115"></a><h2>Description</h2><p style="width:90%">
 	  The <span style="font-family:monospace"><span class="command"><strong>var</strong></span></span> command retrieves information
 	  about GET or POST variables sent to the script via client
 	  request.  It treats both GET and POST variables the same,

Modified: tcl/rivet/branches/2_0/doc/rivet.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/rivet.xml?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/rivet.xml (original)
+++ tcl/rivet/branches/2_0/doc/rivet.xml Mon Jul 12 18:12:14 2010
@@ -2,27 +2,28 @@
 
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
   "http://www.oasis-open.org/committees/docbook/xml/4.1.2/docbookx.dtd" [
-    <!ENTITY hello.rvt		    SYSTEM  "examples/hello.rvt" >
-    <!ENTITY table.rvt		    SYSTEM  "examples/table.rvt" >
-    <!ENTITY vars.html		    SYSTEM  "examples/vars.html" >
-    <!ENTITY vars.rvt		    SYSTEM  "examples/vars.rvt" >
-    <!ENTITY upload.html	    SYSTEM  "examples/upload.html" >
-    <!ENTITY upload.rvt		    SYSTEM  "examples/upload.rvt" >
-    <!ENTITY download.tcl	    SYSTEM  "examples/download.tcl" >
-    <!ENTITY rivet_web_service.tcl  SYSTEM  "examples/rivet_web_service.tcl" >
-
-    <!ENTITY intro.xml		    SYSTEM  "xml/intro.xml" >
-    <!ENTITY install.xml	    SYSTEM  "xml/install.xml" >
-    <!ENTITY directives.xml	    SYSTEM  "xml/directives.xml" >
-    <!ENTITY commands.xml	    SYSTEM  "xml/commands.xml" >
-    <!ENTITY examples.xml	    SYSTEM  "xml/examples.xml" >
-    <!ENTITY packages.xml	    SYSTEM  "xml/packages.xml" >
-    <!ENTITY dio.xml		    SYSTEM  "xml/dio.xml" >
-    <!ENTITY diodisplay.xml	    SYSTEM  "xml/diodisplay.xml" >
-    <!ENTITY session.xml	    SYSTEM  "xml/session.xml" >
-    <!ENTITY help.xml		    SYSTEM  "xml/help.xml" >
-    <!ENTITY internals.xml	    SYSTEM  "xml/internals.xml" >
-    <!ENTITY upgrade.xml	    SYSTEM  "xml/upgrade.xml" >
+    <!ENTITY hello.rvt		   SYSTEM	"examples/hello.rvt" >
+    <!ENTITY table.rvt		   SYSTEM  	"examples/table.rvt" >
+    <!ENTITY vars.html		   SYSTEM  	"examples/vars.html" >
+    <!ENTITY vars.rvt		   SYSTEM	"examples/vars.rvt" >
+    <!ENTITY upload.html	   SYSTEM	"examples/upload.html" >
+    <!ENTITY upload.rvt		   SYSTEM	"examples/upload.rvt" >
+    <!ENTITY download.tcl	   SYSTEM	"examples/download.tcl" >
+    <!ENTITY rivet_web_service.tcl  SYSTEM  	"examples/rivet_web_service.tcl" >
+    <!ENTITY intro.xml		    SYSTEM  	"xml/intro.xml" >
+    <!ENTITY install.xml	    SYSTEM  	"xml/install.xml" >
+    <!ENTITY directives.xml	    SYSTEM  	"xml/directives.xml" >
+    <!ENTITY commands.xml	    SYSTEM  	"xml/commands.xml" >
+    <!ENTITY examples.xml	    SYSTEM  	"xml/examples.xml" >
+    <!ENTITY packages.xml	    SYSTEM  	"xml/packages.xml" >
+    <!ENTITY dio.xml		    SYSTEM  	"xml/dio.xml" >
+    <!ENTITY diodisplay.xml	    SYSTEM  	"xml/diodisplay.xml" >
+    <!ENTITY session.xml	    SYSTEM  	"xml/session.xml" >
+    <!ENTITY form.xml		    SYSTEM  	"xml/form.xml" >
+    <!ENTITY calendar.xml	    SYSTEM  	"xml/calendar.xml" >
+    <!ENTITY help.xml		    SYSTEM  	"xml/help.xml" >
+    <!ENTITY internals.xml	    SYSTEM  	"xml/internals.xml" >
+    <!ENTITY upgrade.xml	    SYSTEM  	"xml/upgrade.xml" >
 ]>
 
 <!--
@@ -68,6 +69,7 @@
       </affiliation>
     </author>
   </articleinfo>
+
   <!--para>
     This document is also available in the following languages: 
     <ulink url="index.it.html">Italian</ulink>, 
@@ -79,39 +81,45 @@
   </para>
 
     <!-- Introduction -->
-    &intro.xml;
+   &intro.xml;
 
     <!-- Installation -->
-    &install.xml;
+   &install.xml;
     
     <!-- Directives -->
-    &directives.xml;
+   &directives.xml;
 
     <!-- Commands -->
-    &commands.xml;
+   &commands.xml;
 
     <!-- Examples -->
-    &examples.xml;
+   &examples.xml;
 
     <!-- Packages -->
-    &packages.xml;
+   &packages.xml;
 
     <!-- Database I/O -->
-    &dio.xml;
+   &dio.xml;
 
     <!-- Database I/O Display -->
-    &diodisplay.xml;
+   &diodisplay.xml;
 
     <!-- Sessions -->
-    &session.xml;
+   &session.xml;
+
+	<!-- Form -->
+	&form.xml;
+
+	<!-- Calendar -->
+	 &calendar.xml;
 
     <!-- Help -->
     &help.xml;
 
-    <!-- Internals -->
-    &internals.xml;
+   <!-- Internals -->
+   &internals.xml;
 
-    <!-- Upgrade -->
-    &upgrade.xml;
+   <!-- Upgrade -->
+   &upgrade.xml;
 
 </article>

Modified: tcl/rivet/branches/2_0/doc/rivet.xsl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/rivet.xsl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/rivet.xsl (original)
+++ tcl/rivet/branches/2_0/doc/rivet.xsl Mon Jul 12 18:12:14 2010
@@ -156,6 +156,34 @@
     </div>
   </xsl:template>
 
+<!-- refsect3 -->
+  <xsl:template match="refsect3/title">
+      <div style="padding:4 ; margin-top:3 ; margin-left: 5%;">
+			<xsl:apply-templates />
+		</div>
+  </xsl:template>
+
+  <xsl:template match="refsect3/variablelist/varlistentry">
+    <dt>
+      <xsl:call-template name="anchor"/>
+      <xsl:apply-templates select="term"/>
+    </dt>
+    <dd>
+      <div style="padding:4 ; margin-top:3 ; margin-left: 5%;
+	margin-bottom:3 ; width:70%;" >
+	<xsl:apply-templates select="listitem"/>
+      </div>
+    </dd>
+  </xsl:template>
+
+<!--  -->
+
+  <xsl:template match="listitem/para">
+    <div style="margin-bottom:1.5ex ; padding .5ex">
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
   <xsl:template match="arg">
     <xsl:variable name="choice" select="@choice"/>
     <xsl:variable name="rep" select="@rep"/>

Modified: tcl/rivet/branches/2_0/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/xml/commands.xml?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/xml/commands.xml (original)
+++ tcl/rivet/branches/2_0/doc/xml/commands.xml Mon Jul 12 18:12:14 2010
@@ -340,40 +340,42 @@
       </refsynopsisdiv>
 
       <refsect1>
-	<title>Description</title>
-	Load any form variables passed to this page into an
-	array. If <command>load_response</command> is called without 
-	arguments the array <option>response</option> is created in 
-	the scope of the caller. If the variables var1,var2,var3...
-	having values val1,val2,val3... are passed to the page, the
-	resulting array will be a collection mapping var1,var2,var3...
-	to their corresponding values. <command>load_response</command>
-	was inspired by the same NeoWebScript procedure in the way
-	it deals with multiple assignments: if a variable 
-	is assigned more than once the corresponding array element will be a 
-	list of the values for the variable. This can be useful in the case 
-	of forms with checkbox options that are given the same name.
-	Calling <command>load_response</command> several times for the same
-	array results in adding more values to the array at every call. 
-	When needed it is left to the caller to empty the array between 
-	two subsequent calls.  
+			<title>Description</title>
+			<para>
+				Load any form variables passed to this page into an
+				array. If <command>load_response</command> is called without 
+				arguments the array <option>response</option> is created in 
+				the scope of the caller. If the variables var1,var2,var3...
+				having values val1,val2,val3... are passed to the page, the
+				resulting array will be a collection mapping var1,var2,var3...
+				to their corresponding values. <command>load_response</command>
+				was inspired by the same NeoWebScript procedure in the way
+				it deals with multiple assignments: if a variable 
+				is assigned more than once the corresponding array element will be a 
+				list of the values for the variable. This can be useful in the case 
+				of forms with checkbox options that are given the same name.
+				Calling <command>load_response</command> several times for the same
+				array results in adding more values to the array at every call. 
+				When needed it is left to the caller to empty the array between 
+				two subsequent calls.  
+			</para>
       </refsect1>
     </refentry>
 
     <refentry id="load_headers">
       <refnamediv>
-	<refname>load_headers</refname>
-	<refpurpose>get client request's headers.</refpurpose>
+			<refname>load_headers</refname>
+			<refpurpose>get client request's headers.</refpurpose>
       </refnamediv>
 
       <refsynopsisdiv>
-	<cmdsynopsis>
-	  <command>load_headers</command>
-	  <arg><replaceable>array_name</replaceable></arg>
-	</cmdsynopsis>
+			<cmdsynopsis>
+			  <command>load_headers</command>
+			  <arg><replaceable>array_name</replaceable></arg>
+			</cmdsynopsis>
       </refsynopsisdiv>
 
-      <refsect1>
+	<refsect1>
 	<title>Description</title>
 	<para>
 	  Load the headers that come from a client request into the
@@ -825,8 +827,8 @@
 
     <refentry id="escape_string">
       <refnamediv>
-	<refname>escape_string</refname>
-	<refpurpose>convert a string into escaped characters.</refpurpose>
+			<refname>escape_string</refname>
+			<refpurpose>convert a string into escaped characters.</refpurpose>
       </refnamediv>
 
       <refsynopsisdiv>

Modified: tcl/rivet/branches/2_0/doc/xml/dio.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/xml/dio.xml?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/xml/dio.xml (original)
+++ tcl/rivet/branches/2_0/doc/xml/dio.xml Mon Jul 12 18:12:14 2010
@@ -6,21 +6,21 @@
 	<refpurpose>Database Interface Objects</refpurpose>
       </refnamediv>
 
-      <refsynopsisdiv>
-	<cmdsynopsis>
-	  <command>::DIO::handle</command>
-	  <arg choice="plain"><replaceable>interface</replaceable></arg>
-	  <arg choice="opt"><replaceable>objectName</replaceable></arg>
-	  <group choice="opt">
-	    <arg>-option</arg>
-	    <arg><replaceable>option</replaceable></arg>
-	    <arg>-option</arg>
-	    <arg><replaceable>option</replaceable></arg>
-	    <arg>...</arg>
-	  </group>
-	</cmdsynopsis>
-      </refsynopsisdiv>
-      <refsect1>
+   <refsynopsisdiv>
+		<cmdsynopsis>
+		  <command>::DIO::handle</command>
+		  <arg choice="plain"><replaceable>interface</replaceable></arg>
+		  <arg choice="opt"><replaceable>objectName</replaceable></arg>
+		  <group choice="opt">
+		    <arg>-option</arg>
+		    <arg><replaceable>option</replaceable></arg>
+		    <arg>-option</arg>
+		    <arg><replaceable>option</replaceable></arg>
+		    <arg>...</arg>
+		  </group>
+		</cmdsynopsis>
+   </refsynopsisdiv>
+   <refsect1>
 	<title>Description</title>
 	<para>
 	  <command>DIO</command> is designed to be a generic,

Modified: tcl/rivet/branches/2_0/doc/xml/examples.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/xml/examples.xml?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/xml/examples.xml (original)
+++ tcl/rivet/branches/2_0/doc/xml/examples.xml Mon Jul 12 18:12:14 2010
@@ -4,8 +4,8 @@
       Some examples of Rivet usage follow.  Some prior Tcl knowledge
       is assumed.  If you don't know much Tcl, don't worry, it's easy,
       and there are some good resources available on the web that will
-      get you up to speed quickly.  Go to the <link
-	linkend="websites">web sites</link> section and have a look.
+      get you up to speed quickly.  Go to the 
+      <link linkend="websites">web sites</link> section and have a look.
     </para>
 
     <example id="hello world">

Modified: tcl/rivet/branches/2_0/doc/xml/packages.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/xml/packages.xml?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/xml/packages.xml (original)
+++ tcl/rivet/branches/2_0/doc/xml/packages.xml Mon Jul 12 18:12:14 2010
@@ -7,30 +7,34 @@
     <itemizedlist>
 
       <listitem>
-	<para>commserver is a package providing a server that can be
-	used for IPC.  Still experimental.  Requires the comm package
-	from tcllib.</para>
+			<para>
+				commserver is a package providing a server that can be
+				used for IPC.  Still experimental.  Requires the comm package
+				from tcllib.
+			</para>
       </listitem>
 
       <listitem>
-	<para>dio is a database abstraction layer.</para>
+			<para>dio is a database abstraction layer.</para>
       </listitem>
 
       <listitem>
-	<para>dtcl is a compatibility package for mod_dtcl
-	applications.</para>
+			<para>
+				dtcl is a compatibility package for mod_dtcl
+				applications.
+			</para>
       </listitem>
 
       <listitem>
-	<para>form - for creating forms.</para>
+	   	<para>form - for creating forms.</para>
       </listitem>
 
       <listitem>
-	<para>rivet - some additional, useful routines.</para>
+			<para>rivet - some additional, useful routines.</para>
       </listitem>
 
       <listitem>
-	<para>tclrivet</para>
+			<para>tclrivet</para>
       </listitem>
     </itemizedlist>
   </section>

Modified: tcl/rivet/branches/2_0/rivet/packages/commserver/server.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/commserver/server.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/commserver/server.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/packages/commserver/server.tcl Mon Jul 12 18:12:14 2010
@@ -27,6 +27,8 @@
 
 package require comm
 
+if {![info exists argv]} { return }
+
 set Port [lindex $argv 0]
 if { [catch {
     comm::comm config -port $Port

Modified: tcl/rivet/branches/2_0/rivet/packages/dio/dio_Postgresql.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/dio/dio_Postgresql.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/dio/dio_Postgresql.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/packages/dio/dio_Postgresql.tcl Mon Jul 12 18:12:14 2010
@@ -138,7 +138,7 @@ namespace eval DIO {
 	    # did, put that in in place of numrows, hiding a postgresql
 	    # idiosyncracy from DIO
 	    if {$numrows == 0} {
-	        set cmdrows [pg_result $resultId -cmdTuples]
+	        set cmdrows [pg_result $resultid -cmdTuples]
 		if {$cmdrows != ""} {
 		    set numrows $cmdrows
 		}

Modified: tcl/rivet/branches/2_0/rivet/packages/form/form.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/form/form.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/form/form.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/packages/form/form.tcl Mon Jul 12 18:12:14 2010
@@ -102,7 +102,7 @@ package provide form 1.0
 	foreach {var val} $list {
 	    set var [string range [string tolower $var] 1 end]
 	    set data($var) $val
-	    if {$var == "values"} { continue }
+	    if {($var == "values") || ($var == "labels")} { continue }
 	    lappend return -$var $val
 	}
 	return $return
@@ -214,7 +214,7 @@ package provide form 1.0
 		# and it matches the value we have for it, make
 		# the field show up as selected (checked)
 		if {[info exists DefaultValues($name)]} {
-		    if {$data(value) == $DefaultValues($name)} {
+		    if {[lsearch $DefaultValues($name) $data(value)] >= 0} {			
 			append string { checked="checked"}
 		    }
 		}
@@ -223,7 +223,7 @@ package provide form 1.0
 	append string " />"
 
 	# ...and emit it
-	if {$type == "radio"} {
+	if {($type == "radio") || ($type == "checkbox")} {
 	    html $string$data(label)
 	} else {
 	    html $string
@@ -273,14 +273,14 @@ package provide form 1.0
     }
 
     #
-    # reset -- emit an HTML image field
+    #  image -- emit an HTML image field
     #
     method image {name args} {
 	eval field image $name $args
     }
 
     #
-    # reset -- emit an HTML "checkbox" form field
+    # checkbox -- emit an HTML "checkbox" form field
     #
     method checkbox {name args} {
 	eval field checkbox $name $args

Modified: tcl/rivet/branches/2_0/rivet/packages/session/session-create.sql
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/session/session-create.sql?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/session/session-create.sql (original)
+++ tcl/rivet/branches/2_0/rivet/packages/session/session-create.sql Mon Jul 12 18:12:14 2010
@@ -16,8 +16,8 @@ create table rivet_session(
 
 create table rivet_session_cache(
     session_id		varchar REFERENCES rivet_session(session_id) ON DELETE CASCADE,
-    package		varchar,
-    key                 varchar,
+    package_		varchar,
+    key_                varchar,
     data                varchar,
 
     UNIQUE( session_id, package, key )

Modified: tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl Mon Jul 12 18:12:14 2010
@@ -4,6 +4,8 @@
 
 # Parse a rivet file and execute it.
 
+if {![info exists argv]} { return }
+
 set auto_path "[file dirname [info script]] $auto_path"
 package require tclrivet
 
@@ -18,4 +20,4 @@ proc main {} {
     }
 }
 
-main
\ No newline at end of file
+main

Modified: tcl/rivet/branches/2_0/rivet/packages/tclrivet/tclrivet.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/packages/tclrivet/tclrivet.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/packages/tclrivet/tclrivet.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/packages/tclrivet/tclrivet.tcl Mon Jul 12 18:12:14 2010
@@ -18,7 +18,7 @@
 
 package provide tclrivet 0.1
 
-load [file join [file dirname [info script]] .. .. .. src \
+load [file join [file dirname [info script]] .. .. \
 	  librivetparser[info sharedlibextension]]
 
 proc include { filename } {

Modified: tcl/rivet/branches/2_0/rivet/pkgIndex.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/rivet/pkgIndex.tcl?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/rivet/pkgIndex.tcl (original)
+++ tcl/rivet/branches/2_0/rivet/pkgIndex.tcl Mon Jul 12 18:12:14 2010
@@ -14,7 +14,8 @@ package ifneeded Dtcl 1.0 [list source [
 package ifneeded RivetTcl 1.1 [list source [file join $dir init.tcl]]
 package ifneeded Session 1.0 [list source [file join $dir packages/session/session-class.tcl]]
 package ifneeded commserver 0.1 [list source [file join $dir packages/commserver/commserver.tcl]]
-package ifneeded dio_Mysql 0.1 [list source [file join $dir packages/dio/dio_Mysql.tcl]]
+package ifneeded dio_Mysql 0.2 [list source [file join $dir packages/dio/dio_Mysql.tcl]]
+package ifneeded dio_Oracle 0.1 [list source [file join $dir packages/dio/dio_Oracle.tcl]]
 package ifneeded dio_Postgresql 0.1 [list source [file join $dir packages/dio/dio_Postgresql.tcl]]
 package ifneeded dio_Sqlite 0.1 [list source [file join $dir packages/dio/dio_Sqlite.tcl]]
 package ifneeded form 1.0 [list source [file join $dir packages/form/form.tcl]]

Modified: tcl/rivet/branches/2_0/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/src/apache-2/mod_rivet.c?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/2_0/src/apache-2/mod_rivet.c Mon Jul 12 18:12:14 2010
@@ -58,9 +58,9 @@
 //module AP_MODULE_DECLARE_DATA rivet_module;
 
 /* This is used *only* in the PanicProc.  Otherwise, don't touch it! */
-static request_rec *rivet_panic_request_rec = NULL;
-static apr_pool_t *rivet_panic_pool = NULL;
-static server_rec *rivet_panic_server_rec = NULL;
+static request_rec  *rivet_panic_request_rec = NULL;
+static apr_pool_t   *rivet_panic_pool	     = NULL;
+static server_rec   *rivet_panic_server_rec  = NULL;
 
 /* Need some arbitrary non-NULL pointer which can't also be a request_rec */
 #define NESTED_INCLUDE_MAGIC	(&rivet_module)
@@ -233,9 +233,7 @@ Rivet_InitServerVariables( Tcl_Interp *i
             TCL_GLOBAL_ONLY);
     Tcl_DecrRefCount(obj);
 
-    //obj = Tcl_NewStringObj(ap_server_root_relative(p, ap_server_confname), -1);
-    //TODO: fix server conf name
-    obj = Tcl_NewStringObj ("serverconfname", -1);
+    obj = Tcl_NewStringObj(ap_server_root_relative(p,SERVER_CONFIG_FILE), -1);
     Tcl_IncrRefCount(obj);
     Tcl_SetVar2Ex(interp,
             "server",

Modified: tcl/rivet/branches/2_0/src/apache-2/mod_rivet.h
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/src/apache-2/mod_rivet.h?rev=963411&r1=963410&r2=963411&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/src/apache-2/mod_rivet.h (original)
+++ tcl/rivet/branches/2_0/src/apache-2/mod_rivet.h Mon Jul 12 18:12:14 2010
@@ -51,43 +51,42 @@
 module AP_MODULE_DECLARE_DATA rivet_module;
 
 typedef struct _rivet_server_conf {
-    Tcl_Interp *server_interp;           /* per server Tcl interpreter */
-    Tcl_Obj *rivet_global_init_script;   /* run once when apache is started */
+    Tcl_Interp *server_interp;          /* per server Tcl interpreter */
+    Tcl_Obj *rivet_global_init_script;	/* run once when apache is started */
     Tcl_Obj *rivet_child_init_script;
     Tcl_Obj *rivet_child_exit_script;
-    char *rivet_before_script;        /* script run before each page */
-    char *rivet_after_script;         /*            after            */
-    char *rivet_error_script;         /*            for errors */
+    char *rivet_before_script;		/* script run before each page	*/
+    char *rivet_after_script;		/*            after		*/
+    char *rivet_error_script;		/*            for errors	*/
 
     /* This flag is used with the above directives.  If any of them
        have changed, it gets set. */
     int user_scripts_updated;
 
-    Tcl_Obj *rivet_default_error_script;        /* for errors */
+    Tcl_Obj *rivet_default_error_script;    /* for errors */
     int *cache_size;
     int *cache_free;
     int upload_max;
     int upload_files_to_var;
     int separate_virtual_interps;
-    int honor_header_only_reqs;			/* default: 0 */
+    int honor_header_only_reqs;		    /* default: 0 */
     char *server_name;
     const char *upload_dir;
     apr_table_t *rivet_server_vars;
     apr_table_t *rivet_dir_vars;
     apr_table_t *rivet_user_vars;
-    char **objCacheList;   /* Array of cached objects (for priority handling) */
-    Tcl_HashTable *objCache; /* Objects cache - the key is the script name */
+    char **objCacheList;		    /* Array of cached objects (for priority handling) */
+    Tcl_HashTable *objCache;		    /* Objects cache - the key is the script name */
 
-    /* stuff for buffering output */
-    Tcl_Channel *outchannel;
+    Tcl_Channel *outchannel;		    /* stuff for buffering output */
 } rivet_server_conf;
 
 /* eventually we will transfer 'global' variables in here and
    'de-globalize' them */
 
 typedef struct _rivet_interp_globals {
-    request_rec *r;             /* request rec */
-    TclWebRequest *req;         /* TclWeb API request */
+    request_rec *r;			    /* request rec */
+    TclWebRequest *req;			    /* TclWeb API request */
 } rivet_interp_globals;
 
 int Rivet_ParseExecFile(TclWebRequest *req, char *filename, int toplevel);



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org