[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao ...

[Christian Bauer]

  User: cbauer  
  Date: 07/04/09 04:43:53

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao 
                        FeedDAO.java
  Log:
  Plugin for feed teaser preview
  
  Revision  Changes    Path
  1.2       +20 -15    jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FeedDAO.java	8 Apr 2007 15:10:37 -0000	1.1
  +++ FeedDAO.java	9 Apr 2007 08:43:53 -0000	1.2
  @@ -44,16 +44,16 @@
           return null;
       }
   
  -    public List<FeedEntry> findFeedEntries(Feed feed) {
  +    public List<FeedEntry> findFeedEntries(Feed feed, Integer limit) {
           restrictedEntityManager.joinTransaction();
           //noinspection unchecked
           return (List<FeedEntry>)restrictedEntityManager
  -                .createQuery("select fe from FeedEntry fe join fe.feeds f where f = :feed")
  +                .createQuery("select fe from FeedEntry fe join fe.feeds f where f = :feed order by fe.updatedDate desc")
                   .setParameter("feed", feed)
                   .getResultList();
       }
   
  -    public void createFeedEntries(Document document) {
  +    public void createFeedEntries(boolean pushOnSiteFeed, Document document) {
           restrictedEntityManager.joinTransaction();
   
           Set<Feed> feeds = new HashSet<Feed>();
  @@ -62,21 +62,26 @@
               if (temp.getFeed() != null) feeds.add(temp.getFeed());
               temp = temp.getParent();
           }
  +
  +        if (pushOnSiteFeed)
           feeds.add(temp.getFeed()); // Reached wiki root, feed for whole site
   
  +        if (feeds.size() >0) {
           FeedEntry feedEntry = new FeedEntry();
           feedEntry.setDocument(document);
           feedEntry.setLink(renderFeedURL(document));
           feedEntry.setTitle(document.getName());
           feedEntry.setAuthor(document.getCreatedBy().getFullname());
  +            feedEntry.setUpdatedDate(feedEntry.getPublishedDate());
           feedEntry.setDescriptionType("text/html");
           feedEntry.setDescriptionValue(renderWikiText(document.getContent()));
           feedEntry.getFeeds().addAll(feeds);
   
           restrictedEntityManager.persist(feedEntry);
       }
  +    }
   
  -    public void updateFeedEntries(Document document) {
  +    public void updateFeedEntries(boolean pushOnSiteFeed, Document document) {
           restrictedEntityManager.joinTransaction();
   
           int updatedEntries = restrictedEntityManager
  @@ -93,7 +98,7 @@
               .setParameter("document", document)
               .executeUpdate();
   
  -        if (updatedEntries == 0) createFeedEntries(document);
  +        if (updatedEntries == 0) createFeedEntries(pushOnSiteFeed, document);
       }
   
       public void removeFeedEntries(Document document) {