Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Locales will now be in DATA/HTDOCS. So it works with readonly htroot.

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1527 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
allo 2006-02-04 10:50:22 +00:00
parent 1f3eaf9f8e
commit 7bd61ab0e5
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,6 @@
YaCy: The Search Engine with the friendly whale
version 0.424svn
version 0.43svn
* ADDED: additional Shutdownmethod to run YaCy as Windows Service (theli)
* ADDED: possibility to import the crawling queue (theli)
* UPDATED: German translations (NN, rramthun)
@ -11,7 +11,8 @@ version 0.424svn
* FIXED: minor bug-fix in Cache for some rare URLs (borg-0300)
* ADDED: The YaCy-Bookmarkssystem (allo)
* UPDATED: New Searchstyle
* FIXED: notifier.gif works even when only DATA is writable
* FIXED: notifier.gif works even when only DATA is writable (allo)
* FIXED: Translations work with readonly htroot now. (allo)
version 0.40 (8/21/2005):
* The Server now provides the virtuel Header IS_ADMIN (Alexander Schier)

4
htroot/Language_p.java
View File

@ -85,7 +85,9 @@ public class Language_p {
}
String htRootPath = env.getConfig("htRootPath", "htroot");
File sourceDir = new File(env.getRootPath(), htRootPath);
File destDir = new File(env.getRootPath(), htRootPath + "/locale/" + lang.substring(0, lang.length() - 4));// cut
File destDir = new File(env.getConfig("htLocalePath","DATA/HTDOCS/locale"), lang.substring(0, lang.length() - 4));// cut
// .lng
//File destDir = new File(env.getRootPath(), htRootPath + "/locale/" + lang.substring(0, lang.length() - 4));// cut
// .lng
File translationFile = new File(langPath, lang);

2
source/de/anomic/http/httpdFileHandler.java
View File

@ -200,7 +200,7 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http
// create htLocaleDefault, htLocalePath
if (htDefaultPath == null) htDefaultPath = new File(switchboard.getRootPath(), switchboard.getConfig("htDefaultPath","htroot"));
if (htLocalePath == null) htLocalePath = new File(switchboard.getRootPath(), switchboard.getConfig("htLocalePath","htroot/locale"));
if (htLocalePath == null) htLocalePath = new File(switchboard.getConfig("htLocalePath","DATA/HTDOCS/locale"));
//htLocaleSelection = switchboard.getConfig("htLocaleSelection","default");
}

4
source/migration.java
View File

@ -141,6 +141,10 @@ public class migration {
sb.setConfig("parseableMimeTypes.URLREDIRECTOR", value);
sb.setConfig("parseableMimeTypes.ICAP", value);
}
//Locales in DATA, because DATA must be writable, htroot not.
if(sb.getConfig("htLocalePath", "htroot/locale").equals("htroot/locale")){
sb.setConfig("htLocalePath", "DATA/HTDOCS/locale");
}
}
}

4
source/yacy.java
View File

@ -308,7 +308,7 @@ public final class yacy {
// create default notifier picture
//TODO: Use templates instead of copying images ...
if (!((new File(htRootPath, "env/grafics/notifier.gif")).exists())) try {
if (!((new File(htDocsPath, "notifier.gif")).exists())) try {
serverFileUtils.copy(new File(htRootPath, "env/grafics/empty.gif"),
new File(htDocsPath, "notifier.gif"));
} catch (IOException e) {}
@ -413,7 +413,7 @@ public final class yacy {
try{ //seperate try, because we want this, even when the File "version2 does not exist.
if(! currentRev.equals(sb.getConfig("svnRevision", "")) ){ //is this another version?!
final File sourceDir = new File(sb.getConfig("htRootPath", "htroot"));
final File destDir = new File(sourceDir, "locale/"+lang);
final File destDir = new File(sb.getConfig("htLocalePath", "DATA/HTDOCS/locale"), lang);
if(translator.translateFilesRecursive(sourceDir, destDir, new File("DATA/LOCALE/"+lang+".lng"), "html,template,inc", "locale")){ //translate it
//write the new Versionnumber

2
yacy.init
View File

@ -53,7 +53,7 @@ defaultFiles = index.html,default.html,search.html,console.html,control.html,wel
# the <dir> must exist as sub-path to htLocalePath
# the htLocaleSelection selects from the given locales, value=one-of-<dir>
htDefaultPath=htroot
htLocalePath=htroot/locale
htLocalePath=DATA/HTROOT/locale
htLocaleLang=default/English,de/Deutsch,fr/Fran&ccedil;ais,nl/Nederlands,it/Italiano,es/Espa&ntilde;ol,pt/Portug&ecirc;s,fi/Suomi,se/Svenska,dk/Dansk,gr/E&lambda;&lambda;&eta;v&iota;&kappa;&alpha;
htLocaleSelection=default