Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions
In directory james.mmbase.org:/tmp/cvs-serv21887/functions
Modified Files:
CopyBookMadeTest.java
Log Message:
generalized 'madetest' function to also do 'madetests' (and not specifying test)
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/functions
Index: CopyBookMadeTest.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions/CopyBookMadeTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CopyBookMadeTest.java 13 Nov 2008 11:10:22 -0000 1.5
+++ CopyBookMadeTest.java 17 Nov 2008 15:24:40 -0000 1.6
@@ -11,7 +11,7 @@
* Retrieves a 'madetests' object for a certain tests and copybook objects.
*
* @author Michiel Meeuwissen
- * @version $Id: CopyBookMadeTest.java,v 1.5 2008/11/13 11:10:22 michiel Exp $
+ * @version $Id: CopyBookMadeTest.java,v 1.6 2008/11/17 15:24:40 michiel Exp $
*/
public class CopyBookMadeTest {
protected final static Logger log =
Logging.getLoggerInstance(CopyBookMadeTest.class);
@@ -28,6 +28,7 @@
test = t;
}
+
private boolean clear = false;
public void setClear(boolean c) {
@@ -58,17 +59,26 @@
}
- public Node madetest() {
+ public NodeList madetests() {
Cloud cloud = node.getCloud();
NodeManager madeTests = cloud.getNodeManager("madetests");
NodeQuery query = Queries.createRelatedNodesQuery(node, madeTests,
"related", "destination");
+ if (test != null) {
Step testStep =
query.addRelationStep(cloud.getNodeManager("learnobjects"), "related",
"source").getNext();
StepField numberField = query.createStepField(testStep, "number");
Queries.addConstraint(query, query.createConstraint(numberField,
test));
Queries.addConstraint(query,
query.createConstraint(query.createStepField(testStep, "otype"),
getOTypes(cloud, true, NODEMANAGERS)));
query.addSortOrder(numberField, SortOrder.ORDER_ASCENDING);
+ }
+ StepField testsField = query.createStepField(query.getSteps().get(0),
"number");
+ query.addSortOrder(testsField, SortOrder.ORDER_ASCENDING);
NodeList found = madeTests.getList(query);
+ return found;
+ }
+
+ public Node madetest() {
+ NodeList found = madetests();
if (found.size() > 0) {
if (clear) {
@@ -78,6 +88,9 @@
return found.getNode(0);
}
}
+ Cloud cloud = node.getCloud();
+
+ NodeManager madeTests = cloud.getNodeManager("madetests");
Node madeTest = madeTests.createNode();
madeTest.commit();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
