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 V2.2 to HEAD

Browse Source 
8206: Merged V2.1 to V2.2
      8136: Fixed AR-2043: XPathMetadataExtractor extracts empty strings
      8169: Fixes to Office add-in for ACT-267 - saving over an existing non-versionable file.
      8172: Fix for AWC-1838
   8221: Merged V2.1 to V2.2
      8210: Fix for AR-1830 - Search not returning expected results for umulat characters
      8211: Fix for AWC-1463 - MyWebForms and MyWebFiles templates now check for existance of stores before displaying them
   8222: Merged V2.1 to V2.2
      8216: Fix for AWC-1357
   8223: Missing Serializable interface (for web UI clustering)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-03-10 16:37:24 +00:00
parent c473277dbc
commit 163bb15d5e
8 changed files with 66 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,21 +502,10 @@ public class SearchContext implements Serializable
*/
private static void processSearchAttribute(QName qname, String value, StringBuilder buf, boolean andOp, boolean notOp)
{
if (value.indexOf(' ') == -1)
{
if (andOp) buf.append('+');
else if (notOp) buf.append('-');
buf.append('@').append(Repository.escapeQName(qname)).append(":")
.append(SearchContext.escape(value)).append(' ');
}
else
{
// phrase multi-word search
if (andOp) buf.append('+');
else if (notOp) buf.append('-');
buf.append('@').append(Repository.escapeQName(qname)).append(":\"")
.append(value).append('"').append(' ');
}
if (andOp) buf.append('+');
else if (notOp) buf.append('-');
buf.append('@').append(Repository.escapeQName(qname)).append(":\"")
.append(value).append("\" ");
}
/**
@@ -530,9 +519,9 @@ public class SearchContext implements Serializable
*/
private static void processSearchTextAttribute(String qname, String value, StringBuilder attrBuf, StringBuilder textBuf)
{
textBuf.append("TEXT:").append(SearchContext.escape(value));
attrBuf.append("@").append(qname).append(":")
.append(SearchContext.escape(value));
textBuf.append("TEXT:\"").append(value).append('"');
attrBuf.append('@').append(qname).append(":\"")
.append(value).append('"');
}
/**

2
source/java/org/alfresco/web/bean/users/UsersDialog.java
View File

@@ -267,7 +267,7 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha
UserTransaction tx = null;
try
{
tx = Repository.getUserTransaction(context, true);
tx = Repository.getUserTransaction(context);
tx.begin();
Map<QName, Serializable> props = properties.getNodeService().getProperties(properties.getPerson().getNodeRef());

8
source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
View File

@@ -992,7 +992,7 @@ public abstract class BaseAssociationEditor extends UIInput
if (contains != null && contains.length() > 0)
{
String safeContains = QueryParser.escape(contains.trim());
String safeContains = contains.trim();
// if the association's target is the person type search on the
// firstName and lastName properties instead of the name property
@@ -1002,9 +1002,9 @@ public abstract class BaseAssociationEditor extends UIInput
query.append(safeContains);
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:lastName:\"*");
query.append(safeContains);
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:");
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:\"");
query.append(safeContains);
query.append("*)");
query.append("*\")");
}
else
{
@@ -1012,7 +1012,7 @@ public abstract class BaseAssociationEditor extends UIInput
String nameAttr = Repository.escapeQName(QName.createQName(
NamespaceService.CONTENT_MODEL_1_0_URI, "name"));
query.append(nameAttr);
query.append(":*" + safeContains + "*");
query.append(":\"*" + safeContains + "*\"");
}
}