/**********************************************************************************
 * $URL$
 * $Id$
 ***********************************************************************************
 *
 * Copyright (c) 2003, 2004, 2005, 2006 The Sakai Foundation.
 *
 * Licensed under the Educational Community License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.opensource.org/licenses/ecl1.php
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 **********************************************************************************/

package uk.ac.cam.caret.sakai.rwiki.component.radeox.service.impl;

import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderCache;

/**
 * @author ieb
 */
// FIXME: Component
public class RenderCacheImpl implements RenderCache
{

	private static Log log = LogFactory.getLog(RenderCacheImpl.class);

	private Cache cache = null;

	private String cacheName = null;

	public String getRenderedContent(String key)
	{
		String cacheValue = null;
		try
		{
			Element e = cache.get(key);
			if (e != null)
			{
				cacheValue = (String) e.getValue();
			}
		}
		catch (Exception ex)
		{
		}
		if (cacheValue != null)
			log.debug("Cache hit for " + key + " size " + cacheValue.length());
		else
			log.debug("Cache miss for " + key);
		return cacheValue;
	}

	public void putRenderedContent(String key, String content)
	{
		try
		{
			Element e = new Element(key, content);
			cache.put(e);
			log.debug("Put " + key + " size " + content.length());
		}
		catch (Exception ex)
		{
			log.warn(" RWiki Cache PUT Failure, restarting cache ", ex);
			init();
		}
	}

	public void init()
	{
		try
		{
			CacheManager cacheManager = CacheManager.create();
			if (cacheManager.cacheExists(cacheName))
				cacheManager.removeCache(cacheName);
			cacheManager.addCache(cacheName);
			cache = cacheManager.getCache(cacheName);
		}
		catch (Exception ex)
		{
			log.warn("Failed to start RWiki cache ");
		}
	}

	/**
	 * @return Returns the cacheName.
	 */
	public String getCacheName()
	{
		return cacheName;
	}

	/**
	 * @param cacheName
	 *        The cacheName to set.
	 */
	public void setCacheName(String cacheName)
	{
		this.cacheName = cacheName;
	}

}

@@ -1678,17 +1678,84 @@
 )%0A%09%09%7B%0A%09%09
-%7D
+%09log.error(%22RenderCache threw Exception for key: %22 + key, ex);%0A%09%09%7D %0A
 %0A%09%09if (c

Add proper logging for the RenderCache