Update of
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/taglib/reports
In directory james.mmbase.org:/tmp/cvs-serv11284
Modified Files:
EventTag.java
Log Message:
DIDACTOR-55
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/taglib/reports
See also: http://www.mmbase.org/jira/browse/DIDACTOR-55
Index: EventTag.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/taglib/reports/EventTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EventTag.java 8 Jun 2007 12:20:31 -0000 1.3
+++ EventTag.java 22 Jan 2008 08:48:10 -0000 1.4
@@ -22,6 +22,7 @@
import javax.servlet.jsp.JspTagException;
import nl.didactor.events.*;
+import org.mmbase.util.Casting;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.jsp.taglib.CloudReferrerTag;
@@ -66,56 +67,17 @@
String username = cloud.getUser().getIdentifier();
HttpServletRequest request =
(HttpServletRequest)pageContext.getRequest();
- HttpServletResponse response =
(HttpServletResponse)pageContext.getResponse();
- HttpSession session = request.getSession(false);
- // get sessionId
- String sessionId = session.getId();
-
- // get provider from request
- String sProvider = request.getParameter("provider");
-
- String sEducation = (educationId != null) ? educationId :
request.getParameter("education");
-
- // get class from request
- String sClass = request.getParameter("class");
-
- Integer provider = null;
- Integer education = null;
- Integer classNumber = null;
- if (sProvider != null) {
- try {
- provider = Integer.decode(sProvider);
- } catch (NumberFormatException nfe) {
- return SKIP_BODY;
- }
- }
- if (sEducation != null) {
- try {
- education = Integer.decode(sEducation);
- }
- catch (NumberFormatException nfe) {
- return SKIP_BODY;
- }
- }
+ Integer provider =
Casting.toInt(request.getAttribute("provider"));
+ Integer education = Casting.toInt((educationId != null) ?
educationId : request.getAttribute("education"));
+ Integer classNumber =
Casting.toInt(request.getAttribute("class"));
- if (sClass != null) {
- try {
- classNumber = Integer.decode(sClass);
- }
- catch (NumberFormatException nfe) {
- return SKIP_BODY;
- }
- }
- // create and store Event
- Event event = new Event(username, sessionId, provider,
education, classNumber, eventtype, eventvalue, note);
- EventDispatcher.report(event, request, response);
+ Event event = new Event(username, request, provider,
education, classNumber, eventtype, eventvalue, note);
+
org.mmbase.core.event.EventManager.getInstance().propagateEvent(event);
}
} catch (Exception ex) {
- JspTagException e = new JspTagException(ex.getMessage());
- e.initCause(ex);
- throw e;
+ throw new JspTagException(ex.getMessage(), ex);
}
return SKIP_BODY;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
