[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory ...

[Christian Bauer]

  User: cbauer  
  Date: 07/08/25 18:35:10

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory  
                        BlogDAO.java BlogDirectory.java
  Log:
  blogDirectory plugin is now recursion-safe
  
  Revision  Changes    Path
  1.3       +8 -8      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BlogDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDAO.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- BlogDAO.java	25 Aug 2007 19:03:39 -0000	1.2
  +++ BlogDAO.java	25 Aug 2007 22:35:10 -0000	1.3
  @@ -22,7 +22,6 @@
   
       public List<BlogEntry> findBlogEntriesWithCommentCount(Node startNode,
                                                              Node ignoreNode,
  -                                                           Long maxDepth,
                                                              String orderByProperty,
                                                              boolean orderDescending,
                                                              long firstResult,
  @@ -44,6 +43,7 @@
           queryString.append("and n2.nsLeft > :startLeft and n2.nsRight < :startRight").append(" ");
           queryString.append("and n2.class = :clazz").append(" ");
           queryString.append("and not n1 = :ignoreNode").append(" ");
  +        queryString.append("and not n1.pluginsUsed like '%blogDirectory%'").append(" ");
   
           if (year != null) queryString.append("and year(n1.createdOn) = :limitYear").append(" ");
           if (month != null) queryString.append("and month(n1.createdOn) = :limitMonth").append(" ");
  @@ -77,15 +77,15 @@
           return (List<BlogEntry>)nestedSetQuery.list();
       }
   
  -    public Long countBlogEntries(Node startNode, Node ignoreNode, Long maxDepth, Integer year, Integer month, Integer day ) {
  -        return countBlogEntries(startNode, ignoreNode, maxDepth, false, false, false, year, month, day).get(0).getNumOfEntries();
  +    public Long countBlogEntries(Node startNode, Node ignoreNode, Integer year, Integer month, Integer day ) {
  +        return countBlogEntries(startNode, ignoreNode, false, false, false, year, month, day).get(0).getNumOfEntries();
       }
   
  -    public List<BlogEntryCount> countAllBlogEntriesGroupByYearMonth(Node startNode, Node ignoreNode, Long maxDepth) {
  -        return countBlogEntries(startNode, ignoreNode, maxDepth, true, true, false, null, null, null);
  +    public List<BlogEntryCount> countAllBlogEntriesGroupByYearMonth(Node startNode, Node ignoreNode) {
  +        return countBlogEntries(startNode, ignoreNode, true, true, false, null, null, null);
       }
   
  -    private List<BlogEntryCount> countBlogEntries(Node startNode, Node ignoreNode, Long maxDepth,
  +    private List<BlogEntryCount> countBlogEntries(Node startNode, Node ignoreNode,
                                                    boolean projectYear, boolean projectMonth, boolean projectDay,
                                                    Integer limitYear, Integer limitMonth, Integer limitDay) {
   
  @@ -104,6 +104,8 @@
           queryString.append("and n1.nsLeft between n2.nsLeft and n2.nsRight").append(" ");
           queryString.append("and n2.nsLeft > :startLeft and n2.nsRight < :startRight").append(" ");
           queryString.append("and n2.class = :clazz").append(" ");
  +        queryString.append("and not n1.pluginsUsed like '%blogDirectory%'").append(" ");
  +
           if (ignoreNode.getId() != null)
               queryString.append("and not n1 = :ignoreNode").append(" ");
   
  @@ -144,6 +146,4 @@
           return ((Session)((org.jboss.seam.persistence.EntityManagerProxy) restrictedEntityManager).getDelegate());
       }
   
  -
  -
   }
  
  
  
  1.14      +2 -4      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BlogDirectory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- BlogDirectory.java	25 Aug 2007 17:59:21 -0000	1.13
  +++ BlogDirectory.java	25 Aug 2007 22:35:10 -0000	1.14
  @@ -82,7 +82,7 @@
       }
   
       private void queryNumOfBlogEntries() {
  -        numOfBlogEntries = blogDAO.countBlogEntries(currentDirectory, currentDocument, 99l, year, month, day);
  +        numOfBlogEntries = blogDAO.countBlogEntries(currentDirectory, currentDocument, year, month, day);
       }
   
       private void queryBlogEntries() {
  @@ -90,7 +90,6 @@
               blogDAO.findBlogEntriesWithCommentCount(
                       currentDirectory,
                       currentDocument,
  -                    99l,
                       "createdOn",
                       true,
                       page * pageSize,
  @@ -100,7 +99,7 @@
       }
   
       private void queryBlogEntryCountsByYearAndMonth() {
  -        blogEntryCountsByYearAndMonth = blogDAO.countAllBlogEntriesGroupByYearMonth(currentDirectory, currentDocument, 99l);
  +        blogEntryCountsByYearAndMonth = blogDAO.countAllBlogEntriesGroupByYearMonth(currentDirectory, currentDocument);
       }
   
       @Factory(value = "recentBlogEntries")
  @@ -110,7 +109,6 @@
               blogDAO.findBlogEntriesWithCommentCount(
                       currentDirectory,
                       currentDocument,
  -                    99l,
                       "createdOn",
                       true,
                       0,