Menu
▾
▴
[H2-commits] r1165 - in humano2/trunk: components/formulas components/import components/rules components/viewTools components/webTools core/db core/db/mssql core/db/pgsql core/tests web/builder/site web/portal/site
Author: marijn
Date: 2005-05-27 12:23:01 -0400 (Fri, 27 May 2005)
New Revision: 1165
Modified:
humano2/trunk/components/formulas/ProcessFormulas.cs
humano2/trunk/components/import/Import.cs
humano2/trunk/components/rules/Rules.cs
humano2/trunk/components/viewTools/ViewTools.cs
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/components/webTools/session.cs
humano2/trunk/components/webTools/xmltools.cs
humano2/trunk/core/db/absComplex.cs
humano2/trunk/core/db/absCrud.cs
humano2/trunk/core/db/mssql/mssqlComplex.cs
humano2/trunk/core/db/mssql/mssqlConnection.cs
humano2/trunk/core/db/mssql/mssqlCrud.cs
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
humano2/trunk/core/db/pgsql/pgsqlConnection.cs
humano2/trunk/core/db/pgsql/pgsqlCrud.cs
humano2/trunk/core/tests/mdPertinenceTests.cs
humano2/trunk/web/builder/site/buildattribute.aspx.cs
humano2/trunk/web/builder/site/combobox_type_entity.aspx.cs
humano2/trunk/web/builder/site/createInstanceRule.aspx.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
humano2/trunk/web/builder/site/formmanagement.aspx.cs
humano2/trunk/web/builder/site/formulamain.aspx.cs
humano2/trunk/web/builder/site/functionclasses.aspx.cs
humano2/trunk/web/builder/site/test.aspx.cs
humano2/trunk/web/builder/site/viewmain.aspx.cs
humano2/trunk/web/portal/site/report.aspx.cs
humano2/trunk/web/portal/site/search.aspx.cs
humano2/trunk/web/portal/site/showView.aspx.cs
humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs
humano2/trunk/web/portal/site/viewrelations.aspx.cs
Log:
MERGE from braches/cleanup 1160:HEAD to trunk/
* Fixing many compiler warnings.
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-05-27 15:50=
:51 UTC (rev 1164)
+++ humano2/trunk/components/formulas/ProcessFormulas.cs 2005-05-27 16:23=
:01 UTC (rev 1165)
@@ -192,7 +192,7 @@
/// construye el resultado de la formula</sumary>
public DataTable GetDataTableResultFx(DataTable dtsql, DataTable dt2)
{
- string element,type,typeElement,typeFunction,fx;
+ string element,type,typeFunction,fx; //typeElement,
string expression=3D"";
int indice=3D1;
=20
@@ -209,7 +209,7 @@
{
element =3D dr["element"].ToString();
type =3D dr["type"].ToString();
- typeElement =3D dr["typeElement"].ToString();
+ //typeElement =3D dr["typeElement"].ToString();
if(type =3D=3D "elemento" || type =3D=3D "funcion")
{
expression =3D expression + dt2.Columns[indice].ColumnName;
@@ -238,7 +238,7 @@
{
element =3D dr["element"].ToString();
type =3D dr["type"].ToString();
- typeElement =3D dr["typeElement"].ToString();
+ //typeElement =3D dr["typeElement"].ToString();
typeFunction =3D dr["typeFunction"].ToString();
fx =3D dr["fx"].ToString();
if(type =3D=3D "elemento" || (type =3D=3D "funcion" && typeFunctio=
n =3D=3D "sql"))
@@ -598,7 +598,7 @@
string msj1,msj2;
DataSet ds1;
int idAtrib=3D0;
- int idPert=3D0;
+ //int idPert=3D0;
string typeElement;
int idTypeElement;
=09
@@ -644,7 +644,7 @@
theparams =3D this.TranslateField(element);
=09
idAtrib =3D theparams[0];
- idPert =3D theparams[1];
+ //idPert =3D theparams[1];
=09
drDats["theElement"] =3D element;
=09
@@ -714,7 +714,7 @@
public DataTable GetSqlElements(DataTable dt, int domainId, int column=
Id)
{
DataTable dtSql;
- string typeElement;
+ //string typeElement;
string fx, sqlView;
string typeFunction=3D"",theElement=3D"";
//int idAtrib, idRel;
@@ -728,7 +728,7 @@
drSql["type"] =3D dr["type"];
drSql["typeElement"] =3D dr["typeElement"];
drSql["idTypeElement"] =3D dr["idTypeElement"];
- typeElement =3D dr["typeElement"].ToString();
+ //typeElement =3D dr["typeElement"].ToString();
=09
if(dr["type"].ToString() =3D=3D "elemento")
{
@@ -781,7 +781,6 @@
=09
currentTableId =3D complex.TableId(columnId);
=20
- DataTable dtForm =3D new DataTable();
DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow dr =3D dtParam.NewRow();
=20
@@ -943,7 +942,7 @@
{
string tableTemp;
string strSQL;
- string element,type,typeElement,value,infoExtra;
+ string type,typeElement; // element,infoExtra,value
string nameColumn,typeDB;
int i;
=09
@@ -961,11 +960,11 @@
=09
foreach(DataRow draux in dt.Rows)
{
- element =3D draux["element"].ToString();
+ //element =3D draux["element"].ToString();
type =3D draux["type"].ToString();
typeElement =3D draux["typeElement"].ToString();
- value =3D draux["sqlView"].ToString();
- infoExtra =3D draux["infoExtraView"].ToString();
+ //value =3D draux["sqlView"].ToString();
+ //infoExtra =3D draux["infoExtraView"].ToString();
=09
if(type=3D=3D"elemento" || type=3D=3D"funcion")
{
@@ -988,9 +987,9 @@
{
string tableTemp;
string strSQL,strSQL2,strSQL3,sql1;
- string element,type,typeElement,value,infoExtra;
+ string element,type,value,infoExtra; // typeElement
string nameColumn;
- string theColumn,theTable;
+ string theTable; // theColumn,
int i;
=09
tableTemp =3D "tbltempfx"+columnId;
@@ -1001,7 +1000,7 @@
=09
=09
theTable =3D complex.TableName(columnId);
- theColumn =3D complex.ColumnName(columnId);
+ //theColumn =3D complex.ColumnName(columnId);
=20
//Primero se verificara que el datatable que viene, no trae Errores.
if(dt.Select("type like 'Error'").Length > 0)
@@ -1019,7 +1018,7 @@
{
element =3D draux["element"].ToString();
type =3D draux["type"].ToString();
- typeElement =3D draux["typeElement"].ToString();
+ //typeElement =3D draux["typeElement"].ToString();
value =3D draux["sqlView"].ToString();
infoExtra =3D draux["infoExtraView"].ToString();
=09
@@ -1082,7 +1081,7 @@
{
string tableTemp;
string strSQL,strSQL2,strSQL3,sql1,sql2;
- string element,type,typeElement,value,infoExtra;
+ string element,type; // ,infoExtra,value,typeElement
string nameColumn;
string theColumn,theTable;
int i;
@@ -1106,9 +1105,9 @@
{
element =3D draux["element"].ToString();
type =3D draux["type"].ToString();
- typeElement =3D draux["typeElement"].ToString();
- value =3D draux["sqlView"].ToString();
- infoExtra =3D draux["infoExtraView"].ToString();
+ //typeElement =3D draux["typeElement"].ToString();
+ //value =3D draux["sqlView"].ToString();
+ //infoExtra =3D draux["infoExtraView"].ToString();
=09
if(type=3D=3D"elemento" || type=3D=3D"funcion")
{
Modified: humano2/trunk/components/import/Import.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/import/Import.cs 2005-05-27 15:50:51 UTC (re=
v 1164)
+++ humano2/trunk/components/import/Import.cs 2005-05-27 16:23:01 UTC (re=
v 1165)
@@ -74,11 +74,11 @@
/// <param name=3D"attsArr">2 dimensional array wich contains Column =
name/Column definition.</param>
internal void createTables(string[,] attsArr)
{
- Hashtable classes =3D new Hashtable();
+ //Hashtable classes =3D new Hashtable();
=20
dsAtts=3D crud.ReadStructure(classId);
=20
- string xmlStr =3D dsAtts.GetXml();
+ //string xmlStr =3D dsAtts.GetXml();
=09
string[] cols =3D new string[1];
cols[0] =3D "classId";
@@ -239,14 +239,14 @@
=20
/// <summary>Reads the text file to be imported and is feed into a Da=
taTable, that DataTable is then passed to complex to fill the temporary i=
mport table</summary>
/// <param name=3D"srcFile">text file to be read</param>
- /// <param name=3D"srcFile">2-D which contains the file/db column mat=
ching information</param>
+ /// <param name=3D"attsArr">2-D which contains the file/db column mat=
ching information</param>
internal void LoadData(string srcFile, string[,] attsArr)
{
srcFile =3D srcFile.ToUpper().Replace("-TMP","-PROC");
using (StreamReader sr =3D new StreamReader(srcFile))
{
- string rawCols =3D sr.ReadLine();
- string[] rawColsArr =3D SplitDelimitedLine(rawCols,delimitator, qua=
lifier);
+ sr.ReadLine(); // string rawCols
+ //string[] rawColsArr =3D SplitDelimitedLine(rawCols,delimitator, q=
ualifier);
string line;
string[] lineArr;
// Read and display lines from the file until the end of
@@ -277,7 +277,6 @@
}
catch
{
- int n=3D0;
//FIXME: store line which containts invalid data in seperate file=
to make available in final report.
//The idea is that there is a class called Import Results.
//Each instance of that class has A) the original file uploaded, =
B) log file, C) file which contains the rows which had errors
@@ -290,7 +289,7 @@
=20
=20
/// <summary>Resolves the pertinence of the data being imported. </su=
mmary>
- /// <param name=3D"srcFile">2-D which contains the file/db column mat=
ching information</param>
+ /// <param name=3D"attsArr">2-D which contains the file/db column mat=
ching information</param>
internal void resolvePertinance(string[,] attsArr)
{
for (int i=3D0;i<attsArr.Length/3;i++)
@@ -328,7 +327,7 @@
/// <summary>
/// Call complex to generate the SQL statement to execute which will =
create the new instances and populate the class tables
/// </summary>
- /// <param name=3D"srcFile">2-D which contains the file/db column mat=
ching information</param>
+ /// <param name=3D"attsArr">2-D which contains the file/db column mat=
ching information</param>
internal void FinalImport(string[,] attsArr)
{
complex.finalImport(attsArr, dsAtts, tableName, domainId, classId);
@@ -344,7 +343,6 @@
/// arr[0] =3D Hello; There
/// arr[1] =3D world
/// </summary>
- /// <param name=3D"srcFile">2-D which contains the file/db column mat=
ching information</param>
public string[] SplitDelimitedLine(string CurrentLine, char Delimite=
r, char Qualifier)
{
int i;
@@ -442,7 +440,7 @@
classId =3D Convert.ToInt32(objXMLDOM.DocumentElement.SelectSingleNo=
de("/config/classId").InnerText);
delimitator =3D Convert.ToChar(objXMLDOM.DocumentElement.SelectSingl=
eNode("/config/delimitator").InnerText);
qualifierStr =3D objXMLDOM.DocumentElement.SelectSingleNode("/config=
/qualifier").InnerText;
- string updateAtts =3D objXMLDOM.DocumentElement.SelectSingleNode("/c=
onfig/updateAtts").InnerText;
+ //string updateAtts =3D objXMLDOM.DocumentElement.SelectSingleNode("=
/config/updateAtts").InnerText;
dbAttsStr =3D objXMLDOM.DocumentElement.SelectSingleNode("/config/db=
Atts").InnerText.Split(',');
fileAttsStr =3D objXMLDOM.DocumentElement.SelectSingleNode("/config/=
fileAtts").InnerText.Split(',');
rawFileFields =3D objXMLDOM.DocumentElement.SelectSingleNode("/confi=
g/rawFileFields").InnerText;
@@ -461,8 +459,8 @@
fileCols =3D io.SplitDelimitedLine(rawFileFields, delimitator,qualifi=
er);
=20
string[,] attsArr =3D new string[fileAttsStr.Length,3];
- ///attsArr gets returned and used everywhere in the import process. I=
t contains the
- ///column matching between the file being uploaded and the files in t=
he databse.
+ //attsArr gets returned and used everywhere in the import process. It=
contains the
+ //column matching between the file being uploaded and the files in th=
e databse.
for (int i =3D 0; i < fileAttsStr.Length; i++)
{
attsArr[i,0] =3D fileAttsStr[i]; //contains the ID of the column in =
the file
Modified: humano2/trunk/components/rules/Rules.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/rules/Rules.cs 2005-05-27 15:50:51 UTC (rev =
1164)
+++ humano2/trunk/components/rules/Rules.cs 2005-05-27 16:23:01 UTC (rev =
1165)
@@ -34,7 +34,6 @@
/// <returns></returns>
public object Test()
{
- DataTable dt =3D new DataTable();
return "Hola";
}
#endregion
@@ -120,7 +119,6 @@
{
int classId=3D1100;
string strfiltros =3D "";
- DataTable dtRules =3D new DataTable();
DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow dr =3D dtParam.NewRow();
int attributeId=3D0;
@@ -238,12 +236,12 @@
string attributes,operators,elements;
string[] arrAttributes,arrOperators,arrElements;
int attrib;
- int operatorId,setToId,idRel;
+ int operatorId; //,setToId,idRel;
string elementRule,setTo;
string valueRule=3D"";
string filtro=3D"";
int tableId=3D0;
- int[] theparams;
+ //int[] theparams;
DataTable dtEntitys =3D new DataTable();
DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow drParam =3D dtParam.NewRow();
@@ -279,10 +277,10 @@
else
finfiltro =3D "|0|0";
=20
- theparams =3D this.TranslateField(setTo);
+ //theparams =3D this.TranslateField(setTo);
=09
- setToId =3D theparams[0];
- idRel =3D theparams[1];
+ //setToId =3D theparams[0];
+ //idRel =3D theparams[1];
=20
tableId =3D complex.TableId(attrib);
=20
@@ -342,13 +340,13 @@
string attributes,operators,elements;
string[] arrAttributes,arrOperators,arrElements;
int attrib;
- int operatorId,setToId,idRel;
+ int operatorId; //,setToId,idRel;
string elementRule,setTo;
string valueRule=3D"";
string filtro=3D"";
int tableId=3D0;
- int[] theparams;
- DataTable dtEntitys =3D new DataTable();
+ //int[] theparams;
+ //DataTable dtEntitys =3D new DataTable();
DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow drParam =3D dtParam.NewRow();
=20
@@ -383,10 +381,10 @@
else
finfiltro =3D "|0|0";
=20
- theparams =3D this.TranslateField(setTo);
+ //theparams =3D this.TranslateField(setTo);
=09
- setToId =3D theparams[0];
- idRel =3D theparams[1];
+ //setToId =3D theparams[0];
+ //idRel =3D theparams[1];
=20
tableId =3D complex.TableId(attrib);
=20
@@ -466,16 +464,16 @@
public DataTable CreateDtToUpdate(int domainId, DataRow dr, DataTable =
dtEntity)
{
//int attrib=3D0;
- int setToId,idRel;
- string operatorRule,elementRule,setTo;
+ int setToId; //,idRel;
+ string setTo; // ,operatorRule,elementRule=20
string columnNameElement;
string tableName;
string valueRule;
- int tableId=3D0;
+ //int tableId=3D0;
int[] theparams;
- DataTable dtEntitys =3D new DataTable();
- DataTable dtParam =3D this.makeDataTableInViewTools();
- DataRow drParam =3D dtParam.NewRow();
+ //DataTable dtEntitys =3D new DataTable();
+ //DataTable dtParam =3D this.makeDataTableInViewTools();
+ //DataRow drParam =3D dtParam.NewRow();
=20
//Seccion del crud y el complex
crud.Domain =3D domainId;
@@ -485,17 +483,17 @@
vt.Complex =3D complex;
=20
//attrib =3D Convert.ToInt32(dr["attributeIdRule"].ToString());
- operatorRule =3D dr["operatorRule"].ToString();
- elementRule =3D dr["elementRule"].ToString();
+ //operatorRule =3D dr["operatorRule"].ToString();
+ //elementRule =3D dr["elementRule"].ToString();
setTo =3D dr["setTo"].ToString();
valueRule =3D dr["valueRule"].ToString();
=20
theparams =3D this.TranslateField(setTo);
=09
setToId =3D theparams[0];
- idRel =3D theparams[1];
+ //idRel =3D theparams[1];
=20
- tableId =3D complex.TableId(setToId);
+ //tableId =3D complex.TableId(setToId);
tableName =3D complex.TableName(setToId);
columnNameElement =3D complex.ColumnName(setToId);
=20
@@ -557,8 +555,9 @@
public string GetColumnsRules(int classId)
{
string str=3D"";
- DataTable dt1 =3D new DataTable();
- DataTable dtParam =3D this.makeDataTableInViewTools();
+ return str;
+ //DataTable dt1 =3D new DataTable();
+ /* DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow dr =3D dtParam.NewRow();
=20
dr["columna"] =3D "0";
@@ -569,11 +568,11 @@
ViewTools.ViewTools vt =3D new ViewTools.ViewTools(5);
//absCrud crud =3D Factory.Crud();
//absComplex complex =3D Factory.Complex(crud);
- vt.Complex =3D complex;
+ vt.Complex =3D complex; */
=20
- dt1 =3D vt.GetSQLDataTable(dtParam);
+ //dt1 =3D vt.GetSQLDataTable(dtParam);
=20
- return str;
+
}
=20
///<sumary>funcion que recorre el DT y actualiza la columna en la DB</=
sumary>
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-05-27 15:50:51 U=
TC (rev 1164)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-05-27 16:23:01 U=
TC (rev 1165)
@@ -337,14 +337,14 @@
//{
=20
int pos =3D var.IndexOf(";");
- string a =3D var.Substring(pos + 1,7);
+ //string a =3D var.Substring(pos + 1,7);
if(var.Substring(pos + 1,7).ToLower() =3D=3D "\ninsert")
{
=20
createTable =3D var.Substring(0,pos);
var =3D var.Substring(var.IndexOf(";") + 2,var.Length - var.IndexO=
f(";") - 2);
pos =3D var.IndexOf(";");
- a =3D var.Substring(pos + 1,7);
+ //a =3D var.Substring(pos + 1,7);
=20
if(var.Substring(pos + 1,7).ToLower() =3D=3D "\nselect")
{
@@ -495,7 +495,7 @@
relations =3D GetRelatedTableList((string[])cols.ToArray(typeof(strin=
g)));
if(relations.Length > 0)
{
- ViewRelation previousRelation =3D null;=09
+ //ViewRelation previousRelation =3D null;=09
string relationType =3D "";
ArrayList tableDictionary =3D new ArrayList();
int counter =3D 1;
@@ -519,7 +519,7 @@
Query.Append(" =3D " + relation.EndTableName + "." + relation.Forei=
gnKeyName);
// Query.Append(" relTbl"+counter+" ON tblA." + relation.PrimaryKeyN=
ame);
// Query.Append(" =3D relTbl"+counter+"." + relation.ForeignKeyName)=
;
- previousRelation =3D relation;
+ //previousRelation =3D relation;
=20
if(tableDictionary.IndexOf(relation.EndTableName) =3D=3D -1)
{
@@ -711,10 +711,10 @@
{
StringBuilder strFilters =3D new StringBuilder();
string[] parameters;
- string iniFunction, endFunction;
+ string iniFunction; //endFunction;
string iniArgument, endArgument, operation;
string[] aux;
- int colIndex, intFilter, intIniFunc, intEndFunc;
+ int colIndex, intFilter, intIniFunc; //intEndFunc;
string tableName, columnName, tableName2, columnName2;
=09
foreach(string filter in strParams)
@@ -723,7 +723,7 @@
iniFunction =3D parameters[0].ToString();
iniArgument =3D parameters[1].ToString();
operation =3D parameters[2].ToString();
- endFunction =3D parameters[3].ToString();
+ //endFunction =3D parameters[3].ToString();
endArgument =3D parameters[4].ToString();
=20
intIniFunc =3D Convert.ToInt32(iniFunction);
@@ -759,7 +759,7 @@
=20
intFilter =3D Convert.ToInt32(operation);
=20
- intEndFunc =3D Convert.ToInt32(endFunction);
+ //intEndFunc =3D Convert.ToInt32(endFunction);
aux =3D endArgument.Split("^".ToCharArray());
if(aux[0].IndexOf("'") =3D=3D -1)
{
@@ -1299,10 +1299,10 @@
int[] parentIndexes;
int previousRelation =3D 0;
StringBuilder Query =3D new StringBuilder();
- string iniTable, endTable, entTable =3D "";
+ string iniTable, endTable;
+=09
+ parentIndexes =3D GetParentIndexes(intIdClass);
=20
- parentIndexes =3D GetParentIndexes(intIdClass);
-
for(int i =3D 0; i<=3D parentIndexes.Length - 2;i++)
{
iniTable =3D Complex.TableName(parentIndexes[i]);
@@ -1310,12 +1310,8 @@
if(previousRelation =3D=3D 0)
{
Query.Append(iniTable + " inner join " + endTable);
-// Query.Append(iniTable + " tblA inner join " + endTable + " tbl"+i=
);
Query.Append(" on " + iniTable + ".id_entity");
Query.Append(" =3D " + endTable + ".id_entity ");
-// Query.Append(" on tblA.id_entity");
-// Query.Append(" =3D tbl"+i+".id_entity ");
-// if (endTable =3D=3D "\"entity\"") entTable =3D "tbl"+i;
previousRelation =3D 1;
}
else
@@ -1327,7 +1323,6 @@
}
}
Query.Append("and entity.\"delDate\" is null ");
-// Query.Append("and "+entTable+".\"delDate\" is null ");
return Query.ToString();
}
=20
@@ -1429,8 +1424,8 @@
=20
int regIndex =3D Convert.ToInt32(dr[0].ItemArray[0]);
string owner =3D dr[0].ItemArray[1].ToString();
- string to =3D dr[0].ItemArray[2].ToString();
- string ratio =3D dr[0].ItemArray[3].ToString();
+ //string to =3D dr[0].ItemArray[2].ToString();
+ //string ratio =3D dr[0].ItemArray[3].ToString();
=20
toColumnIndex =3D Convert.ToInt32(owner);
columnNameTo =3D Complex.ColumnName(toColumnIndex);
@@ -1453,8 +1448,8 @@
}
=20
owner =3D dr[0].ItemArray[1].ToString();
- to =3D dr[0].ItemArray[2].ToString();
- ratio =3D dr[0].ItemArray[3].ToString();
+ //to =3D dr[0].ItemArray[2].ToString();
+ //ratio =3D dr[0].ItemArray[3].ToString();
=20
fromColumnIndex =3D Convert.ToInt32(owner);
tableNameFrom =3D Complex.TableName(fromColumnIndex);
@@ -1468,9 +1463,9 @@
=20
rel =3D Enums.RelationType.ManyToOne;
=20
- // NewRelationInstance(tableNameFrom, columnNameFrom, ta=
bleNameTo, columnNameTo,
- // fromTableIndex, toTableIndex, fromColumnIndex, toCol=
umnIndex,
- // rel, ref Relations);=09
+ //NewRelationInstance(tableNameFrom, columnNameFrom, tableNameT=
o, columnNameTo,
+ //fromTableIndex, toTableIndex, fromColumnIndex, toColumnIndex,
+ //rl, ref Relations);=09
}
else
{
Modified: humano2/trunk/components/webTools/Adapter.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/webTools/Adapter.cs 2005-05-27 15:50:51 UTC =
(rev 1164)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-05-27 16:23:01 UTC =
(rev 1165)
@@ -90,12 +90,11 @@
/// <summary>
/// Entrega un DataTable con las clases existentes de acuerdo al tipo
/// </summary>
- /// <param name=3D"type">tipo de la clase</param>
/// <returns>DataTable</returns>
- public DataTable GetClassesFromTypePertinence(int id_entity, int domai=
n)
+ public DataTable GetClassesFromTypePertinence(int idEntity, int domain=
Id)
{
DataTable res;
- res =3D complex.GetClassesFromTypePertinence(id_entity, domain);
+ res =3D complex.GetClassesFromTypePertinence(idEntity, domainId);
return res;
}
=20
@@ -149,13 +148,13 @@
///<summary>Get values from a view for pertinence filtering view.</sum=
mary>
///<param name=3D"viewId">The Id of the view that is doing the filteri=
ng</param>
///<param name=3D"idClassView">The class that the view is asociated wi=
th.</param>
- ///<param name=3D"viewColumn">The column of the filter value.</param>
- ///<param name=3D"viewWhere">The conditions under which the filter wor=
ks.</param>
+ ///<param name=3D"filterValue">The column of the filter value.</param>
+ ///<param name=3D"displayColumn">The conditions under which the filter=
works.</param>
///<returns>The filtering value to be replaced</returns>
public string GetPertinenceFilterValues(int viewId, out int idClassVie=
w, out string filterValue, out string displayColumn)
{
string viewValue;
- int viewColumn;
+ //int viewColumn;
=20
int iniClass =3D (int) ViewConsts.ViewClass;
=09
@@ -218,7 +217,7 @@
/// <summary>
/// Entrega un DataTable con los atributos de un atributo
/// </summary>
- /// <param name=3D"classId">id del atributo</param>
+ /// <param name=3D"attId">id del atributo</param>
/// <returns>DataTable</returns>
public DataTable GetAttributesFromAttribute(int attId)
{
@@ -280,7 +279,7 @@
Humano2.Components.ViewTools.ViewTools vt =3D new ViewTools.ViewTo=
ols();
vt.Complex =3D complex;
=09
- DataTable table =3D getViewToolsTable();
+ //DataTable table =3D getViewToolsTable();
=20
// Get the id_entity and the domainName of all the domains in the sys=
tem.
string columns =3D "1012,1013,1014,1015,1016,1017,1018";
@@ -319,11 +318,11 @@
///<param name=3D"iniClass">The class that the DataTable's View sho=
uld act on.</param>
///<param name=3D"order">The ViewTools formated string with the ord=
er.</param>
///<param name=3D"page">The page that should be shown.</param>
- ///<param name=3D"keyFlag">The key Flag to use (0: for group by,=
1: without group)</param>
- ///<param name=3D"pageCount">The Number of pages of this view.</par=
am>
+ ///<param name=3D"keyFlag">The key Flag to use (0: for group=
by,1: without group)</param>
+
///<returns>The datatable that is the result of executing the view.=
</returns>
public DataTable ExecViewFromDataTable(int iniClass, DataTable vtTa=
ble, int idEntity, string order,=20
- int page, int keyFlag)
+ int page, int keyFlag)
{
// We got the data.. Do the viewTools invocation with the data.
Humano2.Components.ViewTools.ViewTools vt =3D new Humano2.Components.=
ViewTools.ViewTools(iniClass);
@@ -659,7 +658,7 @@
{
//Creo las estructuras para poder llamar a viewTools
DataTable table =3D getViewToolsTable();
- ArrayList row =3D new ArrayList();
+ //ArrayList row =3D new ArrayList();
=20
ViewTools.ViewTools vt =3D new ViewTools.ViewTools();
=20
@@ -705,7 +704,7 @@
{
//Creo las estructuras para poder llamar a viewTools
DataTable table =3D getViewToolsTable();
- ArrayList row =3D new ArrayList();
+ //ArrayList row =3D new ArrayList();
=20
ViewTools.ViewTools vt =3D new ViewTools.ViewTools();
=20
@@ -848,7 +847,7 @@
///<param name=3D"userId">The Id of the user.</param>
///<param name=3D"email">The email of the user name. In Humano2 the em=
ail is the login name</param>
///<param name=3D"pass">The password of the user</param>
- ///<param name=3D"domains">List of Ids that the user is subscribed to<=
/param>
+ ///<param name=3D"domainIds">List of Ids that the user is subscribed t=
o</param>
public void UpdateUser(int userId, string email, string pass, ArrayLis=
t domainIds)=20
{
DataSet ds =3D prepareUserData(userId, email, pass, domainIds);
@@ -934,7 +933,7 @@
return ds; =09
}
=09
- #region Read's Structural and Data
+ #region Reads Structural and Data
=20
/// <summary>
/// Lee la estructura de una entity (Instancia)
@@ -1035,9 +1034,9 @@
=20
/// <summary>
/// To get the class name by its id
- /// <param name=3D"classId">The id of the class</name>
- /// <returns>The name of class</returns>
/// </summary>
+ /// <param name=3D"classId">The id of the class</param>
+ /// <returns>The name of class</returns>
public string GetClassNameById(int classId)
{
=20
@@ -1113,7 +1112,7 @@
=20
//Creo las estructuras para poder llamar a viewTools
DataTable table =3D this.getViewToolsTable();
- ArrayList row =3D new ArrayList();
+ //ArrayList row =3D new ArrayList();
=20
ViewTools.ViewTools vt =3D new ViewTools.ViewTools();
=20
@@ -1165,7 +1164,7 @@
{
//Creo las estructuras para poder llamar a viewTools
DataTable table =3D this.getViewToolsTable();
- ArrayList row =3D new ArrayList();
+ //ArrayList row =3D new ArrayList();
=20
ViewTools.ViewTools vt =3D new ViewTools.ViewTools();
=20
@@ -1275,13 +1274,14 @@
///<remarks>better to do this seperately so we can better control what=
get's changed.</remarks>
///<param name=3D"classId">The id of the class to update</param>
///<param name=3D"domainId">The domain of the user</param>
- ///<param name=3D"domainId">the data for the update</param>
+ ///<param name=3D"className">the data for the update</param>
public void UpdateClass(int classId, int domainId, string className)
{ =09
Logger.Log("UpdateClass: changing classId " + classId + " name is now=
: " + className, LogLevel.Trace);
complex.UpdateClass(classId, domainId, className);
}
=09
+ /// <summary>
/// Method create
/// </summary>
/// <param name=3D"id_entity">An int</param>
@@ -1397,9 +1397,9 @@
}
=20
/// <summary>Marks one attribute of a class as obligatory.</summary=
>
- /// <param name=3D"primaryId">The id of the attribute that is to be=
primary.</summary>
- /// <param name=3D"classId">The class of the attribute</summary>
- /// <param name=3D"domainId">The domain Id of the class.</summary>
+ /// <param name=3D"primaryId">The id of the attribute that is to be=
primary.</param>
+ /// <param name=3D"classId">The class of the attribute</param>
+ /// <param name=3D"domainId">The domain Id of the class.</param>
public void SetAttributeAsPrimary(int primaryId, int classId, int d=
omainId)
{
// Remove the isPrimary label from all attributes. =20
@@ -1495,8 +1495,7 @@
/// Cambia los attributos de un view.
/// </summary>
/// <param name=3D"idEntity">An int</param>
- /// <param name=3D"idClass">An int</param>
- /// <param name=3D"viewName">A string</param>
+ /// <param name=3D"classId">An int</param>
/// <param name=3D"idDomain">An int</param>
/// <param name=3D"mode">An int</param>
public void ChangeAttributesOfView(int idEntity, int classId, int idDo=
main, int mode)
@@ -1817,7 +1816,6 @@
=20
DataTable res =3D GetAttributesFromClass(classId);
int idAtt =3D 0;
- int i=3D0;
foreach(DataRow row in res.Rows)
{
if(complex.IsPrimary(Convert.ToInt32(row["id_entity"])))
Modified: humano2/trunk/components/webTools/session.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/webTools/session.cs 2005-05-27 15:50:51 UTC =
(rev 1164)
+++ humano2/trunk/components/webTools/session.cs 2005-05-27 16:23:01 UTC =
(rev 1165)
@@ -128,7 +128,6 @@
{
value.lastAccess =3D DateTime.Now;
string key;
- int i =3D 1;
=20
//Tomo el mutex para no repetir key's
mutexKey.WaitOne();
Modified: humano2/trunk/components/webTools/xmltools.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/webTools/xmltools.cs 2005-05-27 15:50:51 UTC=
(rev 1164)
+++ humano2/trunk/components/webTools/xmltools.cs 2005-05-27 16:23:01 UTC=
(rev 1165)
@@ -60,10 +60,10 @@
///Do an XSLT transform with an xml string and an System=
.Xml.Xsl.XslTransform object
///</summary>
///<param name=3D'strXML'>The string of the xml document=
</param>
- ///<param name=3D'strXSLURL'>The url of the xsl</param>
+ ///<param name=3D'xsl'>The url of the xsl</param>
///<param name=3D'Response'>The html response object to =
send exception if needed</param>
///<returns>The result of transformation</returns>
- private static string TransformXML(string strXML, System=
.Xml.Xsl.XslTransform xsl,System.Web.HttpResponse Response)
+ private static string TransformXML(string strXML, System=
.Xml.Xsl.XslTransform xsl, System.Web.HttpResponse Response)
{
=20
//Logger.Log("Result of transformation: " + strX=
ML, LogLevel.Trace);
@@ -77,7 +77,7 @@
catch (System.Exception e)
{
//Put in custom error handler here...
- string x =3D e.ToString();
+ //string x =3D e.ToString();
//Response.Write(x);
}
=20
Modified: humano2/trunk/core/db/absComplex.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/core/db/absComplex.cs 2005-05-27 15:50:51 UTC (rev 1164=
)
+++ humano2/trunk/core/db/absComplex.cs 2005-05-27 16:23:01 UTC (rev 1165=
)
@@ -194,10 +194,9 @@
abstract public DataTable GetViewData(int viewId);
=20
///<summary>Get the structure of a report.</summary>
- ///<param name=3D"viewId">The id of the report.</param>
+ ///<param name=3D"reportId">The id of the report.</param>
///<returns>a datatable with the information about the report.</return=
s>
abstract public DataTable GetReportData(int reportId);
- =09
=20
///<summary>gets all the formulas that are related to attribtes of =
a class</summary>
///<param name=3D"classId">The Id of fthe class</param>
@@ -330,38 +329,38 @@
abstract public void finalImport(string [,] attsArr, DataSet dsAtts, s=
tring tableName, int domainId, int classId);
=20
/// <summary>
- /// Get the string id of the pertinence attribute an attribute is rela=
ted to
- /// <param name=3D"attribute">The attribute for which we want th=
e pertinence attribute related to
+ /// Get the string id of the pertinence attribute an attribute is relat=
ed to
/// </summary>
- /// <return>The attribute of the pertinence attribute or "" if a=
ttributeId is not a pertinence attribute</returns>
+ /// <param name=3D"attributeId">The attribute for which we want =
the pertinence attribute related to</param>
+ /// <returns>The attribute of the pertinence attribute or "" if =
attributeId is not a pertinence attribute</returns>
abstract public string GetPertinenceForAttribute(string attribut=
eId);
=20
/// <summary>
- /// Converts a system attribute name into a user attribute name
+ /// Converts a system attribute name into a user attribute name
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>user attribute name</returns>
+ /// <returns>user attribute name</returns>
abstract public string ConvertSysAttNameToUserAttName(string sys=
AttName);
=20
/// <summary>
/// Converts a system attribute name into its id
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param>
- /// <return>id of attribute</returns>
+ /// <returns>id of attribute</returns>
abstract public int ConvertSysAttNameToIdAttName(string sysAttName);
=20
/// <summary>
/// Tells if an attribute is primary=20
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>true if attribute is primary</returns>
+ /// <returns>true if attribute is primary</returns>
abstract public bool IsPrimary(string sysAttName);
=20
/// <summary>
- /// Tells if an attribute is primary=20
+ /// Tells if an attribute is primary=20
/// </summary>
- /// <param name=3D"sysAttName">id of attribute </param>
- /// <return>true if attribute is primary</returns>
+ /// <param name=3D"attId">id of attribute </param>
+ /// <returns>true if attribute is primary</returns>
abstract public bool IsPrimary(int attId);
=20
abstract public bool IsSelfLookUp(string sysAttName);
@@ -370,22 +369,23 @@
/// Get the params (where, orderby etc...) of a view
/// </summary>
/// <param name=3D"id">id of view</param>
- /// <return>true if attribute is primary</returns>
+ /// <returns>true if attribute is primary</returns>
abstract public string [] GetParamsView(int id);
=20
/// <summary>
- /// Get the params (where, orderby etc...) of a report
+ /// Get the params (where, orderby etc...) of a report
/// </summary>
/// <param name=3D"id">id of report</param>
- /// <return>params of the report</returns>
+ /// <returns>params of the report</returns>
abstract public string [] GetParamsReport(int id);
=20
=20
///<summary>
- /// Returns the name of the basic attribute (numeric, textline..=
.) father of an attribute passed in param
+ /// Returns the name of the basic attribute (numeric, textline..=
.) father of an attribute passed in param =20
+ ///</summary>
/// <param name=3D"classId">The classId of an attribute</param>
/// <returns>the sys name of basic attribute</returns>
- ///</summary>
+
abstract public string GetBasicAttributeSysName(int classId);
=20
=20
Modified: humano2/trunk/core/db/absCrud.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/core/db/absCrud.cs 2005-05-27 15:50:51 UTC (rev 1164)
+++ humano2/trunk/core/db/absCrud.cs 2005-05-27 16:23:01 UTC (rev 1165)
@@ -461,8 +461,9 @@
dr["parentId"]=3D navTableId;
dr["parentPertinence"]=3D pertAttId;
dt.Rows.Add(dr);
- int toColumn =3D Create((int) MetaModelConsts.EntitiesPertinence, dt)=
;
=20
+ Create((int) MetaModelConsts.EntitiesPertinence, dt);
+
// Update the pertinence, pointing the owner to the navTable.
updatePertinenceNM(pertAttId, navTableId, fromColumn);
}
Modified: humano2/trunk/core/db/mssql/mssqlComplex.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/core/db/mssql/mssqlComplex.cs 2005-05-27 15:50:51 UTC (=
rev 1164)
+++ humano2/trunk/core/db/mssql/mssqlComplex.cs 2005-05-27 16:23:01 UTC (=
rev 1165)
@@ -88,7 +88,7 @@
}
=20
///<summary>Get the structure of a report.</summary>
- ///<param name=3D"viewId">The id of the report.</param>
+ ///<param name=3D"reportId">The id of the report.</param>
///<returns>a datatable with the information about the report.</return=
s>
public override DataTable GetReportData(int reportId)=20
{
@@ -159,9 +159,10 @@
/// <summary>
/// Entrega un DataTable con las clases existentes de acuerdo al tipo
/// </summary>
- /// <param name=3D"type">tipo de la clase</param>
+ /// <param name=3D"idEntity">Id del pertience cual estamos buscando re=
laciones.</param>
+ /// <param name=3D"domainId">Id del dominio de los elementos</param>
/// <returns>DataTable</returns>
- public override DataTable GetClassesFromTypePertinence(int id_entity, =
int domain)
+ public override DataTable GetClassesFromTypePertinence(int idEntity, i=
nt domainId)
{
string query;
DataTable res;
@@ -170,14 +171,14 @@
c.id_entity,
c.name,
(select ""ratio"" from pertinence p, entity en
- where p.""to"" =3D c.id_entity and p.id_ent=
ity =3D " + id_entity.ToString() + @" and
+ where p.""to"" =3D c.id_entity and p.id_ent=
ity =3D " + idEntity + @" and
en.id_entity =3D p.id_entity and en.""delDate"" is null) as r=
atio
from class c, entity e
where
c.id_entity =3D e.id_entity and
c.""isHidden"" =3D '0' and
e.""delDate"" is null and
- e.""domainId"" in (" + domain.ToString() + @", 10) order by c.""c=
lassType"" DESC, c.name";
+ e.""domainId"" in (" + domainId + @", 10) order by c.""classType"=
" DESC, c.name";
=09
res =3D this.doSelect(query);
return res;
@@ -900,10 +901,10 @@
}
=20
/// <summary>
- /// Get the string id of the pertinence attribute an attribute is rela=
ted to
+ /// Get the string id of the pertinence attribute an attribute is relat=
ed to
/// </summary>
- /// <param name=3D"attribute">The attribute for which we want th=
e pertinence attribute related to</param>
- /// <return>The attribute of the pertinence attribute or "" if a=
ttributeId is not a pertinence attribute</returns>
+ /// <param name=3D"attributeId">The attribute for which we want =
the pertinence attribute related to</param>
+ /// <returns>The attribute of the pertinence attribute or "" if =
attributeId is not a pertinence attribute</returns>
override public string GetPertinenceForAttribute(string attribut=
eId)
{
string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ")";
@@ -920,10 +921,10 @@
}
=20
/// <summary>
- /// Converts a system attribute name into a user attribute name
+ /// Converts a system attribute name into a user attribute name
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>user attribute name</returns>
+ /// <returns>user attribute name</returns>
override public string ConvertSysAttNameToUserAttName(string sys=
AttName)
{
string req =3D "select \"attName\" from attribute where \"sy=
sAttName\" =3D '" + sysAttName +"'";
@@ -944,7 +945,7 @@
/// Tells if an attribute is primary=20
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>true if attribute is primary</returns>
+ /// <returns>true if attribute is primary</returns>
override public bool IsPrimary(string sysAttName)
{
string req =3D "select \"isPrimary\" from attribute where \"=
sysAttName\" =3D '" + sysAttName + "'";
@@ -968,8 +969,8 @@
/// <summary>
/// Tells if an attribute is primary=20
/// </summary>
- /// <param name=3D"sysAttName">id of attribute </param>
- /// <return>true if attribute is primary</returns>
+ /// <param name=3D"attId">id of attribute </param>
+ /// <returns>true if attribute is primary</returns>
override public bool IsPrimary(int attId)
{
string req =3D "select \"isPrimary\" from attribute where \"=
id_entity\" =3D '" + attId + "'";
@@ -1016,7 +1017,7 @@
/// Get the params (where, orderby etc...) of a view
/// </summary>
/// <param name=3D"id">id of view</param>
- /// <return>true if attribute is primary</returns>
+ /// <returns>true if attribute is primary</returns>
override public string [] GetParamsView(int id)
{
string idStr =3D Convert.ToString(id);
@@ -1043,7 +1044,7 @@
/// Get the params (where, orderby etc...) of a report
/// </summary>
/// <param name=3D"id">id of report</param>
- /// <return>params of the report</returns>
+ /// <returns>params of the report</returns>
override public string [] GetParamsReport(int id)
{
string idStr =3D Convert.ToString(id);
@@ -1087,7 +1088,7 @@
foreach(DataRow dRow in tmpTable.Rows)
{
int attribClass =3D Convert.ToInt32(dRow[classIdCol[0]]);
- string colname =3D dRow[classIdCol[0]].ToString();
+ //string colname =3D dRow[classIdCol[0]].ToString();
string classTable =3D getTableName(attribClass);
switch (classId)
{
Modified: humano2/trunk/core/db/mssql/mssqlConnection.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/core/db/mssql/mssqlConnection.cs 2005-05-27 15:50:51 UT=
C (rev 1164)
+++ humano2/trunk/core/db/mssql/mssqlConnection.cs 2005-05-27 16:23:01 UT=
C (rev 1165)
@@ -255,11 +255,11 @@
=09
tgtTable.TableName =3D fillTable;
tgtTable =3D srcTable.Copy( );
- SqlCommandBuilder SqlCB =3D new SqlCommandBuilder( da );
+ //SqlCommandBuilder SqlCB =3D new SqlCommandBuilder( da );
da.Fill( tgtTable );
tgtTable =3D srcTable.Copy( );
ds.Tables.Add( tgtTable );
- string strXml =3D ds.GetXml( );
+ //string strXml =3D ds.GetXml( );
da.Update( tgtTable );
Close();
}
Modified: humano2/trunk/core/db/mssql/mssqlCrud.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/core/db/mssql/mssqlCrud.cs 2005-05-27 15:50:51 UTC (rev=
1164)
+++ humano2/trunk/core/db/mssql/mssqlCrud.cs 2005-05-27 16:23:01 UTC (rev=
1165)
@@ -94,15 +94,15 @@
idList.AddRange( Inh );
=09
//Verifico cual es el id de la clase base.
- int idParent;
+ //int idParent;
if( Inh.Length =3D=3D 0 )
{
- idParent =3D idEntity;
+ //idParent =3D idEntity;
idList.AddRange( getInheritanceOfType( idEntity ) );
}
else
{
- idParent =3D Inh[0];
+ //idParent =3D Inh[0];
}
=09
=09
@@ -344,15 +344,15 @@
idList.AddRange( Inh );
=09
//Verifico cual es el id de la clase base.
- int idParent;
+ //int idParent;
if( Inh.Length =3D=3D 0 )
{
- idParent =3D idEntity;
+ //idParent =3D idEntity;
idList.AddRange( getInheritanceOfType( idEntity ) );
}
else
{
- idParent =3D Inh[0];
+ //idParent =3D Inh[0];
}
=09
=09
Modified: humano2/trunk/core/db/pgsql/pgsqlComplex.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/core/db/pgsql/pgsqlComplex.cs 2005-05-27 15:50:51 UTC (=
rev 1164)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-27 16:23:01 UTC (=
rev 1165)
@@ -88,8 +88,8 @@
return res; =09
}
=09
- ///<summary>Get the structure of a report.</summary>
- ///<param name=3D"viewId">The id of the report.</param>
+ ///<summary>Get the structure of a report.</summary>
+ ///<param name=3D"reportId">The id of the report.</param>
///<returns>a datatable with the information about the report.</return=
s>
public override DataTable GetReportData(int reportId)=20
{
@@ -164,9 +164,10 @@
/// <summary>
/// Entrega un DataTable con las clases existentes de acuerdo al tipo
/// </summary>
- /// <param name=3D"type">tipo de la clase</param>
+ /// <param name=3D"idEntity">Id del pertience cual estamos buscando re=
laciones.</param>
+ /// <param name=3D"domainId">Id del dominio de los elementos</param>
/// <returns>DataTable</returns>
- public override DataTable GetClassesFromTypePertinence(int id_entity, =
int domain)
+ public override DataTable GetClassesFromTypePertinence(int idEntity, i=
nt domainId)
{
string query;
DataTable res;
@@ -175,14 +176,14 @@
c.id_entity,
c.name,
(select ""ratio"" from pertinence p, entity en
- where p.""to"" =3D c.id_entity and p.id_ent=
ity =3D " + id_entity.ToString() + @" and
+ where p.""to"" =3D c.id_entity and p.id_ent=
ity =3D " + idEntity + @" and
en.id_entity =3D p.id_entity and en.""delDate"" is null) as r=
atio
from class c, entity e
where
c.id_entity =3D e.id_entity and
c.""isHidden"" =3D 'f' and
e.""delDate"" is null and
- e.""domainId"" in (" + domain.ToString() + @", 10) order by c.""c=
lassType"" DESC, c.name";
+ e.""domainId"" in (" + domainId + @", 10) order by c.""classType"=
" DESC, c.name";
=09
res =3D this.doSelect(query);
return res;
@@ -944,8 +945,8 @@
/// <summary>
/// Get the string id of the pertinence attribute an attribute is rela=
ted to
/// </summary>
- /// <param name=3D"attribute">The attribute for which we want th=
e pertinence attribute related to</param>
- /// <return>The attribute of the pertinence attribute or "" if a=
ttributeId is not a pertinence attribute</returns>
+ /// <param name=3D"attributeId">The attribute for which we want =
the pertinence attribute related to</param>
+ /// <returns>The attribute of the pertinence attribute or "" if =
attributeId is not a pertinence attribute</returns>
override public string GetPertinenceForAttribute(string attribut=
eId)
{
string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ")";
@@ -962,10 +963,10 @@
}
=20
/// <summary>
- /// Converts a system attribute name into a user attribute name
+ /// Converts a system attribute name into a user attribute name
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>user attribute name</returns>
+ /// <returns>user attribute name</returns>
override public string ConvertSysAttNameToUserAttName(string sys=
AttName)
{
string req =3D "select \"attName\" from attribute where \"sy=
sAttName\" =3D '" + sysAttName +"'";
@@ -983,10 +984,10 @@
}
=20
/// <summary>
- /// Tells if an attribute is primary=20
+ /// Tells if an attribute is primary=20
/// </summary>
/// <param name=3D"sysAttName">system name for attribute </param=
>
- /// <return>true if attribute is primary</returns>
+ /// <returns>true if attribute is primary</returns>
override public bool IsPrimary(string sysAttName)
{
string req =3D "select \"isPrimary\" from attribute where \"=
sysAttName\" =3D '" + sysAttName + "'";
@@ -1008,10 +1009,10 @@
}
=20
/// <summary>
- /// Tells if an attribute is primary=20
+ /// Tells if an attribute is primary=20
/// </summary>
- /// <param name=3D"sysAttName">id of attribute </param>
- /// <return>true if attribute is primary</returns>
+ /// <param name=3D"attId">id of attribute </param>
+ /// <returns>true if attribute is primary</returns>
override public bool IsPrimary(int attId)
{
string req =3D "select \"isPrimary\" from attribute where \"=
id_entity\" =3D '" + attId + "'";
@@ -1052,14 +1053,13 @@
return IsSelfLookUp;
} =20
/// <summary>
- /// Get the params (where, orderby etc...) of a view
+ /// Get the params (where, orderby etc...) of a view
/// </summary>
- /// <param name=3D"id">id of view</param>
- /// <return>params of view in a array</returns>
- override public string [] GetParamsView(int id)
+ /// <param name=3D"viewId">id of view</param>
+ /// <returns>params of view in a array</returns>
+ override public string [] GetParamsView(int viewId)
{ =20
-
- string idStr =3D Convert.ToString(id);
+ string idStr =3D Convert.ToString(viewId);
string req =3D "select \"groupby\", \"columns\",\"where\",\"=
order\" from view where id_entity=3D" + idStr;
string [] res =3D new string[4];
=20
@@ -1081,13 +1081,13 @@
=20
=20
/// <summary>
- /// Get the params (where, orderby etc...) of a report
+ /// Get the params (where, orderby etc...) of a report
/// </summary>
- /// <param name=3D"id">id of report</param>
- /// <return>params of the report</returns>
- override public string [] GetParamsReport(int id)
+ /// <param name=3D"reportId">id of report</param>
+ /// <returns>params of the report</returns>
+ override public string [] GetParamsReport(int reportId)
{
- string idStr =3D Convert.ToString(id);
+ string idStr =3D Convert.ToString(reportId);
string req =3D "select \"columns\",\"where\",\"order\",\"gr=
oupby\",\"having\",\"idClassReport\" from report where id_entity=3D" + id=
Str;
string [] res =3D new string[6];
=20
@@ -1128,7 +1128,7 @@
foreach(DataRow dRow in tmpTable.Rows)
{
int attribClass =3D Convert.ToInt32(dRow[classIdCol[0]]);
- string colname =3D dRow[classIdCol[0]].ToString();
+ //string colname =3D dRow[classIdCol[0]].ToString();
string classTable =3D getTableName(attribClass);
switch (classId)
{
Modified: humano2/trunk/core/db/pgsql/pgsqlConnection.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/core/db/pgsql/pgsqlConnection.cs 2005-05-27 15:50:51 UT=
C (rev 1164)
+++ humano2/trunk/core/db/pgsql/pgsqlConnection.cs 2005-05-27 16:23:01 UT=
C (rev 1165)
@@ -129,14 +129,14 @@
override public object doScalar(string query)
{
// Cast-down a tipo mas potente.
- object tmpObj;
+ //object tmpObj;
Open();
NpgsqlConnection conn =3D ( (NpgsqlConnection) dbCon );
NpgsqlCommand dbCmd =3D conn.CreateCommand( );
dbCmd.CommandText =3D query;
=09
IDataReader dr;
- try
+ try
{
dr =3D dbCmd.ExecuteReader( );
Close();
@@ -151,7 +151,7 @@
=20
if( dr.Read( ) && !Convert.IsDBNull( dr[0] ) )
{
- tmpObj =3D dr[0];
+ //tmpObj =3D dr[0];
dr.Close();
dbCmd.Dispose();
return dr[0];
@@ -246,11 +246,11 @@
=09
tgtTable.TableName =3D fillTable;
tgtTable =3D srcTable.Copy( );
- NpgsqlCommandBuilder SqlCB =3D new NpgsqlCommandBuilder( da );
+ //NpgsqlCommandBuilder SqlCB =3D new NpgsqlCommandBuilder( da );
da.Fill( tgtTable );
tgtTable =3D srcTable.Copy( );
ds.Tables.Add( tgtTable );
- string strXml =3D ds.GetXml( );
+ //string strXml =3D ds.GetXml( );
da.Update( tgtTable );
Close();
}
Modified: humano2/trunk/core/db/pgsql/pgsqlCrud.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/core/db/pgsql/pgsqlCrud.cs 2005-05-27 15:50:51 UTC (rev=
1164)
+++ humano2/trunk/core/db/pgsql/pgsqlCrud.cs 2005-05-27 16:23:01 UTC (rev=
1165)
@@ -97,15 +97,15 @@
idList.AddRange( Inh );
=09
//Verifico cual es el id de la clase base.
- int idParent;
+ //int idParent;
if( Inh.Length =3D=3D 0 )
{
- idParent =3D idEntity;
+ //idParent =3D idEntity;
idList.AddRange( getInheritanceOfType( idEntity ) );
}
else
{
- idParent =3D Inh[0];
+ //idParent =3D Inh[0];
}
=09
=09
@@ -344,15 +344,15 @@
idList.AddRange( Inh );
=09
//Verifico cual es el id de la clase base.
- int idParent;
+ //int idParent;
if( Inh.Length =3D=3D 0 )
{
- idParent =3D idEntity;
+ //idParent =3D idEntity;
idList.AddRange( getInheritanceOfType( idEntity ) );
}
else
{
- idParent =3D Inh[0];
+ //idParent =3D Inh[0];
}
=09
=09
Modified: humano2/trunk/core/tests/mdPertinenceTests.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/core/tests/mdPertinenceTests.cs 2005-05-27 15:50:51 UTC=
(rev 1164)
+++ humano2/trunk/core/tests/mdPertinenceTests.cs 2005-05-27 16:23:01 UTC=
(rev 1165)
@@ -46,7 +46,7 @@
string[] pertNamesTable =3D {"attName", "classId", "to", "ratio"=
};
object[] pertValuesTable=3D {"Trabajo", persId , empresaId, "n:1"};
DataTable dt =3D utils.buildTable(pertNamesTable, pertValuesTable);
- int trabID =3D crud.Create((int) MetaModelConsts.EntitiesPertinence, =
dt);
+ crud.Create((int) MetaModelConsts.EntitiesPertinence, dt); // int tra=
bID
}
=20
[Test]
@@ -156,13 +156,13 @@
string[] accRelNamesTable =3D {"attName","classId", "to", "ratio"=
};
object[] accRelValuesTable=3D {"access" ,navId, accessId, "n:1"};
dt =3D utils.buildTable(accRelNamesTable, accRelValuesTable);
- int accRelAttId =3D crud.Create((int) MetaModelConsts.EntitiesPertine=
nce, dt);
+ crud.Create((int) MetaModelConsts.EntitiesPertinence, dt); // int acc=
RelAttId
=09
int[] pIds =3D createPersonas(persId);
=09
int[] aIds =3D creaAccessos(accessId);
=09
- int e1Id =3D createNAVEmpresa(empresaId, navId, pIds, aIds);
+ createNAVEmpresa(empresaId, navId, pIds, aIds); // int e1Id
=09
// Console.WriteLine("***** NAV TABLE *****\n\n");
// DbUtils.DumpData(crud.ReadStructure(navId));
@@ -289,7 +289,7 @@
string[] levelNamesTable =3D {"attName", "classId"};
object[] levelValuesTable=3D {"level" , accessId};
dt =3D utils.buildTable(levelNamesTable, levelValuesTable);
- int levelAttId =3D crud.Create((int) testConsts.entityIdTextLine, dt)=
;
+ crud.Create((int) testConsts.entityIdTextLine, dt); // int levelAttId
=09
return accessId;
}
Modified: humano2/trunk/web/builder/site/buildattribute.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/buildattribute.aspx.cs 2005-05-27 15:5=
0:51 UTC (rev 1164)
+++ humano2/trunk/web/builder/site/buildattribute.aspx.cs 2005-05-27 16:2=
3:01 UTC (rev 1165)
@@ -488,7 +488,6 @@
}
=20
int viewClassId;
- string viewColumn;
string viewWhereComplete;
string displayColumn;
string variableName =3D userCred.CoreAdapter.GetPertinenceFilterValu=
es(filterViewId, out viewClassId, out viewWhereComplete, out displayColum=
n);
@@ -754,8 +753,7 @@
string viewStr =3D Convert.ToString( getDataFromSetByIdEntity(pertSe=
t, (int) PertinenceConsts.FilterView) );
if(viewStr !=3D "")=20
{
- int commaIndex =3D -1;
- if( (commaIndex =3D viewStr.IndexOf(',')) =3D=3D -1)
+ if( viewStr.IndexOf(',') =3D=3D -1)
{
tblViewId =3D Convert.ToInt32(viewStr);
}=20
@@ -776,7 +774,6 @@
}
=09
res.Append(@"<select name=3D""to"" class=3D""pbttn"" onchange=3D""relo=
adPermClass(this.options[this.selectedIndex].value)"">");
- string currRatio =3D "";
foreach(DataRow classRow in dt.Rows) {
int rowClassId =3D Convert.ToInt32(classRow[0]);
string rowClassName =3D Convert.ToString(classRow[1]);
Modified: humano2/trunk/web/builder/site/combobox_type_entity.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/combobox_type_entity.aspx.cs 2005-05-2=
7 15:50:51 UTC (rev 1164)
+++ humano2/trunk/web/builder/site/combobox_type_entity.aspx.cs 2005-05-2=
7 16:23:01 UTC (rev 1165)
@@ -31,9 +31,9 @@
=20
private void Page_Load(object sender, System.EventArgs e)
{
- string strAction =3D "";
+ //string strAction =3D "";
//string type_entity =3D "";
- string strfiltros =3D "";
+ //string strfiltros =3D "";
=20
adapte...
[truncated message content] |
