Revision f9bd859c

b/src/gr/ebs/gss/server/rest/FilesHandler.java
2216 2216
		int indexFolderPath = relativePath.indexOf(folderPath);
2217 2217
		String relativePathNoFolderName = relativePath.substring(0, indexFolderPath);
2218 2218
		String parentDirectory = folderPath;
2219
		//To-do: further search in encoding folder names with special characters
2219 2220
		//String rewrittenParentDirectory = rewriteUrl(parentDirectory);
2220 2221
		if (parentDirectory.endsWith("/"))
2221 2222
			parentDirectory = parentDirectory.substring(0, parentDirectory.length() - 1);
2222 2223
		int slash = parentDirectory.lastIndexOf('/');
2224
		parentDirectory = parentDirectory.substring(0,slash);
2223 2225
		if (slash >= 0) {
2224
			String parent = folderPath.substring(0, slash);
2225 2226
			sb.append(" - <a href=\"");
2226 2227
			sb.append(rewrittenContextPath);
2227 2228
			sb.append(relativePathNoFolderName);
2228
			//sb.append(folderPath);
2229
			//if (parent.equals(""))
2230
				//parent = "/";
2231
			sb.append(parent);
2232
			//if (!parent.endsWith("/"))
2233
			//	sb.append("/");
2229
			sb.append(parentDirectory);
2230
			if (!parentDirectory.endsWith("/"))
2231
				sb.append("/");
2234 2232
			sb.append("\">");
2235 2233
			sb.append("<b>");
2236
			sb.append("Up To " + parentDirectory);
2234
			sb.append("Up To ");
2235
			if (parentDirectory.equals(""))
2236
				parentDirectory = "/";
2237
			sb.append(parentDirectory);
2237 2238
			sb.append("</b>");
2238 2239
			sb.append("</a>");
2239 2240
		}
......
2301 2302
		} catch (RpcException e) {
2302 2303
			throw new ServletException(e.getMessage());
2303 2304
		}
2304
		for (FileHeaderDTO file : files) {
2305
			String resourceName = file.getName();
2306
			if (resourceName.equalsIgnoreCase("WEB-INF") || resourceName.equalsIgnoreCase("META-INF"))
2307
				continue;
2308

  
2309
			sb.append("<tr");
2310
			if (shade)
2311
				sb.append(" bgcolor=\"#eeeeee\"");
2312
			sb.append(">\r\n");
2313
			shade = !shade;
2314

  
2315
			sb.append("<td align=\"left\">&nbsp;&nbsp;\r\n");
2316
			sb.append("<a href=\"");
2317
			sb.append(rewrittenContextPath);
2318
			sb.append(relativePath);
2319
			if(!relativePath.endsWith("/"))
2320
				sb.append("/");
2321
			sb.append(rewriteUrl(resourceName));
2322
			sb.append("\"><tt>");
2323
			sb.append(RequestUtil.filter(resourceName));
2324
			sb.append("</tt></a></td>\r\n");
2325

  
2326
			sb.append("<td align=\"right\"><tt>");
2327
			sb.append(renderSize(file.getFileSize()));
2328
			sb.append("</tt></td>\r\n");
2329

  
2330
			sb.append("<td align=\"right\"><tt>");
2331
			sb.append(getLastModifiedHttp(file.getAuditInfo()));
2332
			sb.append("</tt></td>\r\n");
2333

  
2334
			sb.append("</tr>\r\n");
2335
		}
2305
		for (FileHeaderDTO file : files)
2306
			//Display only file resources that are marked as public
2307
			if(file.isReadForAll()){
2308
				String resourceName = file.getName();
2309
				if (resourceName.equalsIgnoreCase("WEB-INF") || resourceName.equalsIgnoreCase("META-INF"))
2310
					continue;
2311

  
2312
				sb.append("<tr");
2313
				if (shade)
2314
					sb.append(" bgcolor=\"#eeeeee\"");
2315
				sb.append(">\r\n");
2316
				shade = !shade;
2317

  
2318
				sb.append("<td align=\"left\">&nbsp;&nbsp;\r\n");
2319
				sb.append("<a href=\"");
2320
				sb.append(rewrittenContextPath);
2321
				sb.append(relativePath);
2322
				if(!relativePath.endsWith("/"))
2323
					sb.append("/");
2324
				sb.append(rewriteUrl(resourceName));
2325
				sb.append("\"><tt>");
2326
				sb.append(RequestUtil.filter(resourceName));
2327
				sb.append("</tt></a></td>\r\n");
2328

  
2329
				sb.append("<td align=\"right\"><tt>");
2330
				sb.append(renderSize(file.getFileSize()));
2331
				sb.append("</tt></td>\r\n");
2332

  
2333
				sb.append("<td align=\"right\"><tt>");
2334
				sb.append(getLastModifiedHttp(file.getAuditInfo()));
2335
				sb.append("</tt></td>\r\n");
2336

  
2337
				sb.append("</tr>\r\n");
2338
			}
2336 2339

  
2337 2340
		// Render the page footer
2338 2341
		sb.append("</table>\r\n");

Also available in: Unified diff