Cleanup

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs

@@ -64,12 +64,8 @@ namespace ICSharpCode.Reports.Addin
 		Description("Draw a Border around the Item")]
 		public bool DrawBorder {get;set;}
 		
-		
 		protected new Size DefaultSize {get;set;}
 			
-		
-		
-		
 		public  bool VisibleInReport {get;set;}
 		
 		#endregion

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs

@@ -110,7 +110,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		
 		#region Properties
-//		public bool Visible {get;set;}
+		public bool Visible {get;set;}
 		
 		public  bool VisibleInReport {get;set;}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs

@@ -148,11 +148,11 @@ namespace ICSharpCode.Reports.Core
 
 //			resultSize.Width = double.IsPositiveInfinity(availableSize.Width) ?
 //				resultSize.Width : availableSize.Width;
-//			
+//
 //			resultSize.Height = double.IsPositiveInfinity(availableSize.Height) ?
 //				resultSize.Height : availableSize.Height;
 			
-				resultSize.Width = double.IsPositiveInfinity(availableSize.Width) ?
+			resultSize.Width = double.IsPositiveInfinity(availableSize.Width) ?
 				resultSize.Width : availableSize.Width;
 			var b = double.IsPositiveInfinity(availableSize.Height);
 			resultSize.Height = double.IsPositiveInfinity(availableSize.Height) ?

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs

@@ -200,6 +200,8 @@ namespace ICSharpCode.Reports.Core {
 		
 		#endregion
 		
+	
+		#region Fill
 		
 		public override void Fill(int position,ReportItemCollection collection)
 		{
@@ -210,6 +212,11 @@ namespace ICSharpCode.Reports.Core {
             }
 		}
 	
+		public override void Fill(IDataItem item)
+		{
+			FillInternal(Current,item);
+		}
+		
 		
 		private void FillInternal(object fillFrom,IDataItem item)
 		{
@@ -248,67 +255,6 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		/*
-		private void FillInternal(object fillFrom,IDataItem item)
-		{
-			if (item is BaseDataItem)
-			{
-				var retVal = FollowPropertyPath(fillFrom,item.ColumnName);
-				if (retVal != null) {
-					item.DBValue = retVal.ToString();
-				} else {
-					item.DBValue = String.Empty;
-				}
-			}
-			
-			else
-			{
-				//image processing from IList
-				BaseImageItem baseImageItem = item as BaseImageItem;
-				
-				if (baseImageItem != null) {
-					PropertyDescriptor p = this.listProperties.Find(baseImageItem.ColumnName, true);
-					if (p != null) {
-						baseImageItem.Image = p.GetValue(this.Current) as System.Drawing.Image;
-					}
-					return;
-				}
-				
-			}
-		}
-		*/
-		
-		public override void Fill(IDataItem item)
-		{
-			FillInternal(Current,item);
-		}
-		
-		#region PropertyPath from StackOverflow
-	
-		//http://stackoverflow.com/questions/366332/best-way-to-get-sub-properties-using-getproperty
-		
-		/*
-		private static  object FollowPropertyPath(object value, string path)
-		{
-			Type currentType = value.GetType();
-			foreach (string propertyName in path.Split('.'))
-			{
-				
-				PropertyInfo property = currentType.GetProperty(propertyName);
-				
-				if (property != null) {
-					
-					value = property.GetValue(value, null);
-					currentType = property.PropertyType;
-				} else {
-					
-					return WrongColumnName(path);
-				}
-			}
-			return value;
-		}
-		*/
-		
 		#endregion
 			
 		static string  WrongColumnName(string propertyName)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@@ -64,8 +64,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 			if (this.EvaluatorFacade == null)
 			{
-				Console.WriteLine ("");
-				Console.WriteLine ("InitNewPage create evaluator");
 				EvaluatorFacade = EvaluationHelper.CreateEvaluator(SinglePage,SinglePage.IDataNavigator);
 			}
 			EvaluatorFacade.SinglePage = this.SinglePage;
@@ -182,7 +180,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (section.Items.Count > 0)
 			{
 				Size sectionSize = section.Size;
-				Console.WriteLine ("BasePager-createEval for {0}",section.Name);
 				IExpressionEvaluatorFacade evaluator = EvaluationHelper.CreateEvaluator(this.SinglePage,this.SinglePage.IDataNavigator);
 
 				Rectangle desiredRectangle = LayoutHelper.CalculateSectionLayout(this.Graphics,section);
@@ -309,40 +306,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (this.Pages.Count == 0) {
 				return;
 			}
-			Console.WriteLine ("FinishRendereing create IExpressionEvaluatorFacade");
-			
-			//IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(this.SinglePage);
-			//Evaluator.SinglePage = this.SinglePage;
 			foreach (ExporterPage page in this.pages)
 			{
 				page.TotalPages = this.Pages.Count;
-//				dataNavigator.Reset();
-//				dataNavigator.MoveNext();
 				page.IDataNavigator = dataNavigator;
 				EvaluatorFacade.SinglePage = page;
 				EvaluateRecursive(EvaluatorFacade,page.Items);
 			}
 		}
 		
-		/*
-		protected  void FinishRendering (IDataNavigator dataNavigator)
-		{
-			if (this.Pages.Count == 0) {
-				return;
-			}
-			Console.WriteLine ("FinishRendereing create IExpressionEvaluatorFacade");
-			
-			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(this.SinglePage);
-			
-			foreach (ExporterPage p in this.pages)
-			{
-				p.TotalPages = this.Pages.Count;
-				p.IDataNavigator = dataNavigator;
-				evaluatorFacade.SinglePage = p;
-				EvaluateRecursive(evaluatorFacade,p.Items);
-			}
-		}
-		*/
 		
 		private static void EvaluateRecursive (IExpressionEvaluatorFacade evaluatorFassade,ExporterCollection items)
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/GapList.cs

@@ -27,9 +27,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 			for (int i = 0; i < section.Items.Count; i++) {
 				GapBetweenItems[i] = CalculateGap(oldItem,section.Items[i]);
 			}
-			for (int i = 0; i < section.Items.Count; i++) {
-				Console.WriteLine(GapBetweenItems[i]);
-			}
 			GapBetweenItems[section.Items.Count] = CalculateLastGap(section);
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/EvaluationHelper.cs

@@ -33,7 +33,6 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 				
 				throw new ArgumentNullException("singlePage");
 			}
-			Console.WriteLine ("EvaluationHelper.CreateEvaluator");
 			singlePage.IDataNavigator = dataNavigator;
 			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(singlePage);
 			return evaluatorFacade;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs

@@ -23,7 +23,6 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		
 		public ExpressionEvaluatorFacade(IPageInfo pageInfo)
 		{
-			Console.WriteLine("Eval-fassade Constr");
 			compiler = new ReportingLanguageCompiler();
 			this.context = new ExpressionContext(null);
 			 context.ResolveUnknownVariable += VariableStore;
@@ -36,18 +35,13 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		public string Evaluate (string expression)
 		{
 			try {
-				
 				string s = EvaluationHelper.ExtractExpressionPart(expression);
+				string r = EvaluationHelper.ExtractResultPart(expression);
 				if (s.Length > 0) {				    
 					this.context.ContextObject = this.SinglePage ;
 					return EvaluateExpression (s);
 				}
 				
-//				if (EvaluationHelper.CanEvaluate(expression)) {
-//					this.context.ContextObject = this.SinglePage;
-//					return EvaluateExpression(expression);
-//				}
-				
 			} catch (Exception e) {
 				expression = e.Message;
 				WriteLogMessage(e);
@@ -72,22 +66,6 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 			return expression;
 		}
 		
-		/*
-		public string Evaluate (string expression, object row)
-		{
-			try {
-				if (EvaluationHelper.CanEvaluate(expression)) {
-					this.context.ContextObject = row;
-					return EvaluateExpression (expression);
-				}
-			} catch (Exception e) {
-				expression = e.Message;
-				WriteLogMessage(e);
-			}
-			
-			return expression;
-		}
-		*/
 		
 		public void Evaluate (IReportExpression expressionItem)
 		{
@@ -100,15 +78,13 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 			} else {
 				expr = expressionItem.Text;
 			}
-			
 			expressionItem.Text = Evaluate(expr);
 		}
 		
 		
-		
 		string EvaluateExpression(string expression)
 		{
-            IExpression compiled = compiler.CompileExpression<string>(expression);
+			IExpression compiled = compiler.CompileExpression<string>(expression);
 			if (compiled != null) {
 				return (compiled.Evaluate(context)).ToString();
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguage.cs

@@ -133,7 +133,9 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 			LUnOp.Rule = Symbol("-")
                               | "!";
 			   
-			FunctionExpression.Rule = QualifiedName + LCb + ExprList.Q() + RCb;
+			FunctionExpression.Rule = QualifiedName + LCb + ExprList.Q() + RCb
+				| QualifiedName + LCb + BinExpr + RCb;
+			
 			
 			QualifiedName.Rule = identifier
 				| QualifiedName + dot + identifier 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs

@@ -54,15 +54,23 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService
 		{
 			if (singlePage.IDataNavigator.CurrentRow > -1)
 			{
-				var dataRow = singlePage.IDataNavigator.GetDataRow;
-				var item = dataRow.Find(variable.VariableName);
-				if (item != null) {
-					retval = item.Value.ToString();
-				} else {
-					retval = GlobalValues.UnkownFunctionMessage(variable.VariableName);
-					WriteLogmessage(variable);
+				try {
+					var dataRow = singlePage.IDataNavigator.GetDataRow;
+					var item = dataRow.Find(variable.VariableName);
+					
+					if (item != null) {
+						retval = item.Value.ToString();
+					} else {
+						retval = GlobalValues.UnkownFunctionMessage(variable.VariableName);
+						WriteLogmessage(variable);
+					}
+					
+					return retval;
+				} catch (Exception e) {
+					Console.WriteLine ("Error in FieldReference.ExtractValueFromSinglePage");
+					Console.WriteLine("IDataNavigator currentrow =  {0} count = {1}",singlePage.IDataNavigator.CurrentRow,singlePage.IDataNavigator.Count);
+					throw e;
 				}
-				return retval;
 			}
 			return variable.VariableName;
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RendererFactory.cs

@@ -29,7 +29,7 @@ namespace ICSharpCode.Reports.Core
 			
 			if (t.Equals(typeof(BaseRowItem))) {
 //				return new GroupedRowConverter (dataNavigator,singlePage,layouter);
-				Console.WriteLine("render Row");
+//				Console.WriteLine("render Row");
 			}
 			return null;
 		}