bugfix for last commit

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1915 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
allo 19 years ago
parent dba02f399f
commit 2b31f51896

@ -46,6 +46,7 @@ import de.anomic.kelondro.kelondroBase64Order;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverFileUtils;
import de.anomic.server.logging.serverLog;
import de.anomic.data.listManager;
public class migration {
//SVN constants
@ -65,11 +66,24 @@ public class migration {
migrateBookmarkTagsDB(sb);
}
serverLog.logInfo("MIGRATION", "Migrating from "+String.valueOf(fromRev)+ " to "+String.valueOf(toRev));
installSkin(sb);
installSkins(sb);
migrate(sb);
}
}
public static void installSkin(plasmaSwitchboard sb){
public static void installSkins(plasmaSwitchboard sb){
final File skinsPath = new File(sb.getRootPath(), sb.getConfig("skinsPath", "DATA/SKINS"));
final File defaultSkinsPath = new File(sb.getRootPath(), "skins");
if(defaultSkinsPath.exists()){
final String[] skinFiles = listManager.getDirListing(defaultSkinsPath.getAbsolutePath());
skinsPath.mkdirs();
for(int i=0;i<skinFiles.length;i++){
if(skinFiles[i].endsWith(".css")){
try{
serverFileUtils.copy(new File(defaultSkinsPath, skinFiles[i]), new File(skinsPath, skinFiles[i]));
}catch(IOException e){}
}
}
}
String skin=sb.getConfig("currentSkin", "default");
if(skin.equals("")){
skin="default";

@ -390,9 +390,8 @@ public final class yacy {
//Copy the shipped locales into DATA
final File localesPath = new File(homePath, sb.getConfig("localesPath", "DATA/LOCALE"));
final File skinsPath = new File(homePath, sb.getConfig("skinsPath", "DATA/SKINS"));
final File defaultLocalesPath = new File(homePath, "locales");
final File defaultSkinsPath = new File(homePath, "skins");
try{
final File[] defaultLocales = defaultLocalesPath.listFiles();
@ -405,15 +404,6 @@ public final class yacy {
}catch(NullPointerException e){
serverLog.logSevere("STARTUP", "Nullpointer Exception while copying the default Locales");
}
if(defaultSkinsPath.exists()){
final String[] skinFiles = listManager.getDirListing(defaultSkinsPath.getAbsolutePath());
skinsPath.mkdirs();
for(int i=0;i<skinFiles.length;i++){
if(skinFiles[i].endsWith(".css")){
serverFileUtils.copy(new File(defaultSkinsPath, skinFiles[i]), new File(skinsPath, skinFiles[i]));
}
}
}
//regenerate Locales from Translationlist, if needed
final String lang = sb.getConfig("htLocaleSelection", "");

Loading…
Cancel
Save