[H2-commits] r1379 - in humano2/trunk: components/formulas core/schema/pgsql web/builder/site

[<sv...@de...>]

Author: marcelo
Date: 2005-06-21 17:57:04 -0400 (Tue, 21 Jun 2005)
New Revision: 1379

Modified:
   humano2/trunk/components/formulas/ProcessFormulas.cs
   humano2/trunk/core/schema/pgsql/pgsql-3-view.sql
   humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs
Log:
 * Fixed the formulas which had broken somewhere down the line. Updated t=
he schema so that system and domain classes are displayed when creating a=
n attribute of type pertinence.

Modified: humano2/trunk/components/formulas/ProcessFormulas.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/formulas/ProcessFormulas.cs	2005-06-21 20:25=
:13 UTC (rev 1378)
+++ humano2/trunk/components/formulas/ProcessFormulas.cs	2005-06-21 21:57=
:04 UTC (rev 1379)
@@ -813,7 +813,14 @@
 				tableName =3D "";
 				columnName =3D "id_entity1";
 				//strSearch =3D columnName;
-				sql =3D sql.Replace(" FROM", " as col FROM");
+				if (sql.IndexOf(" as \"id_entity1\" FROM ") > 0 )
+				{
+					sql =3D sql.Replace(columnName, "col");
+				}
+				else
+				{
+					sql =3D sql.Replace(" FROM", " as col FROM");
+				}
 			}
 		=09
=20

Modified: humano2/trunk/core/schema/pgsql/pgsql-3-view.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/schema/pgsql/pgsql-3-view.sql	2005-06-21 20:25:13 =
UTC (rev 1378)
+++ humano2/trunk/core/schema/pgsql/pgsql-3-view.sql	2005-06-21 21:57:04 =
UTC (rev 1379)
@@ -51,7 +51,7 @@
 INSERT INTO textline VALUES (1018, NULL, NULL, NULL, NULL);
=20
 INSERT INTO "view"  ("id_entity","columns","where","idClassView","viewNa=
me")  VALUES (1404,'0,1018','1017^66|4|''[to]''|0|0',1011,'Views of a cla=
ss Views');
-INSERT INTO "view"  ("id_entity","columns","where","idClassView","viewNa=
me")  VALUES (1405,'0,66','34|4|''[DomainId]''|0|0',2,'View of Domain Cla=
ses');
+INSERT INTO "view"  ("id_entity","columns","where","idClassView","viewNa=
me")  VALUES (1405,'0,66','34|8|{(''[DomainId]'',''10'')}|0|0',2,'View of=
 Domain Clases');
=20
 UPDATE "pertinence" set "filterView" =3D '1405,DomainId' WHERE id_entity=
 =3D 57;
 UPDATE "pertinence" set "filterView" =3D '1404,to' WHERE id_entity =3D 7=
1;

Modified: humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs	2005-06-21 =
20:25:13 UTC (rev 1378)
+++ humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs	2005-06-21 =
21:57:04 UTC (rev 1379)
@@ -35,7 +35,7 @@
 				try
 				{
 					myform.ExeFxsAtributeWithDt(attributeId,domainId,0,0);
-					Response.Write("Ejecutando Formula");
+					Response.Write("Formula successfully executed");
=20
 					/* Lineas para depurar, ayudaran bastante*/
 					/*