bloritsch    01/01/11 11:58:46

  Modified:    webapp/docs/samples/forms Tag: xml-cocoon2 add-employee.xsp
                        employee.xsp process-department.xsp
                        process-employee.xsp
  Log:
  Fixed samples for FORMS
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +14 -10    
xml-cocoon/webapp/docs/samples/forms/Attic/add-employee.xsp
  
  Index: add-employee.xsp
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/webapp/docs/samples/forms/Attic/add-employee.xsp,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- add-employee.xsp  2001/01/08 15:30:01     1.1.2.2
  +++ add-employee.xsp  2001/01/11 19:58:42     1.1.2.3
  @@ -13,16 +13,20 @@
           <para>Employee Name: <input name="name" type="text"/></para>
           <para>Department:
             <select name="department">
  -      <esql:execute-query inner-method="no">
  -        <esql:use-connection>personnel</esql:use-connection>
  -        <esql:query>select id, name from department_table order by 
name</esql:query>
  -        <esql:results>
  -       <option>
  -            <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  -            <esql:get-string column="name"/>
  -          </option>
  -        </esql:results>
  -      </esql:execute-query>
  +       <esql:connection>
  +         <esql:pool>personnel</esql:pool>
  +         <esql:execute-query>
  +           <esql:query>select id, name from department_table order by 
name</esql:query>
  +           <esql:results>
  +             <esql:row-results>
  +               <option>
  +                 <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  +                    <esql:get-string column="name"/>
  +               </option>
  +             </esql:row-results>
  +           </esql:results>
  +         </esql:execute-query>
  +       </esql:connection>
             </select>
           </para>
           <input type="submit" value="Add"/>
  
  
  
  1.1.2.4   +38 -30    xml-cocoon/webapp/docs/samples/forms/Attic/employee.xsp
  
  Index: employee.xsp
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/forms/Attic/employee.xsp,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- employee.xsp      2001/01/10 17:31:58     1.1.2.3
  +++ employee.xsp      2001/01/11 19:58:43     1.1.2.4
  @@ -18,51 +18,59 @@
         <form name="EmployeeSelection">
             <select size="1" name="employee"
                 onChange="top.location.href=window.location.pathname + 
'?employee=' + 
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].value">
  -            <option value="0">-- New employee --</option>
  -            <esql:execute-query inner-method="no">
  -              <esql:use-connection>personnel</esql:use-connection>
  -              <esql:query>select id, department_id, name from employee_table 
order by name</esql:query>
  -              <esql:results>
  -                <option>
  -                  <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  -                  <xsp:attribute name="selected"><xsp:expr>(<esql:get-string 
column="id"/>.equals(empID)?"true":"false")</xsp:expr></xsp:attribute>
  -                  <xsp:logic>
  -                    if (<esql:get-string column="id"/>.equals(empID)) {
  -                      depID = <esql:get-string column="department_id"/>;
  -                    }
  -                  </xsp:logic>
  -                  <esql:get-string column="name"/>
  -                </option>
  -              </esql:results>
  -            </esql:execute-query>
  +            <option value="-1">-- New employee --</option>
  +         <esql:connection>
  +           <esql:pool>personnel</esql:pool>
  +              <esql:execute-query>
  +                <esql:query>select id, department_id, name from 
employee_table order by name</esql:query>
  +                <esql:results>
  +               <esql:row-results>
  +                    <option>
  +                      <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  +                      <xsp:attribute 
name="selected"><xsp:expr>(<esql:get-string 
column="id"/>.equals(empID)?"true":"false")</xsp:expr></xsp:attribute>
  +                      <xsp:logic>
  +                        if (<esql:get-string column="id"/>.equals(empID)) {
  +                            depID = <esql:get-string 
column="department_id"/>;
  +                        }
  +                      </xsp:logic>
  +                      <esql:get-string column="name"/>
  +                    </option>
  +               </esql:row-results>
  +                </esql:results>
  +              </esql:execute-query>
  +         </esql:connection>
             </select>
         </form>
         <form action="" method="POST" name="EmployeeEntry">
           <script>document.forms["EmployeeEntry"].action = 
window.location.pathname</script>
           <para>Employee Name: <input name="name" type="text"/>
             <xsp:logic>
  -            if (empID != null &amp;&amp; !empID.equals("0")) {
  +            if (empID != null &amp;&amp; !empID.equals("-1")) {
                 <script>document.forms["EmployeeEntry"].name.value = 
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].text</script>
               }
             </xsp:logic>
           </para>
           <para>Department:
             <select name="department">
  -            <esql:execute-query inner-method="no">
  -           <esql:use-connection>personnel</esql:use-connection>
  -              <esql:query>select id, name from department_table order by 
name</esql:query>
  -              <esql:results>
  -                <option>
  -                  <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  -                  <xsp:attribute name="selected"><xsp:expr>(<esql:get-string 
column="id"/>.equals(depID)?"true":"false")</xsp:expr></xsp:attribute>
  -                  <esql:get-string column="name"/>
  -                </option>
  -              </esql:results>
  -            </esql:execute-query>
  +         <esql:connection>
  +           <esql:pool>personnel</esql:pool>
  +              <esql:execute-query>
  +                <esql:query>select id, name from department_table order by 
name</esql:query>
  +                <esql:results>
  +                  <esql:row-results>
  +                    <option>
  +                      <xsp:attribute name="value"><esql:get-int 
column="id"/></xsp:attribute>
  +                      <xsp:attribute 
name="selected"><xsp:expr>(<esql:get-string 
column="id"/>.equals(depID)?"true":"false")</xsp:expr></xsp:attribute>
  +                      <esql:get-string column="name"/>
  +                    </option>
  +               </esql:row-results>
  +                </esql:results>
  +              </esql:execute-query>
  +         </esql:connection>
             </select>
           </para>
           <xsp:logic>
  -          if (empID != null &amp;&amp; !empID.equals("0")) {
  +          if (empID != null &amp;&amp; !empID.equals("-1")) {
               <input type="submit" name="cocoon-action" value="Update"/>
               <input type="submit" name="cocoon-action" value="Delete"/>
             } else {
  
  
  
  1.1.2.3   +23 -19    
xml-cocoon/webapp/docs/samples/forms/Attic/process-department.xsp
  
  Index: process-department.xsp
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/webapp/docs/samples/forms/Attic/process-department.xsp,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- process-department.xsp    2001/01/08 15:30:04     1.1.2.2
  +++ process-department.xsp    2001/01/11 19:58:43     1.1.2.3
  @@ -18,25 +18,29 @@
       </xsp:logic>
       <title><xsp:expr>process</xsp:expr> Department Processed</title>
       <content>
  -      <esql:execute-query inner-method="no">
  -        <esql:use-connection>personnel</esql:use-connection>
  -        <esql:query>
  -        select max(id) as maxid from department_table
  -     </esql:query>
  -        <esql:results>
  -       <xsp:logic>
  -            currId = <esql:get-int column="maxid"/>;
  -       </xsp:logic>
  -          <esql:execute-query inner-method="yes">
  -            <esql:statement>
  -              insert into department_table (id, name) values (
  -                
(<esql:parameter><xsp:expr>currId</xsp:expr></esql:parameter> + 1),
  -                <esql:parameter><xsp:expr>name</xsp:expr></esql:parameter>
  -              )
  -            </esql:statement>
  -          </esql:execute-query>
  -        </esql:results>
  -      </esql:execute-query>
  +      <esql:connection>
  +        <esql:pool>personnel</esql:pool>
  +        <esql:execute-query>
  +          <esql:query>
  +         select max(id) as maxid from department_table
  +       </esql:query>
  +          <esql:results>
  +         <esql:row-results>
  +           <xsp:logic>
  +                currId = <esql:get-int column="maxid"/>;
  +           </xsp:logic>
  +              <esql:execute-query>
  +                <esql:query>
  +                  insert into department_table (id, name) values (
  +                    
(<esql:parameter><xsp:expr>currId</xsp:expr></esql:parameter> + 1),
  +                    
<esql:parameter><xsp:expr>name</xsp:expr></esql:parameter>
  +                  )
  +                </esql:query>
  +              </esql:execute-query>
  +         </esql:row-results>
  +          </esql:results>
  +        </esql:execute-query>
  +      </esql:connection>
   
         <para><xsp:expr>name</xsp:expr> added</para>
         <a href="../welcome">Back to the welcome page</a>
  
  
  
  1.1.2.3   +23 -20    
xml-cocoon/webapp/docs/samples/forms/Attic/process-employee.xsp
  
  Index: process-employee.xsp
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/webapp/docs/samples/forms/Attic/process-employee.xsp,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- process-employee.xsp      2001/01/08 15:30:05     1.1.2.2
  +++ process-employee.xsp      2001/01/11 19:58:44     1.1.2.3
  @@ -20,26 +20,29 @@
       </xsp:logic>
       <title><xsp:expr>process</xsp:expr> Employee Processed</title>
       <content>
  -      <esql:execute-query inner-method="no">
  -        <esql:use-connection>personnel</esql:use-connection>
  -        <esql:query>
  -        select max(id) as maxid from employee_table
  -     </esql:query>
  -        <esql:results>
  -       <xsp:logic>
  -            currId = <esql:get-int column="maxid"/>;
  -       </xsp:logic>
  -          <esql:execute-query inner-method="yes">
  -            <esql:statement>
  -              insert into employee_table (id, name, department_id) values (
  -                
(<esql:parameter><xsp:expr>currId</xsp:expr></esql:parameter> + 1),
  -                <esql:parameter><xsp:expr>name</xsp:expr></esql:parameter>,
  -             
<esql:parameter><xsp:expr>departmentId</xsp:expr></esql:parameter>
  -              )
  -            </esql:statement>
  -          </esql:execute-query>
  -        </esql:results>
  -      </esql:execute-query>
  +      <esql:connection>
  +        <esql:pool>personnel</esql:pool>
  +     <esql:autocommit>false</esql:autocommit>
  +        <esql:execute-query>
  +          <esql:query>select max(id) as maxid from 
employee_table</esql:query>
  +          <esql:results>
  +         <esql:row-results>
  +           <xsp:logic>
  +                currId = <esql:get-int column="maxid"/>;
  +           </xsp:logic>
  +              <esql:execute-query>
  +                <esql:query>
  +                  insert into employee_table (id, name, department_id) 
values (
  +                    (<esql:parameter><xsp:expr>currId + 
1</xsp:expr></esql:parameter>),
  +                    
<esql:parameter><xsp:expr>name</xsp:expr></esql:parameter>,
  +                 
<esql:parameter><xsp:expr>departmentId</xsp:expr></esql:parameter>
  +                  )
  +                </esql:query>
  +              </esql:execute-query>
  +         </esql:row-results>
  +          </esql:results>
  +        </esql:execute-query>
  +      </esql:connection>
   
         <para><xsp:expr>name</xsp:expr> added</para>
         <a href="../welcome">Back to the welcome page</a>
  
  
  

Reply via email to