ruper2/src/java/core/org/krysalis/ruper/query ResourceResult.java,1.6,1.7 ResourceResultHelper.java,1.1,1.2 ResourceSpecifierRequest.java,1.1,1.2 DefaultQueryEngine.java,1.3,1.4
[email protected] Fri, 12 Sep 2003 13:23:45 -0700
Newsgroups
gmane.comp.krysalis.metamorphosis.cvs
Message-ID
<[email protected] >
Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query
In directory sc8-pr-cvs1:/tmp/cvs-serv10667/src/java/core/org/krysalis/ruper/query
Modified Files:
ResourceResult.java ResourceResultHelper.java
ResourceSpecifierRequest.java DefaultQueryEngine.java
Log Message:
1) listSpecifiers ought not work
2) unit tests run again [need to add those to a project]
3) FilenameAnalyzer a bit smarter (copes w/ -alpha better, ala Ben's soln)
4) FileUpdater does something -- kinda/sorta, try it :-)
5) Ant task same...
Index: ResourceResult.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/ResourceResult.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ResourceResult.java 11 Sep 2003 23:34:39 -0000 1.6
--- ResourceResult.java 12 Sep 2003 20:23:43 -0000 1.7
***************
*** 4,10 ****
--- 4,13 ----
package org.krysalis.ruper.query;
+ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
+ import org.krysalis.version.util.debug.DebugUtils;
+ import org.krysalis.version.util.debug.Dumpable;
import org.krysalis.version.util.note.AnnotationScratchpad;
***************
*** 15,19 ****
*
*/
! public class ResourceResult extends ArrayList {
public boolean m_successful = true;
--- 18,22 ----
*
*/
! public class ResourceResult extends ArrayList implements Dumpable {
public boolean m_successful = true;
***************
*** 75,78 ****
--- 78,96 ----
m_successful = b;
}
+ public void dump(PrintWriter out, int depth, boolean verbose) {
+ String indent = DebugUtils.getIndent(depth);
+
+ out.println("Successful:" + m_successful);
+
+ DebugUtils.printSeparator(out,depth+1);
+ DebugUtils.dumpList(out, depth + 1, "Resources: ", verbose, this);
+
+ if ( (null != m_notes) && m_notes.hasAnnotations())
+ {
+ DebugUtils.printSeparator(out,depth+1);
+ m_notes.dump(out,depth+1,verbose);
+
+ }
+ }
}
Index: ResourceResultHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/ResourceResultHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceResultHelper.java 11 Sep 2003 23:34:39 -0000 1.1
--- ResourceResultHelper.java 12 Sep 2003 20:23:43 -0000 1.2
***************
*** 19,25 ****
public static boolean noResult(ResourceResult result) {
return (
! (null != result)
! && !result.isEmpty()
! && !getResourceList(result).isEmpty());
}
--- 19,26 ----
public static boolean noResult(ResourceResult result) {
return (
! (null == result)
! || result.isEmpty()
! || (null == getResourceList(result))
! || getResourceList(result).isEmpty());
}
***************
*** 46,50 ****
if (null != list1) {
if (null != list2) {
-
if (!list1.isEmpty()) {
if (!list2.isEmpty()) {
--- 47,50 ----
Index: ResourceSpecifierRequest.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/ResourceSpecifierRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceSpecifierRequest.java 8 Sep 2003 23:21:40 -0000 1.1
--- ResourceSpecifierRequest.java 12 Sep 2003 20:23:43 -0000 1.2
***************
*** 10,14 ****
import org.krysalis.ruper.repository.RepositorySet;
import org.krysalis.ruper.resource.ResourceSpecifier;
! import org.krysalis.ruper.resource.compare.StandardComparisons;
import org.krysalis.ruper.resource.select.StandardSelections;
import org.krysalis.ruper.util.select.Selector;
--- 10,14 ----
import org.krysalis.ruper.repository.RepositorySet;
import org.krysalis.ruper.resource.ResourceSpecifier;
! import org.krysalis.ruper.resource.compare.StandardResourceComparisons;
import org.krysalis.ruper.resource.select.StandardSelections;
import org.krysalis.ruper.util.select.Selector;
***************
*** 42,47 ****
public ResourceQuery getQuery() {
Selector where = StandardSelections.getNamedTypedVersion(m_specifier);
! Comparator orderBy = StandardComparisons.getNameTypeVersion();
! Comparator groupBy = StandardComparisons.getNameVersion();
return new ResourceQuery(
--- 42,47 ----
public ResourceQuery getQuery() {
Selector where = StandardSelections.getNamedTypedVersion(m_specifier);
! Comparator orderBy = StandardResourceComparisons.getNameTypeVersion();
! Comparator groupBy = StandardResourceComparisons.getNameVersion();
return new ResourceQuery(
Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/query/DefaultQueryEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultQueryEngine.java 12 Sep 2003 13:28:23 -0000 1.3
--- DefaultQueryEngine.java 12 Sep 2003 20:23:43 -0000 1.4
***************
*** 17,21 ****
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.resource.ResourceGroup;
! import org.krysalis.ruper.resource.compare.StandardComparisons;
import org.krysalis.ruper.util.select.AllSelector;
import org.krysalis.ruper.util.select.Selector;
--- 17,21 ----
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.resource.ResourceGroup;
! import org.krysalis.ruper.resource.compare.StandardResourceComparisons;
import org.krysalis.ruper.util.select.AllSelector;
import org.krysalis.ruper.util.select.Selector;
***************
*** 32,37 ****
--- 32,42 ----
throws RuperException {
+ DebugUtils.printSeparator();
DebugUtils.dump(query);
+ //
+ // A result object, and the results (unpackaged) list
+ //
+ ResourceResult result = new ResourceResult();
List results = new ArrayList();
***************
*** 63,74 ****
// Look...
List resources =
! repo.listResources(
! resourceGroup,
! AllSelector.getInstance());
if (resources.isEmpty()) {
Logger.getLog().warn(
Messages.getString(
! MessageConstants.NO_RESOURCES,
repo));
}
--- 68,77 ----
// Look...
List resources =
! repo.listResources(resourceGroup, whereClause);
if (resources.isEmpty()) {
Logger.getLog().warn(
Messages.getString(
! MessageConstants.NO_RESOURCES_FOUND,
repo));
}
***************
*** 82,88 ****
}
catch (Exception e) {
! Logger.getLog().warn(
! Messages.getString(MessageConstants.LIST_FAILED),
! e);
}
}
--- 85,94 ----
}
catch (Exception e) {
! String message =
! Messages.getString(MessageConstants.LIST_FAILED);
!
! Logger.getLog().warn(message, e);
!
! result.getNotes().warning(message, e);
}
}
***************
*** 91,104 ****
// Package the results..
//
- 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);
--- 97,108 ----
// Package the results..
//
if (results.isEmpty())
Logger.getLog().warn(
! Messages.getString(MessageConstants.NO_RESOURCES_FOUND));
else {
DebugUtils.printSeparator();
DebugUtils.dump("All Results", results);
!
groupBy(result, results, groupBy);
***************
*** 110,114 ****
//
if (null == orderBy)
! orderBy = StandardComparisons.getNameTypeVersion();
orderBy(result, orderBy);
--- 114,118 ----
//
if (null == orderBy)
! orderBy = StandardResourceComparisons.getNameTypeVersion();
orderBy(result, orderBy);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf