Update of /var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
In directory
james.mmbase.org:/tmp/cvs-serv12082/src/nl/natuurmonumenten/activiteiten
Modified Files:
Tag: BRANCH_NATMM_1_2
ActiviteitenHelper.java
Log Message:
NMCMS-622 - Disable the date-in-the-past correction: show all events in the
given time range. Also added validity check.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
See also: http://www.mmbase.org/jira/browse/NMCMS-622
Index: ActiviteitenHelper.java
===================================================================
RCS file:
/var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten/Attic/ActiviteitenHelper.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- ActiviteitenHelper.java 30 Jan 2009 10:50:32 -0000 1.1.2.6
+++ ActiviteitenHelper.java 6 Mar 2009 11:14:45 -0000 1.1.2.7
@@ -1,6 +1,5 @@
package nl.natuurmonumenten.activiteiten;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
@@ -31,20 +30,26 @@
logger.debug("lDateSearchFrom: " + lDateSearchFrom);
logger.debug("lDateSearchTill: " + lDateSearchTill);
- // geen idee, maar ze rekken de tijd nog wat op
- Calendar cal = Calendar.getInstance();
- cal.setTime(new Date());
- long lDateSearchFromDefault = (cal.getTime().getTime()/1000);
- cal.add(Calendar.YEAR,1); // cache events for one year from now
- long lDateSearchTillDefault = (cal.getTime().getTime()/1000);
+ // geen idee, maar ze rekken de tijd nog wat op
+// Calendar cal = Calendar.getInstance();
+// cal.setTime(new Date());
+// long lDateSearchFromDefault = (cal.getTime().getTime()/1000);
+// cal.add(Calendar.YEAR,1); // cache events for one year from now
+// long lDateSearchTillDefault = (cal.getTime().getTime()/1000);
+
+ //If the startdate is after the enddate, there can not exist any event
+ if (lDateSearchFrom >= lDateSearchTill) {
+ return new TreeMap();
+ }
+
StringBuffer defaultParentEvents = new StringBuffer();
- if (lDateSearchTill <= lDateSearchTillDefault) {
- HashSet defaultEvents =
nl.leocms.evenementen.Evenement.getEvents(cloud,lDateSearchFromDefault,lDateSearchTillDefault);
- logger.debug("defaultEvents: " + defaultEvents);
+
+ HashSet parentEventSet =
nl.leocms.evenementen.Evenement.getEvents(cloud,lDateSearchFrom,lDateSearchTill);
+ logger.debug("defaultEvents: " + parentEventSet);
boolean first = true;
- for (Iterator iter = defaultEvents.iterator(); iter.hasNext();) {
+ for (Iterator iter = parentEventSet.iterator(); iter.hasNext();) {
String eventnumber = (String) iter.next();
if (first) {
first = false;
@@ -53,12 +58,12 @@
}
defaultParentEvents.append(eventnumber);
}
- }
+
logger.debug("defaultParentEvents: " + defaultParentEvents);
StringBuffer eventTypeConstraint = new StringBuffer();
if (eventTypeIds != null) {
- boolean first = true;
+ first = true;
for (int i = 0; i < eventTypeIds.length; i++) {
// sommige soap clients geven een array met 1 leeg element ipv
een lege array of null
if (isEmpty(eventTypeIds[i])) {
@@ -124,7 +129,7 @@
}
logger.debug("parentEvents: " + parentEvents);
StringBuffer sb = new StringBuffer();
- boolean first = true;
+ first = true;
for (Iterator iter = parentEvents.iterator(); iter.hasNext();) {
if (first) {
first = false;
@@ -143,6 +148,7 @@
logger.debug("childConstraints na: <" + childConstraints + ">");
Map events = new TreeMap();
+
if (!parentEvents.isEmpty()) {
NodeList childList = cloud.getList(parentEventsString,
"evenement1,partrel,evenement", "evenement.number,evenement.begindatum",
childConstraints, null, null, "destination", true);
for (NodeIterator iter = childList.nodeIterator();
iter.hasNext();) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
