Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions
In directory james.mmbase.org:/tmp/cvs-serv14970/core/java/nl/didactor/functions
Modified Files:
CopyBookMadeTest.java
Log Message:
added some functions to make jsps simpler
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CopyBookMadeTest.java 17 Nov 2008 15:24:40 -0000 1.6
+++ CopyBookMadeTest.java 20 Nov 2008 15:09:40 -0000 1.7
@@ -11,7 +11,7 @@
* Retrieves a 'madetests' object for a certain tests and copybook objects.
*
* @author Michiel Meeuwissen
- * @version $Id: CopyBookMadeTest.java,v 1.6 2008/11/17 15:24:40 michiel Exp $
+ * @version $Id: CopyBookMadeTest.java,v 1.7 2008/11/20 15:09:40 michiel Exp $
*/
public class CopyBookMadeTest {
protected final static Logger log =
Logging.getLoggerInstance(CopyBookMadeTest.class);
@@ -58,6 +58,10 @@
return set;
}
+ protected Node getMadeTestHolder(Node test) {
+ return test.getFunctionValue("madetestholder", null).toNode();
+ }
+
public NodeList madetests() {
Cloud cloud = node.getCloud();
@@ -66,7 +70,7 @@
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(numberField,
getMadeTestHolder(test)));
Queries.addConstraint(query,
query.createConstraint(query.createStepField(testStep, "otype"),
getOTypes(cloud, true, NODEMANAGERS)));
query.addSortOrder(numberField, SortOrder.ORDER_ASCENDING);
}
@@ -78,6 +82,7 @@
}
public Node madetest() {
+ if (test == null) throw new IllegalArgumentException("Test parameter
is required");
NodeList found = madetests();
if (found.size() > 0) {
@@ -99,7 +104,7 @@
Relation rel1 = rm.createRelation(node, madeTest);
rel1.commit();
RelationManager rm2 = cloud.getRelationManager(node.getNodeManager(),
madeTests, "related");
- Relation rel2 = rm2.createRelation(test, madeTest);
+ Relation rel2 = rm2.createRelation(getMadeTestHolder(test), madeTest);
rel2.commit();
return madeTest;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
