[Compiere-cvslog] CVS: base/src/org/compiere/report MReportSource.java,1.4,1.5

[Jorg J. <jj...@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/report
In directory sc8-pr-cvs1:/tmp/cvs-serv27203/src/org/compiere/report

Modified Files:
	MReportSource.java 
Log Message:
.

Index: MReportSource.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/report/MReportSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MReportSource.java	15 Mar 2003 07:02:38 -0000	1.4
--- MReportSource.java	21 May 2003 02:30:49 -0000	1.5
***************
*** 134,138 ****
  			tree = MTree.getTree (TreeType);
  			Log.trace(Log.l4_Data, "MReportSource.getWhereClause - create tree for " + TreeType, tree);
! 			s_trees.put(et, tree);
  		}
  		//	Search in Tree
--- 134,139 ----
  			tree = MTree.getTree (TreeType);
  			Log.trace(Log.l4_Data, "MReportSource.getWhereClause - create tree for " + TreeType, tree);
! 			/** @todo Disable Cache for now */
! 		//	s_trees.put(et, tree);
  		}
  		//	Search in Tree
***************
*** 140,148 ****
  		{
  			MTreeNode node = tree.getRoot().findNode(ID);
  			if (node != null && node.isSummary())
  			{
  				StringBuffer sb = new StringBuffer();
  				Enumeration en = node.preorderEnumeration();
- 			//	System.out.println("Parent=" + node);
  				while (en.hasMoreElements())
  				{
--- 141,150 ----
  		{
  			MTreeNode node = tree.getRoot().findNode(ID);
+ 			/** @todo remove Print Tree debug */
+ 			System.out.println("Root=" + node);
  			if (node != null && node.isSummary())
  			{
  				StringBuffer sb = new StringBuffer();
  				Enumeration en = node.preorderEnumeration();
  				while (en.hasMoreElements())
  				{
***************
*** 153,160 ****
  							sb.append (",");
  						sb.append(nn.getID());
! 					//	System.out.println("- " + nn);
  					}
! 				//	else
! 				//		System.out.println("- (" + nn + ")");
  				}
  				return new StringBuffer (ColumnName).append(" IN (").append(sb).append(")").toString();
--- 155,163 ----
  							sb.append (",");
  						sb.append(nn.getID());
! 						// temp debug
! 						System.out.println(" - " + nn);
  					}
! 					else
! 						System.out.println(" - skipped parent (" + nn + ")");
  				}
  				return new StringBuffer (ColumnName).append(" IN (").append(sb).append(")").toString();