ruper2/src/java/core/org/krysalis/ruper2/query DefaultQueryEngine.java,1.2,1.3 ResourceQuery.java,1.1,1.2 ResourceResultHelper.java,1.1,1.2

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

Modified Files:
	DefaultQueryEngine.java ResourceQuery.java 
	ResourceResultHelper.java 
Log Message:
More tests

Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/DefaultQueryEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultQueryEngine.java	1 Oct 2003 21:55:55 -0000	1.2
--- DefaultQueryEngine.java	2 Oct 2003 23:56:50 -0000	1.3
***************
*** 13,21 ****
  
  import org.krysalis.ruper2.RuperException;
  import org.krysalis.ruper2.log.Logger;
- import org.krysalis.ruper2.repository.RepositoryWrapper;
  import org.krysalis.ruper2.resource.Resource;
  import org.krysalis.ruper2.resource.ResourceGroup;
  import org.krysalis.ruper2.resource.compare.StandardResourceComparisons;
  import org.krysalis.ruper2.util.select.Selector;
  import org.krysalis.ruper2.util.text.MessageConstants;
--- 13,23 ----
  
  import org.krysalis.ruper2.RuperException;
+ import org.krysalis.ruper2.impl.RepositorySetWrapper;
+ import org.krysalis.ruper2.impl.RepositoryWrapper;
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.resource.Resource;
  import org.krysalis.ruper2.resource.ResourceGroup;
  import org.krysalis.ruper2.resource.compare.StandardResourceComparisons;
+ import org.krysalis.ruper2.util.select.AllSelector;
  import org.krysalis.ruper2.util.select.Selector;
  import org.krysalis.ruper2.util.text.MessageConstants;
***************
*** 28,32 ****
  public class DefaultQueryEngine {
  
! 	public ResourceResult query(List wrappers, ResourceQuery query)
  		throws RuperException {
  
--- 30,36 ----
  public class DefaultQueryEngine {
  
! 	public ResourceResult query(
! 		RepositorySetWrapper wrappers,
! 		ResourceQuery query)
  		throws RuperException {
  
***************
*** 48,55 ****
  		Comparator orderBy = query.getOrderBy();
  
  		//:TODO: Total Hack, just to allow something...
  		// Rework w/ correct configurable components
  
! 		for (Iterator i = wrappers.iterator(); i.hasNext();) {
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
  			try {
--- 52,64 ----
  		Comparator orderBy = query.getOrderBy();
  
+ 		if (null == whereClause)
+ 			whereClause = AllSelector.getInstance();
+ 
  		//:TODO: Total Hack, just to allow something...
  		// Rework w/ correct configurable components
  
! 		for (Iterator i = wrappers.getRepositoryWrappers().iterator();
! 			i.hasNext();
! 			) {
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
  			try {
***************
*** 114,118 ****
  			Logger.getLog().info(
  				Messages.getString(MessageConstants.RESOURCES_FOUND));
! 				
  			if (Logger.getLog().isDebug()) {
  				DebugUtils.printSeparator();
--- 123,127 ----
  			Logger.getLog().info(
  				Messages.getString(MessageConstants.RESOURCES_FOUND));
! 
  			if (Logger.getLog().isDebug()) {
  				DebugUtils.printSeparator();

Index: ResourceQuery.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/ResourceQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceQuery.java	29 Sep 2003 18:09:22 -0000	1.1
--- ResourceQuery.java	2 Oct 2003 23:56:50 -0000	1.2
***************
*** 109,113 ****
  	public ResourceQuery(ResourceQuery other, RepositorySet repositories) {
  		this(other);
- 
  		m_repositories = repositories;
  	}
--- 109,112 ----

Index: ResourceResultHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/ResourceResultHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceResultHelper.java	29 Sep 2003 18:09:22 -0000	1.1
--- ResourceResultHelper.java	2 Oct 2003 23:56:50 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  
  import java.util.Comparator;
+ import java.util.Iterator;
  import java.util.List;
  
***************
*** 25,28 ****
--- 26,43 ----
  	}
  
+ 	public static int groupCount(ResourceResult result) {
+ 		return (null == result) ? 0 : result.size();
+ 	}
+ 
+ 	public static int resourceCount(ResourceResult result) {
+ 		int resources = 0;
+ 
+ 		for (Iterator i = result.iterator(); i.hasNext();) {
+ 			resources += ((List) i.next()).size();
+ 		}
+ 
+ 		return resources;
+ 	}
+ 
  	public static List getResourceList(ResourceResult result) {
  		List list = null;
***************
*** 52,57 ****
  						//:TODO: Hmm ... sort w/ comp?
  
! 						Resource resource1 = (Resource) list1.get(list1.size()-1);
! 						Resource resource2 = (Resource) list2.get(list2.size()-1);
  
  						comparison = comp.compare(resource1, resource2);
--- 67,74 ----
  						//:TODO: Hmm ... sort w/ comp?
  
! 						Resource resource1 =
! 							(Resource) list1.get(list1.size() - 1);
! 						Resource resource2 =
! 							(Resource) list2.get(list2.size() - 1);
  
  						comparison = comp.compare(resource1, resource2);




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