From b7a2327857420ca9c602f230ec84cc1cd275c1c8 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 1 Feb 2008 21:47:15 +0000 Subject: [PATCH] Almost there. --- transforms/adl2controllerclasses.xslt | 10 +-- transforms01/adl2controllerclasses.xslt | 114 ++++++++++++++---------- transforms01/adl2entityclass.xslt | 67 +++----------- transforms01/csharp-type-include.xslt | 56 ++++++++++++ 4 files changed, 137 insertions(+), 110 deletions(-) create mode 100755 transforms01/csharp-type-include.xslt diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt index affb202..c1bc759 100755 --- a/transforms/adl2controllerclasses.xslt +++ b/transforms/adl2controllerclasses.xslt @@ -1,16 +1,16 @@ + select="substring( '$Revision: 1.3 $', 11)"/> diff --git a/transforms01/adl2controllerclasses.xslt b/transforms01/adl2controllerclasses.xslt index 1aecf80..7ede49a 100755 --- a/transforms01/adl2controllerclasses.xslt +++ b/transforms01/adl2controllerclasses.xslt @@ -1,7 +1,7 @@ - - + - - - - + + + + + - + + select="substring( '$Revision: 1.2 $', 11)"/> @@ -79,15 +88,14 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using Castle.MonoRail.Framework.Helpers; +using Cygnet.Exceptions; using Cygnet.Web.Helpers; using Cygnet.Web.Controllers; using NHibernate; using NHibernate.Expression; using Castle.MonoRail.Framework; -using Cygnet.Exceptions; using Iesi.Collections.Generic; -using SRU.Hospitality.Helpers; -using SRU.Hospitality.Entities; +using ; namespace { @@ -110,9 +118,9 @@ namespace { private void Store() { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); - List<string> messages = new List<string>(); + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); + List<string> messages = new List<string>(); . record; @@ -138,9 +146,9 @@ namespace { { /* it's existing, retrieve it */ record = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) - .UniqueResult<.>(); + .UniqueResult<>(); } if ( record != null) @@ -155,11 +163,11 @@ namespace { * special - BindObjectInstance /should/ do it all. Unfortunately it sometimes * doesn't, and I haven't yet characterised why not. TODO: Fix this! */ record. = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq(" - ", Int32.Parse(Form[""]))) - .UniqueResult<.>(); + ", Int32.Parse(Form[""]))) + .UniqueResult<>(); @@ -258,9 +266,11 @@ namespace { } PropertyBag["messages"] = messages; + PropertyBag["instance"] = record; + PropertyBag["username"] = Session[ NHibernateHelper.USERTOKEN]; - PropertyBag["instance"] = record; - + + @@ -279,26 +289,26 @@ namespace { public void Delete() { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); string id = Params[""]; string reallydelete = Params["reallydelete"]; if ( "true".Equals( reallydelete)) { - record = - hibernator.CreateCriteria(typeof()) + record = + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) - .UniqueResult<.>(); + .UniqueResult<>(); if ( record != null) { record.BeforeDeleteHook( hibernator); hibernator.Delete( - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) - .UniqueResult<.>()); + .UniqueResult<>()); hibernator.Flush(); } @@ -339,14 +349,16 @@ namespace { public void InternalShowList( String view) { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); IList<> instances = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) - .List<>(); + .List<>(); + PropertyBag["username"] = Session[ NHibernateHelper.USERTOKEN]; + PropertyBag["instances"] = PaginationHelper.CreatePagination( this, instances, 25); @@ -413,15 +425,17 @@ namespace { if ( command.Equals( "delete")) { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); string id = Form[""]; + PropertyBag["username"] = Session[ NHibernateHelper.USERTOKEN]; + PropertyBag["instance"] = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) - .UniqueResult<.>(); + .UniqueResult<>(); RenderViewWithFailover( "maybedelete.vm", "maybedelete.auto.vm"); } @@ -442,13 +456,15 @@ namespace { public void ( ) { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); + PropertyBag["username"] = Session[ NHibernateHelper.USERTOKEN]; + RenderViewWithFailover("", ""); } @@ -460,14 +476,16 @@ namespace { public void ( Int32 ) { ISession hibernator = - NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], - Session[NHibernateHelper.PASSTOKEN]); - . record = - hibernator.CreateCriteria(typeof()) + NHibernateHelper.GetCurrentSession( Session[ NHibernateHelper.USERTOKEN], + Session[NHibernateHelper.PASSTOKEN]); + record = + hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Id)) - .UniqueResult<.>(); + .UniqueResult<>(); + PropertyBag["username"] = Session[ NHibernateHelper.USERTOKEN]; + PropertyBag["instance"] = record; @@ -519,9 +537,9 @@ namespace { PropertyBag[""] = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) - .List<>(); + .List<>(); diff --git a/transforms01/adl2entityclass.xslt b/transforms01/adl2entityclass.xslt index e0fd69a..b5c40c9 100755 --- a/transforms01/adl2entityclass.xslt +++ b/transforms01/adl2entityclass.xslt @@ -8,8 +8,8 @@ Transform ADL into entity classes $Author: sb $ - $Revision: 1.2 $ - $Date: 2008-02-01 18:25:38 $ + $Revision: 1.3 $ + $Date: 2008-02-01 21:47:15 $ --> + select="substring( '$Revision: 1.3 $', 11)"/> @@ -310,6 +313,7 @@ + @@ -352,7 +356,7 @@ private Regex Validator = new Regex( ""); - private _ ; + private _ ; /// <summary> /// @@ -363,7 +367,7 @@ : /// /// </summary> - public virtual + public virtual { get { return _; } set { @@ -456,55 +460,4 @@ - - - - - - - - - - Looking for definition of ''; - Found to be defined as type '' - - - - - - - - - - - - - - - - - - - - ICollection<> - - - ICollection<> - - DateTime - DateTime - String - String - bool - DateTime - int - double - Decimal - - - - [unknown?] - - - \ No newline at end of file diff --git a/transforms01/csharp-type-include.xslt b/transforms01/csharp-type-include.xslt new file mode 100755 index 0000000..72e227b --- /dev/null +++ b/transforms01/csharp-type-include.xslt @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + ICollection<> + + + ICollection<> + + DateTime + DateTime + String + String + bool + DateTime + int + double + Decimal + + + + [unknown?] + + + +