aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/juick/service/MessagesService.java4
-rw-r--r--src/main/java/com/juick/service/MessagesServiceImpl.java9
-rw-r--r--src/main/java/com/juick/service/SearchService.java4
-rw-r--r--src/main/java/com/juick/service/SphinxSearchService.java17
-rw-r--r--src/main/java/com/juick/www/api/Messages.java4
-rw-r--r--src/main/java/com/juick/www/controllers/Site.java8
6 files changed, 17 insertions, 29 deletions
diff --git a/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java
index 43f4bd11..bb12a61e 100644
--- a/src/main/java/com/juick/service/MessagesService.java
+++ b/src/main/java/com/juick/service/MessagesService.java
@@ -89,7 +89,7 @@ public interface MessagesService {
List<Integer> getPhotos(int visitorUid, int before);
- List<Integer> getSearch(User visitor, String search, int page, boolean isTag);
+ List<Integer> getSearch(User visitor, String search, int page);
List<Integer> getUserBlog(int uid, int privacy, int before);
@@ -103,7 +103,7 @@ public interface MessagesService {
List<Integer> getUserPhotos(int uid, int privacy, int before);
- List<Integer> getUserSearch(User visitor, int UID, String search, int privacy, int page, boolean isTag);
+ List<Integer> getUserSearch(User visitor, int UID, String search, int privacy, int page);
List<Message> getMessages(User visitor, List<Integer> mids);
diff --git a/src/main/java/com/juick/service/MessagesServiceImpl.java b/src/main/java/com/juick/service/MessagesServiceImpl.java
index 49fc4f1f..b3b51bcc 100644
--- a/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -724,8 +724,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
@Transactional(readOnly = true)
@Override
- public List<Integer> getSearch(final User visitor, final String search, final int page, final boolean isTag) {
- return searchService.searchInAllMessages(visitor, search, page, isTag);
+ public List<Integer> getSearch(final User visitor, final String search, final int page) {
+ return searchService.searchInAllMessages(visitor, search, page);
}
@Transactional(readOnly = true)
@@ -863,9 +863,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
@Transactional(readOnly = true)
@Override
- public List<Integer> getUserSearch(final User visitor, final int UID, final String search, final int privacy,
- final int page, final boolean isTag) {
- return searchService.searchByStringAndUser(visitor, search, UID, page, isTag);
+ public List<Integer> getUserSearch(final User visitor, final int UID, final String search, final int privacy, final int page) {
+ return searchService.searchByStringAndUser(visitor, search, UID, page);
}
@Transactional(readOnly = true)
diff --git a/src/main/java/com/juick/service/SearchService.java b/src/main/java/com/juick/service/SearchService.java
index e484fd7b..377a26a4 100644
--- a/src/main/java/com/juick/service/SearchService.java
+++ b/src/main/java/com/juick/service/SearchService.java
@@ -27,7 +27,7 @@ import java.util.List;
public interface SearchService {
void setMaxResult(int maxResult);
- List<Integer> searchInAllMessages(User visitor, String searchString, int messageIdBefore, boolean exact);
+ List<Integer> searchInAllMessages(User visitor, String searchString, int messageIdBefore);
- List<Integer> searchByStringAndUser(User visitor, String searchString, final int userId, int messageIdBefore, boolean exact);
+ List<Integer> searchByStringAndUser(User visitor, String searchString, final int userId, int messageIdBefore);
}
diff --git a/src/main/java/com/juick/service/SphinxSearchService.java b/src/main/java/com/juick/service/SphinxSearchService.java
index e907515d..302f10de 100644
--- a/src/main/java/com/juick/service/SphinxSearchService.java
+++ b/src/main/java/com/juick/service/SphinxSearchService.java
@@ -43,19 +43,13 @@ public class SphinxSearchService extends BaseJdbcService implements SearchServic
@Inject
UserService userService;
- String sortHint(String searchString) {
+ public String sortHint(String searchString) {
boolean isOneWord = searchString.split("[^\\S\\+]+").length == 1;
return isOneWord ? "extended:@id desc" : "extended:@weight desc, @id desc";
}
- String searchTerm(String searchString, boolean exact) {
- String prefix = exact ? "*" : "";
- return String.format("%s%s", prefix, searchString);
- }
-
@Override
- public List<Integer> searchInAllMessages(User visitor, final String searchString, final int page,
- final boolean exact) {
+ public List<Integer> searchInAllMessages(User visitor, final String searchString, final int page) {
if (StringUtils.isBlank(searchString))
return Collections.emptyList();
@@ -70,14 +64,13 @@ public class SphinxSearchService extends BaseJdbcService implements SearchServic
}
return getJdbcTemplate().queryForList(
- String.format("SELECT id FROM search WHERE query = '%s;%s'", searchTerm(searchString, exact),
+ String.format("SELECT id FROM search WHERE query = '%s;%s'", searchString,
sphinxQuery.entrySet().stream().map(Object::toString)
.collect(Collectors.joining(";"))), Integer.class);
}
@Override
- public List<Integer> searchByStringAndUser(User visitor, final String searchString, final int userId, int page,
- final boolean exact) {
+ public List<Integer> searchByStringAndUser(User visitor, final String searchString, final int userId, int page) {
if (StringUtils.isBlank(searchString))
return Collections.emptyList();
@@ -89,7 +82,7 @@ public class SphinxSearchService extends BaseJdbcService implements SearchServic
sphinxQuery.put("offset", String.valueOf(page * maxResult));
}
return getJdbcTemplate().queryForList(
- String.format("SELECT id FROM search WHERE query = '%s;%s;filter=user_id,%d'", searchTerm(searchString, exact),
+ String.format("SELECT id FROM search WHERE query = '%s;%s;filter=user_id,%d'", searchString,
sphinxQuery.entrySet().stream().map(Object::toString)
.collect(Collectors.joining(";")), userId), Integer.class);
}
diff --git a/src/main/java/com/juick/www/api/Messages.java b/src/main/java/com/juick/www/api/Messages.java
index a4d1eba8..b7e9cb0b 100644
--- a/src/main/java/com/juick/www/api/Messages.java
+++ b/src/main/java/com/juick/www/api/Messages.java
@@ -119,7 +119,7 @@ public class Messages {
} else if (daysback > 0) {
mids = messagesService.getUserBlogAtDay(user.getUid(), 0, daysback);
} else if (!StringUtils.isEmpty(search)) {
- mids = messagesService.getUserSearch(visitor, user.getUid(), WebUtils.encodeSphinx(search), 0, page, false);
+ mids = messagesService.getUserSearch(visitor, user.getUid(), WebUtils.encodeSphinx(search), 0, page);
} else {
mids = messagesService.getUserBlog(user.getUid(), 0, before);
}
@@ -139,7 +139,7 @@ public class Messages {
return NOT_FOUND;
}
} else if (!StringUtils.isEmpty(search)) {
- mids = messagesService.getSearch(visitor, WebUtils.encodeSphinx(search), page, false);
+ mids = messagesService.getSearch(visitor, WebUtils.encodeSphinx(search), page);
} else {
mids = messagesService.getAll(visitor.getUid(), before);
}
diff --git a/src/main/java/com/juick/www/controllers/Site.java b/src/main/java/com/juick/www/controllers/Site.java
index 59a3ed1d..dc037073 100644
--- a/src/main/java/com/juick/www/controllers/Site.java
+++ b/src/main/java/com/juick/www/controllers/Site.java
@@ -108,7 +108,7 @@ public class Site {
if (paramSearch != null) {
title = "Поиск: " + StringEscapeUtils.escapeHtml4(paramSearch);
- mids = messagesService.getSearch(visitor, WebUtils.encodeSphinx(paramSearch), page, false);
+ mids = messagesService.getSearch(visitor, WebUtils.encodeSphinx(paramSearch), page);
} else if (paramShow == null) {
title = "Обсуждения";
mids = messagesService.getDiscussions(visitor.getUid(), paramTo);
@@ -194,11 +194,8 @@ public class Site {
List<Integer> mids;
- boolean isTagSearch = false;
-
if (paramTagStr != null) {
paramSearch = paramTagStr;
- isTagSearch = true;
}
if (paramSearch != null && paramSearch.length() > 64) {
paramSearch = null;
@@ -217,8 +214,7 @@ public class Site {
if (paramShow == null) {
if (paramSearch != null) {
title = "Блог " + user.getName() + ": " + StringEscapeUtils.escapeHtml4(paramSearch);
- mids = messagesService.getUserSearch(visitor, user.getUid(), WebUtils.encodeSphinx(paramSearch),
- privacy, page, isTagSearch);
+ mids = messagesService.getUserSearch(visitor, user.getUid(), WebUtils.encodeSphinx(paramSearch), privacy, page);
} else {
title = "Блог " + user.getName();
mids = messagesService.getUserBlog(user.getUid(), privacy, before);