ruper2/src/java/core/org/krysalis/ruper2/query DefaultQueryEngine.java,1.10,1.11

[email protected]
Newsgroups gmane.comp.krysalis.metamorphosis.cvs
Message-ID <[email protected]>
Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query
In directory sc8-pr-cvs1:/tmp/cvs-serv9026/src/java/core/org/krysalis/ruper2/query

Modified Files:
	DefaultQueryEngine.java 
Log Message:
Added 'RepositoryManifest', that lists the types/ids/versions (even resources, but this'll be optional) of a repo.


See using the -m (-manifest) option:

java org.krysalis.ruper2.tool.RepositoryTool  -repo maven -g junit -m

Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/DefaultQueryEngine.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DefaultQueryEngine.java	22 Oct 2003 21:53:25 -0000	1.10
--- DefaultQueryEngine.java	24 Oct 2003 21:35:50 -0000	1.11
***************
*** 30,38 ****
  public class DefaultQueryEngine {
  
! 	public ResourceResult query(
  		RepositorySetWrapper wrappers,
  		ResourceQuery query)
  		throws RuperException {
  
  		//		if (Logger.getLog().isDebug()) {
  		//			DebugUtils.printSeparator();
--- 30,65 ----
  public class DefaultQueryEngine {
  
! 	/**
! 	 * Run a query over a set of repositories.
! 	 * 
! 	 * @param wrappers
! 	 * @param query
! 	 * @return
! 	 * @throws RuperException
! 	 */
! 	public ResourceResult queryRepositories(
  		RepositorySetWrapper wrappers,
  		ResourceQuery query)
  		throws RuperException {
  
+ 		// Extract query components
+ 		List resourceGroups = query.getGroups();
+ 
+ 		//
+ 		// Trawl the repositories to gather resources
+ 		//
+ 		return queryResources(
+ 			gatherResources(wrappers, resourceGroups, query),
+ 			query);
+ 	}
+ 
+ 	/**
+ 	 * Run a query over a set of resources:
+ 	 * 
+ 	 * @param resources
+ 	 * @param query
+ 	 * @return
+ 	 */
+ 	public ResourceResult queryResources(List resources, ResourceQuery query) {
  		//		if (Logger.getLog().isDebug()) {
  		//			DebugUtils.printSeparator();
***************
*** 44,56 ****
  		//
  		ResourceResult result = new ResourceResult();
- 		List results = new ArrayList();
- 
- 		// Extract query components
- 		List resourceGroups = query.getGroups();
- 
- 		//
- 		// Trawl the repositories to gather resources
- 		//
- 		results = gatherResources(wrappers, resourceGroups, query);
  
  		//
--- 71,74 ----
***************
*** 58,62 ****
  		//
  
! 		if (results.isEmpty())
  			Logger.getLogger().warn(
  				Messages.getString(MessageConstants.NO_RESOURCES_FOUND));
--- 76,80 ----
  		//
  
! 		if (resources.isEmpty())
  			Logger.getLogger().warn(
  				Messages.getString(MessageConstants.NO_RESOURCES_FOUND));
***************
*** 72,76 ****
  			//				DebugUtils.dump("All Results", results);
  			//			}
! 			groupBy(result, results, groupBy);
  
  			//			if (Logger.getLog().isDebug()) {
--- 90,94 ----
  			//				DebugUtils.dump("All Results", results);
  			//			}
! 			groupBy(result, resources, groupBy);
  
  			//			if (Logger.getLog().isDebug()) {
***************
*** 99,103 ****
  						new ResourceEvent(
  							ResourceEvent.RESULT,
! 							(Resource)i.next()));
  				}
  			}
--- 117,121 ----
  						new ResourceEvent(
  							ResourceEvent.RESULT,
! 							(Resource) i.next()));
  				}
  			}
***************
*** 150,154 ****
  								repo,
  								resourceGroup));
! 					} else {
  						Logger.getLogger().info(
  							Messages.getString(
--- 168,173 ----
  								repo,
  								resourceGroup));
! 					}
! 					else {
  						Logger.getLogger().info(
  							Messages.getString(
***************
*** 164,168 ****
  					}
  				}
! 			} catch (Exception e) {
  				String message =
  					Messages.getString(MessageConstants.LIST_FAILED);
--- 183,188 ----
  					}
  				}
! 			}
! 			catch (Exception e) {
  				String message =
  					Messages.getString(MessageConstants.LIST_FAILED);
***************
*** 217,221 ****
  				currentResource = resource;
  			}
! 		} else {
  			// A single list (one group)...
  			result.add(allResults);
--- 237,242 ----
  				currentResource = resource;
  			}
! 		}
! 		else {
  			// A single list (one group)...
  			result.add(allResults);




-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.