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

Merged V4.1-BUG-FIX to HEAD

Browse Source 
44740: BDE-91 - added ability to enable and disable some RMI services through config.
   44744: Incorrect service url used for Links RSS feed. Code tidy up.
   44754: Fix performance degradation when using SSO header based authentication config:
    - The SlingshotAlfrescoConnector used when configuring header based SSO for Share was not extending the RequestCachingConnector class - means it was missing out on the free caching of identical GET requests per page render
    - This makes a huge difference to the number of small requests required to build pages in Share 4.0+, particularly dashboards and document details pages.
   44759: ALF-17245: Merged PATCHES/V3.4.10 to V4.1-BUG-FIX
      44104: Merged DEV to PATCHES/V3.4.10
         43953: MNT-214 : Modification date is lost when Excel 2003 is closed
            The modification date is now updated during rename operation.
      44711: Merged DEV to PATCHES/V3.4.10
         44699: MNT-214 : Modification date is lost when Excel 2003 is closed
            A fix to save modification date in shuffle rename operation.
   44760: ALF-17246: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      44757: ALF-17073: Advanced search - Lucene query construction - Change between 3.4.9 and 3.4.10
      - In the fix to ALF-12666 followed by ALF-14699 we somehow lost the ability to distinguish ANDs from ORs. The 'additional attributes' should be part of an OR, but we still need to AND together multiple ORs if the AND operator is specified. 
   44761: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      44748: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         42311: ALF-17235: Merged PATCHES/V4.0.2 to PATCHES/V3.4.10
            39939: ALF-15001: Gracefully handle stale NodeRefs in query results in DMDiscoveryServicePort
            - SOLR makes this more likely to occur
         44104: ALF-17236: Merged DEV to PATCHES/V3.4.10
            43953: MNT-214 : Modification date is lost when Excel 2003 is closed
               The modification date is now updated during rename operation.
         44415: ALF-17237: Merged DEV to PATCHES/V3.4.10
           MNT-211 : versionable aspect lost from .csv files edited over CIFS using Office 2003
         44711: ALF-17236: Merged DEV to PATCHES/V3.4.10
            44699: MNT-214 : Modification date is lost when Excel 2003 is closed
               A fix to save modification date in shuffle rename operation.
   44762: Merged V4.1 to V4.1-BUG-FIX
      44743: ALF-17117: Created article or publication cant be viewed on WQS site
         - Further corrections to locking to avoid deadlocks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-12-17 14:55:13 +00:00
parent ee798ddb37
commit 044ff05662
1 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
source/java/org/alfresco/web/bean/search/SearchContext.java
View File

@@ -33,7 +33,6 @@ import javax.faces.context.FacesContext;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path;
@@ -153,11 +152,12 @@ public class SearchContext implements Serializable
// the QName for the well known "name" attribute
String nameAttr = Repository.escapeQName(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, ELEMENT_NAME));
StringBuilder plBuf = new StringBuilder("(");
StringBuilder mnBuf = new StringBuilder("-(");
StringBuilder plBuf = new StringBuilder(500).append("(");
StringBuilder mnBuf = new StringBuilder(500).append("-(");
// match against content text
String text = this.text.trim();
boolean appendText = mode == SEARCH_FILE_NAMES_CONTENTS || mode == SEARCH_ALL;
if (text.length() != 0 && text.length() >= minimum)
{
@@ -174,19 +174,26 @@ public class SearchContext implements Serializable
if (text.length() != 0)
{
// prepend NOT operator if supplied
if (operatorNOT)
{
processSearchTextAttribute(nameAttr, text, mode == SEARCH_FILE_NAMES_CONTENTS || mode == SEARCH_ALL, mnBuf);
processSearchTextAttribute(nameAttr, text, appendText, mnBuf);
processSearchAdditionalAttributes(text, mnBuf, this.simpleSearchAdditionalAttrs);
}
// prepend AND operator if supplied
else
{
processSearchTextAttribute(nameAttr, text, mode == SEARCH_FILE_NAMES_CONTENTS || mode == SEARCH_ALL, plBuf);
if (plBuf.length() > 1)
{
plBuf.append(' ');
}
if (operatorAND)
{
plBuf.append(OP_AND);
}
plBuf.append('(');
processSearchTextAttribute(nameAttr, text, appendText, plBuf);
processSearchAdditionalAttributes(text, plBuf, this.simpleSearchAdditionalAttrs);
plBuf.append(')');
}
processSearchAdditionalAttribute(text, operatorNOT, operatorAND, mnBuf, plBuf, this.simpleSearchAdditionalAttrs);
}
}
else
@@ -196,11 +203,14 @@ public class SearchContext implements Serializable
{
// as a single quoted phrase
String quotedSafeText = '"' + QueryParser.escape(text.substring(1, text.length() - 1)) + '"';
plBuf.append("TEXT:").append(quotedSafeText);
if (appendText)
{
plBuf.append("TEXT:").append(quotedSafeText);
}
plBuf.append(" @").append(nameAttr).append(":").append(quotedSafeText);
for (QName qname : this.simpleSearchAdditionalAttrs)
{
plBuf.append(" @").append(
plBuf.append(" @").append(
Repository.escapeQName(qname)).append(":").append(quotedSafeText);
}
}
@@ -209,7 +219,6 @@ public class SearchContext implements Serializable
// as individual search terms
StringTokenizer t = new StringTokenizer(text, " ");
int termCount = 0;
int tokenCount = t.countTokens();
for (int i=0; i<tokenCount; i++)
{
@@ -233,24 +242,32 @@ public class SearchContext implements Serializable
if (term.length() != 0)
{
// prepend NOT operator if supplied
if (operatorNOT)
{
processSearchTextAttribute(nameAttr, term, mode == SEARCH_FILE_NAMES_CONTENTS || mode == SEARCH_ALL, mnBuf);
processSearchTextAttribute(nameAttr, term, appendText, mnBuf);
if (mode == SearchContext.SEARCH_ALL)
{
processSearchAdditionalAttributes(term, mnBuf, this.simpleSearchAdditionalAttrs);
}
}
// prepend AND operator if supplied
else
{
processSearchTextAttribute(nameAttr, term, mode == SEARCH_FILE_NAMES_CONTENTS || mode == SEARCH_ALL, plBuf);
if (plBuf.length() > 0)
{
plBuf.append(' ');
}
if (operatorAND)
{
plBuf.append(OP_AND);
}
plBuf.append('(');
processSearchTextAttribute(nameAttr, term, appendText, plBuf);
if (mode == SearchContext.SEARCH_ALL)
{
processSearchAdditionalAttributes(term, plBuf, this.simpleSearchAdditionalAttrs);
}
plBuf.append(')');
}
if (mode == SearchContext.SEARCH_ALL)
{
processSearchAdditionalAttribute(term, operatorNOT, operatorAND, mnBuf, plBuf, this.simpleSearchAdditionalAttrs);
}
termCount++;
}
}
}
@@ -475,12 +492,10 @@ public class SearchContext implements Serializable
* @param qname QName of the attribute
* @param value Non-null value of the attribute
* @param buf Buffer to append lucene terms to
* @param andOp If true apply the '+' AND operator as the prefix to the attribute term
* @param notOp If true apply the '-' NOT operator as the prefix to the attribute term
*/
private static void processSearchAttribute(QName qname, String value, StringBuilder buf)
{
buf.append(" @").append(Repository.escapeQName(qname)).append(":\"")
buf.append(" +@").append(Repository.escapeQName(qname)).append(":\"")
.append(SearchContext.escape(value)).append("\" ");
}
@@ -503,24 +518,15 @@ public class SearchContext implements Serializable
}
}
private static void processSearchAdditionalAttribute(String value, boolean operatorNOT, boolean operatorAND, StringBuilder mnBuf, StringBuilder plBuf,
List<QName> simpleSearchAdditionalAttrs)
private static void processSearchAdditionalAttributes(String value, StringBuilder buf,
List<QName> simpleSearchAdditionalAttrs)
{
for (QName qname : simpleSearchAdditionalAttrs)
{
// prepend NOT operator if supplied
if (operatorNOT)
{
processSearchAttribute(qname, value, mnBuf);
}
// prepend AND operator if supplied
else
{
processSearchAttribute(qname, value, plBuf);
}
for (QName qname : simpleSearchAdditionalAttrs)
{
buf.append(" @").append(Repository.escapeQName(qname)).append(":\"").append(SearchContext.escape(value))
.append("\" ");
}
}
}
/**
* Returns a String where those characters that QueryParser