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

Improvements to Simple and Advanced Search to add basic operator support

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-01-17 13:36:18 +00:00
parent e7ce03d4cf
commit 4732ebc744
1 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,9 @@ import org.dom4j.io.XMLWriter;
/** /**
* Holds the context required to build a search query and can return the populated query. * Holds the context required to build a search query and can return the populated query.
* <p>
* Builds a lucene format search string from each of the supplied attributes and terms.
* Can be serialized to and from XML format for saving and restoring of previous searches.
* *
* @author Kevin Roast * @author Kevin Roast
*/ */
@@ -78,6 +81,11 @@ public final class SearchContext implements Serializable
private static final String ELEMENT_SEARCH = "search"; private static final String ELEMENT_SEARCH = "search";
private static final String ELEMENT_QUERY = "query"; private static final String ELEMENT_QUERY = "query";
/** advanced search term operators */
private static final char OP_WILDCARD = '*';
private static final char OP_AND = '+';
private static final char OP_NOT = '-';
/** Search mode constants */ /** Search mode constants */
public final static int SEARCH_ALL = 0; public final static int SEARCH_ALL = 0;
public final static int SEARCH_FILE_NAMES_CONTENTS = 1; public final static int SEARCH_FILE_NAMES_CONTENTS = 1;
@@ -141,19 +149,19 @@ public final class SearchContext implements Serializable
if (text.indexOf(' ') == -1 && text.charAt(0) != '"') if (text.indexOf(' ') == -1 && text.charAt(0) != '"')
{ {
// simple single word text search // simple single word text search
if (text.charAt(0) != '*') if (text.charAt(0) != OP_WILDCARD)
{ {
// escape characters and append the wildcard character // escape characters and append the wildcard character
String safeText = QueryParser.escape(text); String safeText = QueryParser.escape(text);
fullTextQuery = " TEXT:" + safeText + '*'; fullTextQuery = " TEXT:" + safeText + OP_WILDCARD;
nameAttrQuery = " @" + nameAttr + ":" + safeText + '*'; nameAttrQuery = " @" + nameAttr + ":" + safeText + OP_WILDCARD;
} }
else else
{ {
// found a leading wildcard - prepend it again after escaping the other characters // found a leading wildcard - prepend it again after escaping the other characters
String safeText = QueryParser.escape(text.substring(1)); String safeText = QueryParser.escape(text.substring(1));
fullTextQuery = " TEXT:*" + safeText + '*'; fullTextQuery = " TEXT:*" + safeText + OP_WILDCARD;
nameAttrQuery = " @" + nameAttr + ":*" + safeText + '*'; nameAttrQuery = " @" + nameAttr + ":*" + safeText + OP_WILDCARD;
} }
} }
else else
@@ -161,7 +169,7 @@ public final class SearchContext implements Serializable
// multiple word search // multiple word search
if (text.charAt(0) == '"' && text.charAt(text.length() - 1) == '"') if (text.charAt(0) == '"' && text.charAt(text.length() - 1) == '"')
{ {
// as quoted phrase // as a single quoted phrase
String quotedSafeText = '"' + QueryParser.escape(text.substring(1, text.length() - 1)) + '"'; String quotedSafeText = '"' + QueryParser.escape(text.substring(1, text.length() - 1)) + '"';
fullTextQuery = " TEXT:" + quotedSafeText; fullTextQuery = " TEXT:" + quotedSafeText;
nameAttrQuery = " @" + nameAttr + ":" + quotedSafeText; nameAttrQuery = " @" + nameAttr + ":" + quotedSafeText;
@@ -174,25 +182,45 @@ public final class SearchContext implements Serializable
StringBuilder nameAttrBuf = new StringBuilder(64); StringBuilder nameAttrBuf = new StringBuilder(64);
fullTextBuf.append('('); fullTextBuf.append('(');
nameAttrBuf.append('('); nameAttrBuf.append('(');
while (t.hasMoreTokens()) int tokenCount = t.countTokens();
for (int i=0; i<tokenCount; i++)
{ {
String term = t.nextToken(); String term = t.nextToken();
if (term.charAt(0) != '*')
// check for existance of a special operator
boolean operatorAND = (term.charAt(0) == OP_AND);
boolean operatorNOT = (term.charAt(0) == OP_NOT);
// strip operator from term if one was found
if (operatorAND || operatorNOT)
{
term = term.substring(1);
}
// operators such as AND and OR are only make sense for full text searching
if (i != 0)
{
fullTextBuf.append(operatorAND ? " AND " : " OR ");
nameAttrBuf.append(operatorAND ? " AND " : " OR ");
}
// prepend NOT operator if supplied
if (operatorNOT)
{
fullTextBuf.append(OP_NOT);
nameAttrBuf.append(OP_NOT);
}
if (term.charAt(0) != OP_WILDCARD)
{ {
String safeTerm = QueryParser.escape(term); String safeTerm = QueryParser.escape(term);
fullTextBuf.append("TEXT:").append(safeTerm).append('*'); fullTextBuf.append("TEXT:").append(safeTerm).append(OP_WILDCARD);
nameAttrBuf.append("@").append(nameAttr).append(":").append(safeTerm).append('*'); nameAttrBuf.append("@").append(nameAttr).append(":").append(safeTerm).append(OP_WILDCARD);
} }
else else
{ {
String safeTerm = QueryParser.escape(term.substring(1)); String safeTerm = QueryParser.escape(term.substring(1));
fullTextBuf.append("TEXT:*").append(safeTerm).append('*'); fullTextBuf.append("TEXT:*").append(safeTerm).append(OP_WILDCARD);
nameAttrBuf.append("@").append(nameAttr).append(":*").append(safeTerm).append('*'); nameAttrBuf.append("@").append(nameAttr).append(":*").append(safeTerm).append(OP_WILDCARD);
}
if (t.hasMoreTokens())
{
fullTextBuf.append(" OR ");
nameAttrBuf.append(" OR ");
} }
} }
fullTextBuf.append(')'); fullTextBuf.append(')');
@@ -239,7 +267,7 @@ public final class SearchContext implements Serializable
{ {
String escapedName = Repository.escapeQName(qname); String escapedName = Repository.escapeQName(qname);
attributeQuery.append(" +@").append(escapedName) attributeQuery.append(" +@").append(escapedName)
.append(":").append(QueryParser.escape(value)).append('*'); .append(":").append(QueryParser.escape(value)).append(OP_WILDCARD);
} }
} }