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 V3.0 to HEAD

Browse Source 
11489: Added step for JDBC info
   11490: Fixed: ETHREEOH-452 Error appear when a user trying to view metadata for item, which is deleting
   11491: Blog integration package rename and removal of obsolete web-client beans
   11492: Adding missing web-extension dir to dynamic-website project
   11493: ETHREEOH_520: Fixes to prevent new users from being created when existing users invited to a site
   11494: Updated version to beta2
   11495: Fixes ETHREEOH-252, 392 & 393. When merged to 2.2 will also fix ETWOTWO-246 & 616 and when merged to HEAD will fix ALFCOM-1685 & 1712. 
   11496: Partial fix for ETHREEOH-27, fixes 2 out of the final 3 error conditions.
   11497: Fix for ETHREEOH-550

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12447 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-17 13:28:44 +00:00
parent 466aba8908
commit 9cfb7526d7
5 changed files with 196 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
View File

@@ -77,11 +77,11 @@ public class AVMRemoteStore extends BaseRemoteStore
*/
public void setRootPath(String rootPath)
{
if(rootPath != null && rootPath.length() == 0)
{
rootPath = "/";
}
if (rootPath != null && rootPath.length() == 0)
{
rootPath = "/";
}
this.rootPath = rootPath;
}
@@ -92,7 +92,7 @@ public class AVMRemoteStore extends BaseRemoteStore
{
this.avmService = avmService;
}
/**
* @param searchService the SearchService to set
*/
@@ -374,15 +374,6 @@ public class AVMRemoteStore extends BaseRemoteStore
{
if (n.isFile())
{
/*
String myPath = n.getPath();
String origPath = node.getPath();
String toWrite = myPath.substring(origPath.length());
out.write(toWrite);
out.write("\n");
*/
out.write(n.getPath().substring(cropPoint));
out.write("\n");
}
@@ -417,18 +408,11 @@ public class AVMRemoteStore extends BaseRemoteStore
String encPath = RepoStore.encodePathISO9075(path);
final StringBuilder query = new StringBuilder(128);
query.append("+PATH:\"").append(this.rootPath)
.append(encPath.length() != 0 ? ('/' + encPath) : "")
.append("//*\" +QNAME:")
.append(pattern);
/*
query.append("+PATH:\"/").append(this.rootPath)
.append(encPath.length() != 0 ? ('/' + encPath) : "")
.append("//*\" +QNAME:")
.append(pattern);
*/
.append(pattern);
final Writer out = res.getWriter();
final StoreRef avmStore = new StoreRef(StoreRef.PROTOCOL_AVM + StoreRef.URI_FILLER + store);
@@ -470,11 +454,109 @@ public class AVMRemoteStore extends BaseRemoteStore
*/
private String buildAVMPath(String store, String path)
{
//return store + ":/" + this.rootPath + (path != null ? ("/" + path) : "");
if(path.startsWith("/"))
{
path = path.substring(1);
}
return store + ":" + this.rootPath + (path != null ? path : "");
if (path.startsWith("/"))
{
path = path.substring(1);
}
return store + ":" + this.rootPath + (path != null ? encodePath(path) : "");
}
private static String encodePath(final String s)
{
StringBuilder sb = null; //create on demand
char ch;
final int len = s.length();
for (int i = 0; i < len; i++)
{
ch = s.charAt(i);
if (('A' <= ch && ch <= 'Z') || // 'A'..'Z'
('a' <= ch && ch <= 'z') || // 'a'..'z'
('0' <= ch && ch <= '9') || // '0'..'9'
ch == '/' ||
ch == '\'' || ch == ' ' ||
ch == '.' || ch == '~' ||
ch == '-' || ch == '_' ||
ch == '@' || ch == '!' ||
ch == '(' || ch == ')' ||
ch == ';' || ch == ',' ||
ch == '+' || ch == '$')
{
if (sb != null)
{
sb.append(ch);
}
}
else if ((int)ch <= 0x007f) // other ASCII
{
if (sb == null)
{
final String soFar = s.substring(0, i);
sb = new StringBuilder(len + 16);
sb.append(soFar);
}
sb.append(hex[ch]);
}
else if ((int)ch <= 0x07FF) // non-ASCII <= 0x7FF
{
if (sb == null)
{
final String soFar = s.substring(0, i);
sb = new StringBuilder(len + 16);
sb.append(soFar);
}
sb.append(hex[0xc0 | (ch >> 6)]);
sb.append(hex[0x80 | (ch & 0x3F)]);
}
else // 0x7FF < ch <= 0xFFFF
{
if (sb == null)
{
final String soFar = s.substring(0, i);
sb = new StringBuilder(len + 16);
sb.append(soFar);
}
sb.append(hex[0xe0 | (ch >> 12)]);
sb.append(hex[0x80 | ((ch >> 6) & 0x3F)]);
sb.append(hex[0x80 | (ch & 0x3F)]);
}
}
return (sb != null ? sb.toString() : s);
}
private final static String[] hex = {
"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
"%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
"%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
"%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
"%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
"%28", "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f",
"%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
"%38", "%39", "%3a", "%3b", "%3c", "%3d", "%3e", "%3f",
"%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
"%48", "%49", "%4a", "%4b", "%4c", "%4d", "%4e", "%4f",
"%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
"%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e", "%5f",
"%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
"%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f",
"%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
"%78", "%79", "%7a", "%7b", "%7c", "%7d", "%7e", "%7f",
"%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
"%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
"%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
"%98", "%99", "%9a", "%9b", "%9c", "%9d", "%9e", "%9f",
"%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
"%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
"%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
"%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf",
"%c0", "%c1", "%c2", "%c3", "%c4", "%c5", "%c6", "%c7",
"%c8", "%c9", "%ca", "%cb", "%cc", "%cd", "%ce", "%cf",
"%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
"%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
"%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7",
"%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee", "%ef",
"%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
"%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff"
};
}