[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/render HMathRenderEngine.java,1.2,1.3

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/render
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25118/WEB-INF/src/org/hartmath/server/render

Modified Files:
	HMathRenderEngine.java 
Log Message:
Improved cache; fixed "table of content" bug

Index: HMathRenderEngine.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/render/HMathRenderEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HMathRenderEngine.java	2 May 2004 12:43:07 -0000	1.2
--- HMathRenderEngine.java	2 May 2004 17:34:10 -0000	1.3
***************
*** 126,130 ****
      filterContext.setRenderContext(context);
      context.setRenderEngine(this);
!     Map map = Application.get().getParameters(); 
      HttpServletRequest request = (HttpServletRequest) map.get("request");
      if (request.getAttribute("previewMode") != null) {
--- 126,130 ----
      filterContext.setRenderContext(context);
      context.setRenderEngine(this);
!     Map map = Application.get().getParameters();
      HttpServletRequest request = (HttpServletRequest) map.get("request");
      if (request.getAttribute("previewMode") != null) {
***************
*** 135,139 ****
        return f.filter(content, filterContext, macros, CachedWikipediaFilter.DUMMY_CACHED_PAGE, 1);
      }
!     
      CachedWikipediaFilter f = new CachedWikipediaFilter();
      MacroRepository macros = MacroRepository.getInstance();
--- 135,139 ----
        return f.filter(content, filterContext, macros, CachedWikipediaFilter.DUMMY_CACHED_PAGE, 1);
      }
! 
      CachedWikipediaFilter f = new CachedWikipediaFilter();
      MacroRepository macros = MacroRepository.getInstance();
***************
*** 148,168 ****
      }
      name = ((String) Application.get().getObject(Application.OID)) + name;
!     String versionName = name+ snip.getVersion();
!     
!     CachedPage cachedPage = (CachedPage) CachedPageGenerator.PAGE_MAP.get(versionName);
      if (cachedPage == null) {
!       versionName = name+ (snip.getVersion()-1);
!       cachedPage = (CachedPage) CachedPageGenerator.PAGE_MAP.get(versionName);
        if (cachedPage != null) {
          // delete previous version
! //        System.out.println("remove:"+versionName);
!         synchronized (CachedPageGenerator.PAGE_MAP){
!           CachedPageGenerator.PAGE_MAP.remove(versionName);
!         }
        }
      } else {
        try {
! //        System.out.println("found:"+versionName);
!         return ((CachedPage)cachedPage.clone()).filter(filterContext, macros);
        } catch (CloneNotSupportedException e) {
          // TODO Auto-generated catch block
--- 148,166 ----
      }
      name = ((String) Application.get().getObject(Application.OID)) + name;
!     String versionName = name + snip.getVersion();
! 
!     CachedPage cachedPage = (CachedPage) CachedPageGenerator.LRU_CACHED_PAGE_MAP.get(versionName);
      if (cachedPage == null) {
!       versionName = name + (snip.getVersion() - 1);
!       cachedPage = (CachedPage) CachedPageGenerator.LRU_CACHED_PAGE_MAP.get(versionName);
        if (cachedPage != null) {
          // delete previous version
!         //        System.out.println("remove:"+versionName);
!         CachedPageGenerator.LRU_CACHED_PAGE_MAP.remove(versionName);
        }
      } else {
        try {
!         //        System.out.println("found:"+versionName);
!         return ((CachedPage) cachedPage.clone()).filter(filterContext, macros);
        } catch (CloneNotSupportedException e) {
          // TODO Auto-generated catch block
***************
*** 177,190 ****
      cachedPage = compiler.getCachedPage();
      if (cachedPage != null && name != null) {
!       versionName = name+ snip.getVersion();
! //      System.out.println("put:"+versionName);
!       synchronized (CachedPageGenerator.PAGE_MAP){
!         CachedPageGenerator.PAGE_MAP.put(versionName, cachedPage);
!       }
        return cachedPage.filter(filterContext, macros);
      }
      return result;
    }
!   
    public String renderSnippet(String content, RenderContext context) {
      init();
--- 175,186 ----
      cachedPage = compiler.getCachedPage();
      if (cachedPage != null && name != null) {
!       versionName = name + snip.getVersion();
!       //      System.out.println("put:"+versionName);
!       CachedPageGenerator.LRU_CACHED_PAGE_MAP.put(versionName, cachedPage);
        return cachedPage.filter(filterContext, macros);
      }
      return result;
    }
! 
    public String renderSnippet(String content, RenderContext context) {
      init();
***************
*** 192,196 ****
      filterContext.setRenderContext(context);
      context.setRenderEngine(this);
!      
      CachedWikipediaFilter f = new CachedWikipediaFilter();
      //    f.setInitialContext(new BaseInitialRenderContext());
--- 188,192 ----
      filterContext.setRenderContext(context);
      context.setRenderEngine(this);
! 
      CachedWikipediaFilter f = new CachedWikipediaFilter();
      //    f.setInitialContext(new BaseInitialRenderContext());