Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions
In directory james.mmbase.org:/tmp/cvs-serv18124
Modified Files:
PeopleClassFunction.java
Log Message:
consider also sart date when determining class
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/functions
Index: PeopleClassFunction.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions/PeopleClassFunction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PeopleClassFunction.java 5 Feb 2008 15:05:36 -0000 1.5
+++ PeopleClassFunction.java 1 Aug 2008 15:59:23 -0000 1.6
@@ -10,7 +10,7 @@
/**
* Some didactor specific Node functions (implemented as 'bean')
* @author Michiel Meeuwissen
- * @version $Id: PeopleClassFunction.java,v 1.5 2008/02/05 15:05:36 michiel
Exp $
+ * @version $Id: PeopleClassFunction.java,v 1.6 2008/08/01 15:59:23 michiel
Exp $
*/
public class PeopleClassFunction {
protected final static Logger log =
Logging.getLoggerInstance(PeopleClassFunction.class);
@@ -41,8 +41,7 @@
if (foundClasses.size() > 1) {
log.debug("more classes related! for node " + node.getNumber());
claz = null;
- try {
- Date now =
org.mmbase.util.DynamicDate.eval(org.mmbase.util.DynamicDate.getInstance("tohour"));
+ Date now = org.mmbase.util.DynamicDate.eval("tohour");
NodeIterator ni = foundClasses.nodeIterator();
CLASS:
while (ni.hasNext()) {
@@ -52,21 +51,17 @@
NodeIterator ei = mmevents.nodeIterator();
if (ei.hasNext()) {
Node event = ei.nextNode();
- if (event.getDateValue("start").before(now)) {
- log.debug(" " + claz + " was started so using this
one");
+ if (event.getDateValue("start").before(now) &&
event.getDateValue("stop").after(now)) {
+ log.debug(" " + claz + " was started and not stopped
so using this one");
break CLASS;
} else {
log.debug(event.getDateValue("start") + " is after
" + now);
}
} else {
log.debug("No mmevents coupled to " + claz);
+ // what does that mean?
}
}
- } catch (org.mmbase.util.dateparser.ParseException pe) {
- // could not happen
- log.error(pe);
- }
-
} else if (foundClasses.size() == 1) {
claz = foundClasses.getNode(0);
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
