|
From: <sv...@de...> - 2005-06-03 23:36:01
|
Author: marcelo
Date: 2005-06-03 19:35:57 -0400 (Fri, 03 Jun 2005)
New Revision: 1239
Modified:
humano2/trunk/changelog.txt
humano2/trunk/components/viewTools/ViewTools.cs
Log:
* Adding changelog for release 5.0.beta4
* fixed code so search does not crash, still exists a problem with retur=
ns columns.
Modified: humano2/trunk/changelog.txt
=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/changelog.txt 2005-06-03 21:52:06 UTC (rev 1238)
+++ humano2/trunk/changelog.txt 2005-06-03 23:35:57 UTC (rev 1239)
@@ -1,5 +1,21 @@
$Id$
=20
+=3D=3D 5.0.beta4 - 2005-06-02 =3D=3D
+
+ * Databases
+ * Changed paging logic in ViewTools so that it works in MsSql
+ * This last change means that Postgresql V.8 has to used=20
+ * Caching was implemented to minimize calls to the DB
+ =20
+ * Metamodel=20
+ * Added new attribute types of attributes:
+ - File
+
+ * Portal
+ * Image upload is now soported and the images will be displayed in in=
stance.aspx
+ * Views which have multiple column with the same no longer crash
+ =20
+
=3D=3D 5.0.beta3 - 2005-05-27 =3D=3D
=20
* Databases
Modified: humano2/trunk/components/viewTools/ViewTools.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/viewTools/ViewTools.cs 2005-06-03 21:52:06 U=
TC (rev 1238)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-03 23:35:57 U=
TC (rev 1239)
@@ -478,15 +478,22 @@
=09
Query.Append("SELECT ");
int loop =3D 0;
+ Hashtable selCols =3D Hashtable.Synchronized( new Hashtable() );
foreach(DisplayOrder var in disp)
{
var.Text.Substring(var.Text.IndexOf(".") + 1,var.Text.Length - var.T=
ext.IndexOf(",") - 1);
int begin =3D var.Text.IndexOf(".")+1;
int end =3D var.Text.IndexOf(",",begin);
string field =3D var.Text.Substring(begin,end - begin);
- if ( field =3D=3D "id_entity" && loop > 0)
- var.Text =3D var.Text.Substring(0, end) + " as " + field + loop.T=
oString() + ", ";
-
+ if (selCols.ContainsKey(field))
+ {
+ field =3D field.Replace("\"","");
+ var.Text =3D var.Text.Substring(0, end) + " as \"" + field + loop.=
ToString() + "\", ";
+ }
+ else
+ {
+ selCols.Add(field, "1");
+ }
Query.Append(var.Text);
loop+=3D1;
}
|