Author: ghuber
Date: Fri Oct 11 13:15:01 2013
New Revision: 1531288
URL: http://svn.apache.org/r1531288
Log:
Search not working on the category. Needs to be lower case for the clause to
work.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?rev=1531288&r1=1531287&r2=1531288&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
Fri Oct 11 13:15:01 2013
@@ -104,27 +104,28 @@ public abstract class IndexOperation imp
Document doc = new Document();
// keyword
- doc.add(new StringField(FieldConstants.ID, data.getId(),
Field.Store.YES));
+ doc.add(new StringField(FieldConstants.ID, data.getId(),
+ Field.Store.YES));
// keyword
- doc.add(new StringField(FieldConstants.WEBSITE_HANDLE,
data.getWebsite()
- .getHandle(), Field.Store.YES));
+ doc.add(new StringField(FieldConstants.WEBSITE_HANDLE, data
+ .getWebsite().getHandle(), Field.Store.YES));
// text, don't index deleted/disabled users of a group blog
if (data.getCreator() != null) {
- doc.add(new TextField(FieldConstants.USERNAME,
data.getCreator().getUserName(),
- Field.Store.YES));
+ doc.add(new TextField(FieldConstants.USERNAME, data.getCreator()
+ .getUserName().toLowerCase(), Field.Store.YES));
}
// text
doc.add(new TextField(FieldConstants.TITLE, data.getTitle(),
Field.Store.YES));
- // keyword
- doc.add(new StringField(FieldConstants.LOCALE, data.getLocale(),
- Field.Store.YES));
+ // keyword needs to be in lower case as we are used in a term
+ doc.add(new StringField(FieldConstants.LOCALE, data.getLocale()
+ .toLowerCase(), Field.Store.YES));
- // index the entry text, but don't store it - moved to end of block
+ // index the entry text, but don't store it
doc.add(new TextField(FieldConstants.CONTENT, data.getText(),
Field.Store.NO));
@@ -136,11 +137,11 @@ public abstract class IndexOperation imp
doc.add(new StringField(FieldConstants.PUBLISHED, data.getPubTime()
.toString(), Field.Store.YES));
- // index Category
+ // index Category, needs to be in lower case as we are used in a term
WeblogCategory categorydata = data.getCategory();
if (categorydata != null) {
- doc.add(new StringField(FieldConstants.CATEGORY,
categorydata.getName(),
- Field.Store.YES));
+ doc.add(new StringField(FieldConstants.CATEGORY, categorydata
+ .getName().toLowerCase(), Field.Store.YES));
}
// index Comments, unstored
@@ -148,10 +149,12 @@ public abstract class IndexOperation imp
Field.Store.NO));
// keyword
- doc.add(new StringField(FieldConstants.C_EMAIL, commentEmail,
Field.Store.YES));
+ doc.add(new StringField(FieldConstants.C_EMAIL, commentEmail,
+ Field.Store.YES));
// keyword
- doc.add(new StringField(FieldConstants.C_NAME, commentName,
Field.Store.YES));
+ doc.add(new StringField(FieldConstants.C_NAME, commentName,
+ Field.Store.YES));
return doc;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1531288&r1=1531287&r2=1531288&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Fri Oct 11 13:15:01 2013
@@ -57,6 +57,9 @@ import org.apache.roller.weblogger.util.
* Handles search queries for weblogs.
*/
public class SearchServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 6246730804167411636L;
+
private static Log log = LogFactory.getLog(SearchServlet.class);
// Development theme reloading
@@ -104,6 +107,33 @@ public class SearchServlet extends HttpS
return;
}
+ // Development only. Reload if theme has been modified
+ if (themeReload
+ && !weblog.getEditorTheme()
+ .equals(WeblogTemplate.ACTION_CUSTOM)
+ && (searchRequest.getPathInfo() == null || searchRequest
+ .getPathInfo() != null)) {
+
+ try {
+ ThemeManager manager = WebloggerFactory.getWeblogger()
+ .getThemeManager();
+ boolean reloaded = manager.reLoadThemeFromDisk(weblog
+ .getEditorTheme());
+ if (reloaded) {
+ if (WebloggerRuntimeConfig.isSiteWideWeblog(searchRequest
+ .getWeblogHandle())) {
+ SiteWideCache.getInstance().clear();
+ } else {
+ WeblogPageCache.getInstance().clear();
+ }
+ I18nMessages.reloadBundle(weblog.getLocaleInstance());
+ }
+
+ } catch (Exception ex) {
+ log.error("ERROR - reloading theme " + ex);
+ }
+ }
+
// Get the deviceType from user agent
MobileDeviceRepository.DeviceType deviceType = MobileDeviceRepository
.getRequestType(request);
@@ -193,6 +223,7 @@ public class SearchServlet extends HttpS
// Load weblog custom models
ModelLoader.loadCustomModels(weblog, model, initData);
+ // TODO This causes another search, remove.
// manually add search model again to support pre-3.0 weblogs
Model searchModel = new SearchResultsModel();
searchModel.init(initData);
@@ -208,33 +239,6 @@ public class SearchServlet extends HttpS
return;
}
- // Development only. Reload if theme has been modified
- if (themeReload
- && !weblog.getEditorTheme()
- .equals(WeblogTemplate.ACTION_CUSTOM)
- && (searchRequest.getPathInfo() == null || searchRequest
- .getPathInfo() != null)) {
-
- try {
- ThemeManager manager = WebloggerFactory.getWeblogger()
- .getThemeManager();
- boolean reloaded = manager.reLoadThemeFromDisk(weblog
- .getEditorTheme());
- if (reloaded) {
- if (WebloggerRuntimeConfig.isSiteWideWeblog(searchRequest
- .getWeblogHandle())) {
- SiteWideCache.getInstance().clear();
- } else {
- WeblogPageCache.getInstance().clear();
- }
- I18nMessages.reloadBundle(weblog.getLocaleInstance());
- }
-
- } catch (Exception ex) {
- log.error("ERROR - reloading theme " + ex);
- }
- }
-
// lookup Renderer we are going to use
Renderer renderer = null;
try {
