Update of /var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
In directory
james.mmbase.org:/tmp/cvs-serv32557/src/nl/natuurmonumenten/activiteiten
Modified Files:
Tag: BRANCH_NATMM_1_2
ActiviteitenService.java ActiviteitenHelper.java
Log Message:
logging toegevoegd
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
Index: ActiviteitenService.java
===================================================================
RCS file:
/var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten/Attic/ActiviteitenService.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- ActiviteitenService.java 16 Jan 2009 08:00:10 -0000 1.1.2.2
+++ ActiviteitenService.java 16 Jan 2009 08:43:53 -0000 1.1.2.3
@@ -43,7 +43,7 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getProvincies()
*/
public Provincie[] getProvincies() {
- System.out.println("getProvincies");
+ logger.debug("getProvincies");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("provincies");
NodeList list = manager.getList(null, null, null);
@@ -61,9 +61,9 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getEvents(java.util.Date,
java.util.Date, java.lang.String[], java.lang.String, java.lang.String)
*/
public Event[] getEvents(Date start, Date eind, String[] eventTypeIds,
String provincieId, String natuurgebiedenId) {
- System.out.println("getEvents() - eventTypeIds: " + eventTypeIds);
+ logger.debug("getEvents() - eventTypeIds: " + eventTypeIds);
if (eventTypeIds != null) {
- System.out.println("eventTypeIds: " + Arrays.asList(eventTypeIds));
+ logger.debug("eventTypeIds: " + Arrays.asList(eventTypeIds));
}
if (start == null || eind == null) {
throw new IllegalArgumentException("Start en/of einddatum
ontbreekt");
@@ -74,15 +74,15 @@
for (Iterator iter = eventNodes.entrySet().iterator();
iter.hasNext();) {
Map.Entry entry = (Map.Entry) iter.next();
String eventNumber = (String) entry.getValue();
- System.out.println("getting node for: " + eventNumber);
+ logger.debug("getting node for: " + eventNumber);
Node event = cloud.getNode(eventNumber);
beans.add(beanFactory.createEvent(event));
}
- System.out.println("beans: " + beans);
- System.out.println("beans.size(): " + beans.size());
+ logger.debug("beans: " + beans);
+ logger.debug("beans.size(): " + beans.size());
Event[] events = (Event[]) beans.toArray(new Event[beans.size()]);
- System.out.println("events: " + Arrays.asList(events));
+ logger.debug("events: " + Arrays.asList(events));
return events;
}
@@ -90,7 +90,7 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getEventTypes()
*/
public EventType[] getEventTypes() {
- System.out.println("getEventTypes");
+ logger.debug("getEventTypes");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("evenement_type");
// alleen types die op internet getoond worden
@@ -107,7 +107,7 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getMediaTypes()
*/
public MediaType[] getMediaTypes() {
- System.out.println("getMediaTypes");
+ logger.debug("getMediaTypes");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("media");
NodeList list = manager.getList(null, null, null);
@@ -123,7 +123,7 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getDeelnemersCategorieen()
*/
public DeelnemersCategorie[] getDeelnemersCategorieen() {
- System.out.println("getDeelnemersCategorieen");
+ logger.debug("getDeelnemersCategorieen");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("deelnemers_categorie");
NodeList list = manager.getList("naam is not null", null, null);
@@ -139,7 +139,7 @@
* @see
nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getNatuurgebieden()
*/
public Natuurgebied[] getNatuurgebieden() {
- System.out.println("getNatuurgebieden");
+ logger.debug("getNatuurgebieden");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("natuurgebieden");
NodeList list = manager.getList("naam is not null", null, null);
@@ -152,18 +152,18 @@
}
public EventDetails getEventDetails(String id) {
- System.out.println("getEventDetails");
+ logger.debug("getEventDetails");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node node = cloud.getNode(id);
if (!"evenement".equals(node.getNodeManager().getName())) {
- System.out.println("Geen evenement: " + id);
+ logger.debug("Geen evenement: " + id);
return null;
}
return beanFactory.createEventDetails(node);
}
public Vertrekpunt[] getVertrekpunten() {
- System.out.println("getNatuurgebieden");
+ logger.debug("getNatuurgebieden");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager manager = cloud.getNodeManager("vertrekpunten");
NodeList list = manager.getList(null, null, null);
Index: ActiviteitenHelper.java
===================================================================
RCS file:
/var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten/Attic/ActiviteitenHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ActiviteitenHelper.java 16 Jan 2009 08:00:10 -0000 1.1.2.1
+++ ActiviteitenHelper.java 16 Jan 2009 08:43:53 -0000 1.1.2.2
@@ -8,20 +8,23 @@
import java.util.Set;
import java.util.TreeMap;
+import org.apache.log4j.Logger;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeIterator;
import org.mmbase.bridge.NodeList;
public class ActiviteitenHelper {
+ private static Logger logger = Logger.getLogger(ActiviteitenHelper.class);
+
public static Map findEvents(Cloud cloud, Date start, Date eind, String[]
eventTypeIds, String provincieId, String natuurgebiedenId) {
// Deze code komt uit searchresults.jsp, omdat ik er geen touw aan
vast kan knopen heb ik geprobeerd deze letterlijk over te zetten vanuit de jsp
code
// ik heb geen poging gedaan om het refactoren, ***************
(gecensureerd)
long lDateSearchFrom = start.getTime()/1000;
long lDateSearchTill = eind.getTime()/1000;
- System.out.println("lDateSearchFrom: " + lDateSearchFrom);
- System.out.println("lDateSearchTill: " + lDateSearchTill);
+ logger.debug("lDateSearchFrom: " + lDateSearchFrom);
+ logger.debug("lDateSearchTill: " + lDateSearchTill);
// geen idee, maar ze rekken de tijd nog wat op
Calendar cal = Calendar.getInstance();
@@ -34,7 +37,7 @@
StringBuffer defaultParentEvents = new StringBuffer();
if (lDateSearchTill <= lDateSearchTillDefault) {
HashSet defaultEvents =
nl.leocms.evenementen.Evenement.getEvents(cloud,lDateSearchFromDefault,lDateSearchTillDefault);
- System.out.println("defaultEvents: " + defaultEvents);
+ logger.debug("defaultEvents: " + defaultEvents);
boolean first = true;
for (Iterator iter = defaultEvents.iterator(); iter.hasNext();) {
String eventnumber = (String) iter.next();
@@ -46,7 +49,7 @@
defaultParentEvents.append(eventnumber);
}
}
- System.out.println("defaultParentEvents: " + defaultParentEvents);
+ logger.debug("defaultParentEvents: " + defaultParentEvents);
StringBuffer eventTypeConstraint = new StringBuffer();
if (eventTypeIds != null) {
@@ -64,13 +67,13 @@
}
eventTypeConstraint.append(")");
}
- System.out.println("eventTypeConstraint: " + eventTypeConstraint);
+ logger.debug("eventTypeConstraint: " + eventTypeConstraint);
String provincieConstraint = null;
if (provincieId != null) {
provincieConstraint = "lokatie like '%," + provincieId + ",%'";
}
- System.out.println("provincieConstraint: " + provincieConstraint);
+ logger.debug("provincieConstraint: " + provincieConstraint);
Set parentEvents = new HashSet();
NodeList list = cloud.getList(defaultParentEvents.toString(),
"evenement,related,evenement_type", "evenement.number", provincieConstraint,
null, null, null, true);
for (NodeIterator iter = list.nodeIterator(); iter.hasNext();) {
@@ -92,7 +95,7 @@
}
}
- System.out.println("natuurgebiedenId: " + natuurgebiedenId);
+ logger.debug("natuurgebiedenId: " + natuurgebiedenId);
if (natuurgebiedenId != null) {
parentBelongsToNatuurgebied = false;
NodeList list2 = cloud.getList(natuurgebiedenId,
"natuurgebieden,related,evenement", "evenement.number", "evenement.number='" +
parentNumber +"'", null, null, null, true);
@@ -100,7 +103,7 @@
parentBelongsToNatuurgebied = true;
}
}
- System.out.println("parentBelongsToNatuurgebied: " +
parentBelongsToNatuurgebied);
+ logger.debug("parentBelongsToNatuurgebied: " +
parentBelongsToNatuurgebied);
if (parentBelongsToActivityType && parentBelongsToNatuurgebied) {
if (parentNumber != null && parentNumber.trim().length() > 0) {
@@ -108,7 +111,7 @@
}
}
}
- System.out.println("parentEvents: " + parentEvents);
+ logger.debug("parentEvents: " + parentEvents);
StringBuffer sb = new StringBuffer();
boolean first = true;
for (Iterator iter = parentEvents.iterator(); iter.hasNext();) {
@@ -120,46 +123,46 @@
sb.append(iter.next());
}
String parentEventsString = sb.toString();
- System.out.println("parentEvents: " + parentEventsString);
+ logger.debug("parentEvents: " + parentEventsString);
String childConstraints =
nl.leocms.evenementen.Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);
- System.out.println("childConstraints voor: <" + childConstraints +
">");
+ logger.debug("childConstraints voor: <" + childConstraints + ">");
if (!parentEvents.equals("")) {
childConstraints = "";
}
- System.out.println("childConstraints na: <" + childConstraints + ">");
+ 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();) {
Node event = iter.nextNode();
- System.out.println("found in first loop: " +
event.getStringValue("evenement.number") + "[" +
event.getLongValue("evenement.begindatum") + "]");
+ logger.debug("found in first loop: " +
event.getStringValue("evenement.number") + "[" +
event.getLongValue("evenement.begindatum") + "]");
// ik heb geen idee wat dit doet
if(!events.containsValue(event.getStringValue("evenement.number")) ) {
long eventBeginDate =
event.getLongValue("evenement.begindatum");
while(events.containsKey(new Long(eventBeginDate))) {
eventBeginDate++;
}
- System.out.println("putting event: " + (new
Long(eventBeginDate)) + ":" + event.getStringValue("evenement.number"));
+ logger.debug("putting event: " + (new
Long(eventBeginDate)) + ":" + event.getStringValue("evenement.number"));
events.put(new
Long(eventBeginDate),event.getStringValue("evenement.number"));
}
}
NodeList anotherChildList = cloud.getList(parentEventsString,
"evenement", "evenement.number,evenement.begindatum", childConstraints, null,
null, "destination", true);
for (NodeIterator iter = anotherChildList.nodeIterator();
iter.hasNext();) {
Node event = iter.nextNode();
- System.out.println("found in second loop: " +
event.getStringValue("evenement.number") + "[" +
event.getLongValue("evenement.begindatum") + "]");
+ logger.debug("found in second loop: " +
event.getStringValue("evenement.number") + "[" +
event.getLongValue("evenement.begindatum") + "]");
// ik heb nog steeds geen idee wat dit doet
if(!events.containsValue(event.getStringValue("evenement.number")) ) {
long eventBeginDate =
event.getLongValue("evenement.begindatum");
while(events.containsKey(new Long(eventBeginDate))) {
eventBeginDate++;
}
- System.out.println("putting event: " + (new
Long(eventBeginDate)) + ":" + event.getStringValue("evenement.number"));
+ logger.debug("putting event: " + (new
Long(eventBeginDate)) + ":" + event.getStringValue("evenement.number"));
events.put(new
Long(eventBeginDate),event.getStringValue("evenement.number"));
}
}
}
- System.out.println("events: " + events);
+ logger.debug("events: " + events);
return events;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
