Author: amarkhel
Date: 2009-03-23 14:41:17 -0400 (Mon, 23 Mar 2009)
New Revision: 13124
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
Log:
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
---
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-23
18:39:15 UTC (rev 13123)
+++
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-23
18:41:17 UTC (rev 13124)
@@ -73,8 +73,11 @@
}
public void addImage(Image image, boolean isFlushNeeded) {
- String[] tokens = image.getMeta().split(",");
+/* String[] tokens = image.getMeta().split(",");
for(String token:tokens){
+ if(token.equals("")){
+ continue;
+ }
MetaTag t =(MetaTag) em.createQuery("from MetaTag t where t.tag
=:token").setParameter("token", token).getSingleResult();
if(t != null){
t.addImage(image);
@@ -85,7 +88,7 @@
t.addImage(image);
image.addMetaTag(t);
}
- }
+ }*/
em.persist(image);
image.getAlbum().addImage(image);
if(isFlushNeeded){
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
===================================================================
---
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-03-23
18:39:15 UTC (rev 13123)
+++
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-03-23
18:41:17 UTC (rev 13124)
@@ -60,8 +60,6 @@
if(searchInShared){
query.setParameter("shared", searchInShared);
}
-
-
if (searchInMyAlbums) {
query.setParameter("login", user.getLogin());
}
@@ -88,11 +86,16 @@
public List<Shelf> searchByShelfs(String searchQuery, boolean searchInMyAlbums,
boolean searchInShared) {
StringBuilder b = new StringBuilder("from Shelf sh where lower(sh.name) like :name
or lower(sh.description) like :name ");
+ if (searchInMyAlbums) {
+ b.append(" and sh.owner.login=:login");
+ }
if (searchInShared) {
b.append(" and sh.shared=true");
}
Query query = em.createQuery(b.toString());
-
+ if (searchInMyAlbums) {
+ query.setParameter("login", user.getLogin());
+ }
query.setParameter("name", "%" + searchQuery.toLowerCase() +
"%");
return query.getResultList();
}
Show replies by date