Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -r56f3ebee92e9e01f1db9065b4f839a99d76d10eb -r4fa4ba3d40e23d923eda065a946fab6701d6418f
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision 56f3ebee92e9e01f1db9065b4f839a99d76d10eb)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision 4fa4ba3d40e23d923eda065a946fab6701d6418f)
@@ -300,12 +300,11 @@
 			
 		fileName = fileName.trim();
 
-		int dotPos = fileName.lastIndexOf(File.separatorChar);
+		int dotPos = fileName.lastIndexOf("/");
+		int dotPos2 = fileName.lastIndexOf("\\");
+		dotPos = Math.max(dotPos,dotPos2);
 		if (dotPos == -1){
-			//just for window OS: it also can use "/" as file separatorChar.
-			dotPos = fileName.lastIndexOf("/"); 
-			if(dotPos == -1)
-				return fileName;
+			return fileName;
 		}
 		return fileName.substring(dotPos + 1, fileName.length());
 		
@@ -321,12 +320,11 @@
 		
 		fileName = fileName.trim();
 
-		int dotPos = fileName.lastIndexOf(File.separatorChar);
+		int dotPos = fileName.lastIndexOf("/");
+		int dotPos2 = fileName.lastIndexOf("\\");
+		dotPos = Math.max(dotPos,dotPos2);
 		if (dotPos == -1){
-			//just for window OS: it also can use "/" as file separatorChar.
-			dotPos = fileName.lastIndexOf("/"); 
-			if(dotPos == -1)
-				return fileName;
+			return "";
 		}
 		//return the last char is '/'
 		return fileName.substring(0,dotPos+1);