garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

filter duplicates

Browse Source
This commit is contained in:
Athou
2013-06-23 16:10:34 +02:00
parent 8936a0c784
commit ad619a5262
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java
View File

@@ -10,6 +10,8 @@ import javax.persistence.criteria.Root;
import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.SetJoin;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry;
@@ -20,6 +22,9 @@ import com.google.common.collect.Iterables;
@Stateless @Stateless
public class FeedEntryDAO extends GenericDAO<FeedEntry> { public class FeedEntryDAO extends GenericDAO<FeedEntry> {
protected static final Logger log = LoggerFactory
.getLogger(FeedEntryDAO.class);
public static class EntryWithFeed { public static class EntryWithFeed {
public FeedEntry entry; public FeedEntry entry;
public Feed feed; public Feed feed;
@@ -38,9 +43,18 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
q.setParameter("url", url); q.setParameter("url", url);
q.setParameter("feedId", feedId); q.setParameter("feedId", feedId);
List<EntryWithFeed> resultList = q.getResultList(); EntryWithFeed result = null;
EntryWithFeed ewf = Iterables.getFirst(resultList, null); List<EntryWithFeed> list = q.getResultList();
return ewf; for (EntryWithFeed ewf : list) {
if (ewf.entry != null && ewf.feed != null) {
result = ewf;
break;
}
}
if (result == null) {
result = Iterables.getFirst(list, null);
}
return result;
} }
public List<FeedEntry> findByFeed(Feed feed, int offset, int limit) { public List<FeedEntry> findByFeed(Feed feed, int offset, int limit) {