cvs commit: jakarta-turbine-torque/src/templates/doc/anakia table.vm

[mpoeschl]

mpoeschl    2002/10/29 01:55:53

  Modified:    src/java/org/apache/torque/task TorqueDocumentationTask.java
               src/templates/doc/anakia table.vm
  Log:
  fix problem, where default value containes
  characters not allowed in XML
  
  Revision  Changes    Path
  1.5       +2 -1      
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDocumentationTask.java
  
  Index: TorqueDocumentationTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDocumentationTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TorqueDocumentationTask.java      17 Apr 2002 18:23:26 -0000      1.4
  +++ TorqueDocumentationTask.java      29 Oct 2002 09:55:53 -0000      1.5
  @@ -97,6 +97,7 @@
       {
           super.initControlContext();
           context.put("outputFormat", outputFormat);
  +        context.put("escape", new org.apache.velocity.anakia.Escape());
           return context;
       }
   }
  
  
  
  1.4       +5 -1      jakarta-turbine-torque/src/templates/doc/anakia/table.vm
  
  Index: table.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/doc/anakia/table.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- table.vm  20 Dec 2001 15:40:10 -0000      1.3
  +++ table.vm  29 Oct 2002 09:55:53 -0000      1.4
  @@ -20,7 +20,11 @@
         <td>$col.Name</td>
         <td>$col.Type</td>
         <td>$col.printSize()</td>
  -      <td>$!col.DefaultValue</td>
  +    #if ($col.DefaultValue && !$col.DefaultValue.equalsIgnoreCase("NULL") )
  +      <td>$escape.getText($col.DefaultValue)</td>
  +    #else
  +      <td></td>
  +    #end
         <td>$col.JavaName</td>
         <td>#if ($col.isPrimaryKey()==true)X#end</td>
         <td>#if ($col.isForeignKey()==true)X#end</td>
  
  
  

--
To unsubscribe, e-mail:   <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>