|
From: <jbo...@li...> - 2006-06-22 06:02:47
|
Author: szimano
Date: 2006-06-22 02:02:40 -0400 (Thu, 22 Jun 2006)
New Revision: 4805
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf-8 role problmes
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-22 04:07:32 UTC (rev 4804)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-22 06:02:40 UTC (rev 4805)
@@ -394,7 +394,7 @@
if (fileName == null)
return null;
- File rolesFile = new File(pathToMedia + "/OLD/" + uid + "/" + fileName
+ File rolesFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + fileName
+ ".properties");
if (!rolesFile.exists()) {
@@ -718,19 +718,19 @@
}
public int getPageMod(String pageName) {
- if (pageModProps.getProperty(pageName) == null) {
+ if (pageModProps.getProperty(FileDSCommons.translateToFileName(pageName)) == null) {
return (EDITABLE + VIEWABLE);
} else {
- return Integer.valueOf(pageModProps.getProperty(pageName));
+ return Integer.valueOf(pageModProps.getProperty(FileDSCommons.translateToFileName(pageName)));
}
}
public synchronized void setPageMod(String pageName, int mods) {
if (mods != (EDITABLE + VIEWABLE)) {
- pageModProps.setProperty(pageName, String.valueOf(mods));
+ pageModProps.setProperty(FileDSCommons.translateToFileName(pageName), String.valueOf(mods));
} else {
- pageModProps.remove(pageName);
+ pageModProps.remove(FileDSCommons.translateToFileName(pageName));
}
FileOutputStream fos = null;
@@ -887,7 +887,7 @@
public void saveMetadataProps(String uid, Properties props) {
getMetadataProps(uid); // this will create file if needed.
- File propsFile = new File(pathToMedia + "/OLD/" + uid
+ File propsFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid)
+ "/metadata.properties");
FileOutputStream fos = null;
|