inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple word searches failing when no "additional attributes" specified in config.

Browse Source 
Error component location in browse.jsp layout was not collecting and displaying exceptions for the list components.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-06-14 13:19:47 +00:00
parent f7bafca8fa
commit da7ad6d1fd
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/web/bean/SearchContext.java
View File

@@ -165,15 +165,6 @@ public final class SearchContext implements Serializable
StringBuilder nameAttrBuf = new StringBuilder(128);
StringBuilder additionalAttrsBuf = new StringBuilder(128);
/*Map<QName, StringBuilder> simpleAdditionalAttrBufs = new HashMap<QName, StringBuilder>();
if (this.simpleSearchAdditionalAttrs != null)
{
for (QName qName : this.simpleSearchAdditionalAttrs)
{
simpleAdditionalAttrBufs.put(qName, new StringBuilder(64));
}
}*/
if (text.length() != 0 && text.length() >= minimum)
{
if (text.indexOf(' ') == -1 && text.charAt(0) != '"')
@@ -422,7 +413,8 @@ public final class SearchContext implements Serializable
String fullTextQuery = fullTextBuf.toString();
String nameAttrQuery = nameAttrBuf.toString();
String additionalAttrsQuery = additionalAttrsBuf.toString();
String additionalAttrsQuery =
(this.simpleSearchAdditionalAttrs.size() != 0) ? additionalAttrsBuf.toString() : "";
if (text.length() != 0 && text.length() >= minimum)
{
@@ -430,7 +422,8 @@ public final class SearchContext implements Serializable
switch (mode)
{
case SearchContext.SEARCH_ALL:
query = '(' + fileTypeQuery + " AND " + '(' + nameAttrQuery + ' ' + additionalAttrsQuery + ' ' + fullTextQuery + ')' + ')' + " OR " +
query = '(' + fileTypeQuery + " AND " + '(' + nameAttrQuery + ' ' + additionalAttrsQuery + ' ' + fullTextQuery + ')' + ')' +
" OR " +
'(' + folderTypeQuery + " AND " + nameAttrQuery + ' ' + additionalAttrsQuery + ')';
break;