Specified a different location for the Log File.
Changed code to use log Info Changed code to append error messages rather than replace text Added/Changed code to use Log4Net. Changed logic for Updates to Use IDs rather than Objects for internal Updates Added a FormatColumn token to handle DTS, Added comments to describe tokens Added methods ParentRefU and ParentRefU2 to support otther changes
This commit is contained in:
@@ -300,51 +300,94 @@
|
||||
string relType=RelObjType(column);
|
||||
string suffix = "";//(PropertyName(column)==ClassName(column.Table)?"Fld":"");
|
||||
s=s.Replace("{member}",MemberName(column)+suffix);//m - Member _firstname
|
||||
//member _DocID
|
||||
s=s.Replace("{fmember}",(column.Table.Alias==_tableName?"":_prefix + ClassName(column.Table)+sAlias)+MemberName(column)+suffix);//m - Member _firstname
|
||||
//fmember _DocID
|
||||
s=s.Replace("{pmember}",(column.Table.Alias==_tableName?_prefix:LocalName(ClassName(column.Table))+".")+PropertyName(column)+suffix);//m - Member _firstname
|
||||
//pmember _DocID
|
||||
s=s.Replace("{rmember}",LocalName(ClassName(column.Table))+"."+PropertyName(column));//m - Member _firstname
|
||||
//rmember entry.DocID
|
||||
s=s.Replace("{!prop}",relProp);
|
||||
//!prop MyDocument
|
||||
s=s.Replace("{!member}",MemberName(relProp));
|
||||
//!member _MyDocument
|
||||
// s=s.Replace("{!membercolumn}",MemberName(relProp) + (IsRelObj(column)?"." + RelObjCol(column):""));
|
||||
s=s.Replace("{!membercolumn}",MemberName(relProp) + (IsRelObj(column)?"." + RelObjProp(RelObjCol2(column)):""));
|
||||
//!membercolumn _MyDocument.DocID
|
||||
s=s.Replace("{!local}",LocalName(relProp));
|
||||
//!local myDocument
|
||||
s=s.Replace("{!localcolumn}",LocalName(relProp) + (IsRelObj(column)?"." + RelObjCol(column):""));
|
||||
//!localcolumn myDocument.DocID
|
||||
s=s.Replace("{!type}",relType);
|
||||
//!type Document
|
||||
s=s.Replace("{!rtype}",ReturnType(relType));
|
||||
//!rtype Document
|
||||
s=s.Replace("{!memberprop}",(column.IsInPrimaryKey ? MemberName(relProp) : relProp)+suffix);
|
||||
//!memberprop MyDocument
|
||||
s=s.Replace("{!propmember}",(IsRelObj(column) ? relProp : MemberName(relProp))+suffix);
|
||||
//!propmember MyDocument
|
||||
s=s.Replace("{!column}",RelObjCol(column));
|
||||
//!column DocID
|
||||
s=s.Replace("{!empty}",RelObjEmpty(column));
|
||||
//!empty 0
|
||||
s=s.Replace("{!typecast}",RelObjTypeCast(column));
|
||||
//!typecast
|
||||
s=s.Replace("{local}",LocalName(column)+suffix);//l Local firstname
|
||||
//local docID
|
||||
s=s.Replace("{prop}",PropertyName(column)+suffix);
|
||||
//prop DocID
|
||||
s=s.Replace("{memberprop}",(column.IsInPrimaryKey ? MemberName(column) : PropertyName(column))+suffix);
|
||||
//memberprop DocID
|
||||
s=s.Replace("{@}",ParameterName(column));
|
||||
//@ @DocID
|
||||
s=s.Replace("{@new}",NewParameterName(column));
|
||||
//@new @newDocID
|
||||
string cType = CSLAType(column);
|
||||
s=s.Replace("{ctype}",cType);
|
||||
//ctype int
|
||||
s=s.Replace("{ctype1}",cType.Replace("?",""));
|
||||
//ctype1 int
|
||||
s=s.Replace("{rmember}",ReturnMember(cType));
|
||||
//rmember entry.DocID
|
||||
s=s.Replace("{rtype}",ReturnType(cType));
|
||||
//rtype int
|
||||
// s=s.Replace("{dbtype}",LocalName(column));
|
||||
s=s.Replace("{dtype}",DBType(column));
|
||||
//dtype int
|
||||
s=s.Replace("{name}",column.Name);
|
||||
//name DocID
|
||||
s=s.Replace("{class}",ClassName(column.Table));
|
||||
//class Entry
|
||||
s=s.Replace("{fname}",(column.Table.Alias==_tableName?"":ClassName(column.Table)+sAlias+"_")+column.Name);
|
||||
//fname DocID
|
||||
s=s.Replace("{sqltype}",column.DbTargetType);
|
||||
//sqltype SqlDbType.Int
|
||||
s=s.Replace("{?ref}",(column.IsComputed || column.IsAutoKey ? "ref " : ""));
|
||||
//?ref
|
||||
s=s.Replace("{?dbtype}",(CSLAType( column )=="SmartDate" ? ".DBValue" : ""));
|
||||
//?dbtype
|
||||
s=s.Replace("{?dbprefix}",(CSLAType( column )=="SmartDate" ? "new SmartDate(" : ""));
|
||||
//?dbprefix
|
||||
s=s.Replace("{?dbsuffix}",(CSLAType( column )=="SmartDate" ? ").DBValue" : ""));
|
||||
//?dbsuffix
|
||||
s=s.Replace("{?dbsuff}",(CSLAType( column )=="SmartDate" ? ")" : ""));
|
||||
//?dbsuff
|
||||
s=s.Replace("{default}",DefaultValue(column));
|
||||
//default
|
||||
s=s.Replace("{?output}",(column.IsComputed || column.IsAutoKey ? " output" : ""));
|
||||
//?output
|
||||
s=s.Replace("{@key}",ParamKeyName(column));
|
||||
//@key @DocID
|
||||
s=s.Replace("{tbl}",column.Table.Name + sAlias);
|
||||
//tbl Entries
|
||||
s=s.Replace("{?null}",(column.IsNullable?"=null":""));
|
||||
//?null
|
||||
s=s.Replace("{parent}",parentName(column));
|
||||
//parent myDocument.DocID
|
||||
s=s.Replace("{Parent}",ParentName(column));
|
||||
//Parent DocID
|
||||
s=s.Replace("{ParentType}",ParentTypeName(column));
|
||||
//ParentType */
|
||||
s=s.Replace("{autoseed}",AutoSeed(column));
|
||||
if(s.Contains("{ifLogic"))
|
||||
{
|
||||
@@ -363,6 +406,7 @@
|
||||
break;
|
||||
}
|
||||
s=s.Replace("{ifLogicL}",ifLogic.Replace("{name}",FormatColumnNew("{!local}{?dbtype}",column,sAlias)));
|
||||
s=s.Replace("{ifLogicl}",ifLogic.Replace("{name}",FormatColumnNew("{!local}{?dbtype}",column,sAlias)));
|
||||
s=s.Replace("{ifLogicP}",ifLogic.Replace("{name}",FormatColumnNew("{?dbprefix}{member}{?dbsuffix}",column,sAlias)));
|
||||
s=s.Replace("{ifLogic@}",ifLogic.Replace("{name}",FormatColumnNew("criteria.{prop}{?dbtype}",column,sAlias)));
|
||||
//string name = FormatColumnNew("{local}{?dbtype}",column,sAlias);
|
||||
|
Reference in New Issue
Block a user