ruper2/src/java/core/org/krysalis/ruper/query DefaultQueryEngine.java,1.2,1.3 ResourceQuery.java,1.5,1.6

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query
In directory sc8-pr-cvs1:/tmp/cvs-serv17387/src/java/core/org/krysalis/ruper/query

Modified Files:
	DefaultQueryEngine.java ResourceQuery.java 
Log Message:
Some pretttiness on output
Working on the ant task some more.

Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/DefaultQueryEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultQueryEngine.java	11 Sep 2003 16:29:58 -0000	1.2
--- DefaultQueryEngine.java	12 Sep 2003 13:28:23 -0000	1.3
***************
*** 31,39 ****
  	public ResourceResult query(List wrappers, ResourceQuery query)
  		throws RuperException {
! 			
! 		
  		DebugUtils.dump(query);
! 			
! 			
  		List results = new ArrayList();
  
--- 31,37 ----
  	public ResourceResult query(List wrappers, ResourceQuery query)
  		throws RuperException {
! 
  		DebugUtils.dump(query);
! 
  		List results = new ArrayList();
  
***************
*** 50,54 ****
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
  			try {
! 				Logger.getLog().debug(Messages.getString(MessageConstants.SEARCH_REPOSITORY, repo));
  
  				for (Iterator ii = resourceGroups.iterator(); ii.hasNext();) {
--- 48,55 ----
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
  			try {
! 				Logger.getLog().debug(
! 					Messages.getString(
! 						MessageConstants.SEARCH_REPOSITORY,
! 						repo));
  
  				for (Iterator ii = resourceGroups.iterator(); ii.hasNext();) {
***************
*** 56,60 ****
  
  					Logger.getLog().debug(
! 						Messages.getString(MessageConstants.RESOURCE_GROUP, resourceGroup));
  
  					// Look...
--- 57,63 ----
  
  					Logger.getLog().debug(
! 						Messages.getString(
! 							MessageConstants.RESOURCE_GROUP,
! 							resourceGroup));
  
  					// Look...
***************
*** 66,70 ****
  					if (resources.isEmpty()) {
  						Logger.getLog().warn(
! 							Messages.getString(MessageConstants.NO_RESOURCES, repo));
  					}
  					else {
--- 69,75 ----
  					if (resources.isEmpty()) {
  						Logger.getLog().warn(
! 							Messages.getString(
! 								MessageConstants.NO_RESOURCES,
! 								repo));
  					}
  					else {
***************
*** 77,81 ****
  			}
  			catch (Exception e) {
! 				Logger.getLog().warn(Messages.getString(MessageConstants.LIST_FAILED), e);
  			}
  		}
--- 82,88 ----
  			}
  			catch (Exception e) {
! 				Logger.getLog().warn(
! 					Messages.getString(MessageConstants.LIST_FAILED),
! 					e);
  			}
  		}
***************
*** 86,110 ****
  		ResourceResult result = new ResourceResult();
  
- 		DebugUtils.printSeparator();
- 		DebugUtils.dump("All Results", results);
  
  		if (results.isEmpty())
! 			Logger.getLog().warn(Messages.getString(MessageConstants.NO_RESOURCES));
! 		else
  			groupBy(result, results, groupBy);
  
! 		DebugUtils.printSeparator();
! 		DebugUtils.dump("Grouped Results", result);
  
! 		//
! 		// Order the various groups
! 		//
! 		if (null == orderBy)
! 			orderBy = StandardComparisons.getNameTypeVersion();
  
! 		orderBy(result, orderBy);
  
! 		DebugUtils.printSeparator();
! 		DebugUtils.dump("Final (Grouped/Ordered) Results", result);
  
  		return result;
--- 93,121 ----
  		ResourceResult result = new ResourceResult();
  
  
  		if (results.isEmpty())
! 			Logger.getLog().warn(
! 				Messages.getString(MessageConstants.NO_RESOURCES));
! 		else {
! 			DebugUtils.printSeparator();
! 			DebugUtils.dump("All Results", results);
! 			
  			groupBy(result, results, groupBy);
  
! 			DebugUtils.printSeparator();
! 			DebugUtils.dump("Grouped Results", result);
  
! 			//
! 			// Order the various groups
! 			//
! 			if (null == orderBy)
! 				orderBy = StandardComparisons.getNameTypeVersion();
  
! 			orderBy(result, orderBy);
  
! 			DebugUtils.printSeparator();
! 			DebugUtils.dump("Final (Grouped/Ordered) Results", result);
! 
! 		}
  
  		return result;

Index: ResourceQuery.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/ResourceQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResourceQuery.java	11 Sep 2003 23:34:39 -0000	1.5
--- ResourceQuery.java	12 Sep 2003 13:28:23 -0000	1.6
***************
*** 164,167 ****
--- 164,168 ----
  		DebugUtils.dump(out, depth + 1, "Resource Groups: ", verbose, m_groups);
  
+ 		DebugUtils.printSeparator(out,depth+1);
  		DebugUtils.dump(
  			out,
***************
*** 171,176 ****
--- 172,180 ----
  			m_repositories);
  
+ 		DebugUtils.printSeparator(out,depth+1);
  		DebugUtils.dump(out, depth + 1, "Where: ", verbose, m_where);
+ 		DebugUtils.printSeparator(out,depth+1);
  		DebugUtils.dump(out, depth + 1, "Group By: ", verbose, m_groupBy);
+ 		DebugUtils.printSeparator(out,depth+1);
  		DebugUtils.dump(out, depth + 1, "Order By: ", verbose, m_orderBy);
  	}




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf