Author: michiel
Date: 2009-09-10 01:34:25 +0200 (Thu, 10 Sep 2009)
New Revision: 38550
Modified:
openimages/trunk/src/main/java/eu/openimages/MediaUrlConverter.java
Log:
using 404 for offline items is little confusing. Using 500 for now.
Modified: openimages/trunk/src/main/java/eu/openimages/MediaUrlConverter.java
===================================================================
--- openimages/trunk/src/main/java/eu/openimages/MediaUrlConverter.java
2009-09-09 23:30:08 UTC (rev 38549)
+++ openimages/trunk/src/main/java/eu/openimages/MediaUrlConverter.java
2009-09-09 23:34:25 UTC (rev 38550)
@@ -115,24 +115,20 @@
Cloud cloud = frameworkParameters.get(Parameter.CLOUD);
if (cloud.hasNode(nr)) {
Node mediafragment = cloud.getNode(nr);
-
+
Date today = new Date();
boolean show = mediafragment.getBooleanValue("show");
Date online = mediafragment.getDateValue("online");
Date offline = mediafragment.getDateValue("offline");
String nmName = mediafragment.getNodeManager().getName();
-
- if (!nmName.equals("mediafragments") &&
+
+ if (!nmName.equals("mediafragments") &&
!nmName.equals("videofragments") &&
- !nmName.equals("imagefragments") &&
+ !nmName.equals("imagefragments") &&
!nmName.equals("audiofragments")) {
- if (log.isDebugEnabled()) log.debug("not a mediafragment");
- return Url.NOT;
+ throw new FrameworkException("not a mediafragment");
} else if (!show || online.after(today) ||
offline.before(today)) {
- if (log.isServiceEnabled()) {
- log.service("mediafragment not shown: " + show + ",
online: " + online + ", offline: " + offline);
- }
- return Url.NOT;
+ throw new FrameworkException("mediafragment not shown: " +
show + ", online: " + online + ", offline: " + offline);
} else {
frameworkParameters.set(MEDIA, mediafragment);
result.append(nr);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
