boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) renamed classes according to standard Java coding conventions

Browse Source 
*) String.isEmpty() was introduced in Java 1.6, but we still use Java 1.5

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7330 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 14 years ago
parent 8281d12305
commit 38fdf43587
47 changed files with 302 additions and 303 deletions
Show Stats Download Patch File Download Diff File

24
htroot/BlacklistCleaner_p.java
Unescape View File

@ -43,7 +43,7 @@ import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.search.SearchEventCache; import de.anomic.search.SearchEventCache;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -72,8 +72,8 @@ public class BlacklistCleaner_p {
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
// initialize the list manager // initialize the list manager
listManager.switchboard = (Switchboard) env; ListManager.switchboard = (Switchboard) env;
listManager.listsPath = new File(env.getDataPath(), env.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(env.getDataPath(), env.getConfig("listManager.listsPath", "DATA/LISTS"));
String blacklistToUse = null; String blacklistToUse = null;
// get the list of supported blacklist types // get the list of supported blacklist types
@ -89,13 +89,13 @@ public class BlacklistCleaner_p {
if (post.containsKey("listNames")) { if (post.containsKey("listNames")) {
blacklistToUse = post.get("listNames"); blacklistToUse = post.get("listNames");
if (blacklistToUse.length() == 0 || !listManager.listSetContains("listManager.listsPath", blacklistToUse)) { if (blacklistToUse.length() == 0 || !ListManager.listSetContains("listManager.listsPath", blacklistToUse)) {
prop.put("results", "2"); prop.put("results", "2");
} }
} }
putBlacklists(prop, FileUtils.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER), blacklistToUse); putBlacklists(prop, FileUtils.getDirListing(ListManager.listsPath, BLACKLIST_FILENAME_FILTER), blacklistToUse);
if (blacklistToUse != null) { if (blacklistToUse != null) {
prop.put("results", "1"); prop.put("results", "1");
@ -128,7 +128,7 @@ public class BlacklistCleaner_p {
} }
} else { } else {
prop.put("results", "0"); prop.put("results", "0");
putBlacklists(prop, FileUtils.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER), blacklistToUse); putBlacklists(prop, FileUtils.getDirListing(ListManager.listsPath, BLACKLIST_FILENAME_FILTER), blacklistToUse);
} }
return prop; return prop;
@ -242,7 +242,7 @@ public class BlacklistCleaner_p {
final Map<String, Integer> illegalEntries = new HashMap<String, Integer>(); final Map<String, Integer> illegalEntries = new HashMap<String, Integer>();
final Set<String> legalEntries = new HashSet<String>(); final Set<String> legalEntries = new HashSet<String>();
final List<String> list = FileUtils.getListArray(new File(listManager.listsPath, blacklistToUse)); final List<String> list = FileUtils.getListArray(new File(ListManager.listsPath, blacklistToUse));
final Map<String, String> properties= new HashMap<String, String>(); final Map<String, String> properties= new HashMap<String, String>();
properties.put("allowRegex", String.valueOf(allowRegex)); properties.put("allowRegex", String.valueOf(allowRegex));
@ -277,7 +277,7 @@ public class BlacklistCleaner_p {
*/ */
private static int removeEntries(final String blacklistToUse, final String[] supportedBlacklistTypes, final String[] entries) { private static int removeEntries(final String blacklistToUse, final String[] supportedBlacklistTypes, final String[] entries) {
// load blacklist data from file // load blacklist data from file
final ArrayList<String> list = FileUtils.getListArray(new File(listManager.listsPath, blacklistToUse)); final ArrayList<String> list = FileUtils.getListArray(new File(ListManager.listsPath, blacklistToUse));
boolean listChanged = false; boolean listChanged = false;
@ -302,7 +302,7 @@ public class BlacklistCleaner_p {
// remove the entry from the running blacklist engine // remove the entry from the running blacklist engine
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse)) {
final String host = (s.indexOf('/') == -1) ? s : s.substring(0, s.indexOf('/')); final String host = (s.indexOf('/') == -1) ? s : s.substring(0, s.indexOf('/'));
final String path = (s.indexOf('/') == -1) ? ".*" : s.substring(s.indexOf('/') + 1); final String path = (s.indexOf('/') == -1) ? ".*" : s.substring(s.indexOf('/') + 1);
try { try {
@ -316,7 +316,7 @@ public class BlacklistCleaner_p {
SearchEventCache.cleanupEvents(true); SearchEventCache.cleanupEvents(true);
} }
if (listChanged){ if (listChanged){
FileUtils.writeList(new File(listManager.listsPath, blacklistToUse), list.toArray(new String[list.size()])); FileUtils.writeList(new File(ListManager.listsPath, blacklistToUse), list.toArray(new String[list.size()]));
} }
return entries.length; return entries.length;
} }
@ -337,7 +337,7 @@ public class BlacklistCleaner_p {
removeEntries(blacklistToUse, supportedBlacklistTypes, oldEntry); removeEntries(blacklistToUse, supportedBlacklistTypes, oldEntry);
PrintWriter pw = null; PrintWriter pw = null;
try { try {
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, blacklistToUse), true)); pw = new PrintWriter(new FileWriter(new File(ListManager.listsPath, blacklistToUse), true));
String host, path; String host, path;
for (int i=0, pos; i<newEntry.length; i++) { for (int i=0, pos; i<newEntry.length; i++) {
pos = newEntry[i].indexOf('/'); pos = newEntry[i].indexOf('/');
@ -350,7 +350,7 @@ public class BlacklistCleaner_p {
} }
pw.println(host + "/" + path); pw.println(host + "/" + path);
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) {
Switchboard.urlBlacklist.add( Switchboard.urlBlacklist.add(
supportedBlacklistTypes[blTypes], supportedBlacklistTypes[blTypes],
host, host,

8
htroot/BlacklistImpExp_p.java
Unescape View File

@ -33,7 +33,7 @@ import java.io.File;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeMap; import java.util.TreeMap;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -50,11 +50,11 @@ public class BlacklistImpExp_p {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
// initialize the list manager // initialize the list manager
listManager.switchboard = (Switchboard) env; ListManager.switchboard = (Switchboard) env;
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// loading all blacklist files located in the directory // loading all blacklist files located in the directory
final List<String> dirlist = FileUtils.getDirListing(listManager.listsPath); final List<String> dirlist = FileUtils.getDirListing(ListManager.listsPath);
String blacklistToUse = null; String blacklistToUse = null;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();

6
htroot/BlacklistTest_p.java
Unescape View File

@ -36,7 +36,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.repository.Blacklist; import net.yacy.repository.Blacklist;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -46,8 +46,8 @@ public class BlacklistTest_p {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
// initialize the list manager // initialize the list manager
listManager.switchboard = (Switchboard) env; ListManager.switchboard = (Switchboard) env;
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
prop.putHTML("blacklistEngine", Switchboard.urlBlacklist.getEngineInfo()); prop.putHTML("blacklistEngine", Switchboard.urlBlacklist.getEngineInfo());

62
htroot/Blacklist_p.java
Unescape View File

@ -46,7 +46,7 @@ import net.yacy.kelondro.util.FileUtils;
import net.yacy.repository.Blacklist; import net.yacy.repository.Blacklist;
import de.anomic.data.WorkTables; import de.anomic.data.WorkTables;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.search.SearchEventCache; import de.anomic.search.SearchEventCache;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -63,15 +63,15 @@ public class Blacklist_p {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
// initialize the list manager // initialize the list manager
listManager.switchboard = (Switchboard) env; ListManager.switchboard = (Switchboard) env;
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// get the list of supported blacklist types // get the list of supported blacklist types
final String supportedBlacklistTypesStr = Blacklist.BLACKLIST_TYPES_STRING; final String supportedBlacklistTypesStr = Blacklist.BLACKLIST_TYPES_STRING;
final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(","); final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
// load all blacklist files located in the directory // load all blacklist files located in the directory
List<String> dirlist = FileUtils.getDirListing(listManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER); List<String> dirlist = FileUtils.getDirListing(ListManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER);
String blacklistToUse = null; String blacklistToUse = null;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
@ -139,15 +139,15 @@ public class Blacklist_p {
if (!dirlist.contains(blacklistToUse)) { if (!dirlist.contains(blacklistToUse)) {
try { try {
final File newFile = new File(listManager.listsPath, blacklistToUse); final File newFile = new File(ListManager.listsPath, blacklistToUse);
newFile.createNewFile(); newFile.createNewFile();
// share the newly created blacklist // share the newly created blacklist
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse); ListManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
// activate it for all known blacklist types // activate it for all known blacklist types
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse); ListManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse);
} }
} catch (final IOException e) {/* */} } catch (final IOException e) {/* */}
} else { } else {
@ -157,7 +157,7 @@ public class Blacklist_p {
} }
// reload Blacklists // reload Blacklists
dirlist = FileUtils.getDirListing(listManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER); dirlist = FileUtils.getDirListing(ListManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER);
} }
} else if (post.containsKey("deleteList")) { } else if (post.containsKey("deleteList")) {
@ -171,21 +171,21 @@ public class Blacklist_p {
return prop; return prop;
} }
final File blackListFile = new File(listManager.listsPath, blacklistToUse); final File blackListFile = new File(ListManager.listsPath, blacklistToUse);
if(!blackListFile.delete()) { if(!blackListFile.delete()) {
Log.logWarning("Blacklist", "file "+ blackListFile +" could not be deleted!"); Log.logWarning("Blacklist", "file "+ blackListFile +" could not be deleted!");
} }
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse); ListManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} }
// remove it from the shared list // remove it from the shared list
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse); ListManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
blacklistToUse = null; blacklistToUse = null;
// reload Blacklists // reload Blacklists
dirlist = FileUtils.getDirListing(listManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER); dirlist = FileUtils.getDirListing(ListManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER);
} else if (post.containsKey("activateList")) { } else if (post.containsKey("activateList")) {
@ -201,13 +201,13 @@ public class Blacklist_p {
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (post.containsKey("activateList4" + supportedBlacklistTypes[blTypes])) { if (post.containsKey("activateList4" + supportedBlacklistTypes[blTypes])) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse); ListManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} else { } else {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse); ListManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} }
} }
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
} else if (post.containsKey("shareList")) { } else if (post.containsKey("shareList")) {
@ -221,11 +221,11 @@ public class Blacklist_p {
return prop; return prop;
} }
if (listManager.listSetContains(BLACKLIST_SHARED, blacklistToUse)) { if (ListManager.listSetContains(BLACKLIST_SHARED, blacklistToUse)) {
// Remove from shared BlackLists // Remove from shared BlackLists
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse); ListManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
} else { // inactive list -> enable } else { // inactive list -> enable
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse); ListManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
} }
} else if (action.equals("deleteBlacklistEntry")) { } else if (action.equals("deleteBlacklistEntry")) {
@ -247,7 +247,7 @@ public class Blacklist_p {
} }
} }
} }
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
} else if (post.containsKey("addBlacklistEntry")) { } else if (post.containsKey("addBlacklistEntry")) {
@ -259,14 +259,14 @@ public class Blacklist_p {
String blentry = post.get("newEntry", "").trim(); String blentry = post.get("newEntry", "").trim();
// store this call as api call // store this call as api call
listManager.switchboard.tables.recordAPICall(post, "Blacklist_p.html", WorkTables.TABLE_API_TYPE_CONFIGURATION, "add to blacklist: " + blentry); ListManager.switchboard.tables.recordAPICall(post, "Blacklist_p.html", WorkTables.TABLE_API_TYPE_CONFIGURATION, "add to blacklist: " + blentry);
final String temp = addBlacklistEntry(blacklistToUse, blentry, header, supportedBlacklistTypes); final String temp = addBlacklistEntry(blacklistToUse, blentry, header, supportedBlacklistTypes);
if (temp != null) { if (temp != null) {
prop.put("LOCATION", temp); prop.put("LOCATION", temp);
return prop; return prop;
} }
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
} else if (action.equals("moveBlacklistEntry")) { } else if (action.equals("moveBlacklistEntry")) {
@ -301,7 +301,7 @@ public class Blacklist_p {
} }
} }
} }
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
} else if (action.equals("editBlacklistEntry")) { } else if (action.equals("editBlacklistEntry")) {
@ -341,7 +341,7 @@ public class Blacklist_p {
} }
} }
} }
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse); prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
// else return entry to be edited // else return entry to be edited
@ -371,7 +371,7 @@ public class Blacklist_p {
// Read the blacklist items from file // Read the blacklist items from file
if (blacklistToUse != null) { if (blacklistToUse != null) {
int entryCount = 0; int entryCount = 0;
final List<String> list = FileUtils.getListArray(new File(listManager.listsPath, blacklistToUse)); final List<String> list = FileUtils.getListArray(new File(ListManager.listsPath, blacklistToUse));
// sort them // sort them
final String[] sortedlist = new String[list.size()]; final String[] sortedlist = new String[list.size()];
@ -470,7 +470,7 @@ public class Blacklist_p {
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
prop.putXML(DISABLED + "currentActiveFor_" + blTypes + "_blTypeName",supportedBlacklistTypes[blTypes]); prop.putXML(DISABLED + "currentActiveFor_" + blTypes + "_blTypeName",supportedBlacklistTypes[blTypes]);
prop.put(DISABLED + "currentActiveFor_" + blTypes + "_checked", prop.put(DISABLED + "currentActiveFor_" + blTypes + "_checked",
listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element) ? "0" : "1"); ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element) ? "0" : "1");
} }
prop.put(DISABLED + "currentActiveFor", supportedBlacklistTypes.length); prop.put(DISABLED + "currentActiveFor", supportedBlacklistTypes.length);
@ -479,7 +479,7 @@ public class Blacklist_p {
blacklistMoveCount++; blacklistMoveCount++;
} }
if (listManager.listSetContains(BLACKLIST_SHARED, element)) { if (ListManager.listSetContains(BLACKLIST_SHARED, element)) {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "1"); prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "1");
} else { } else {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "0"); prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "0");
@ -487,7 +487,7 @@ public class Blacklist_p {
int activeCount = 0; int activeCount = 0;
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element)) {
prop.putHTML(DISABLED + BLACKLIST + blacklistCount + "_active_" + activeCount + "_blTypeName", supportedBlacklistTypes[blTypes]); prop.putHTML(DISABLED + BLACKLIST + blacklistCount + "_active_" + activeCount + "_blTypeName", supportedBlacklistTypes[blTypes]);
activeCount++; activeCount++;
} }
@ -529,7 +529,7 @@ public class Blacklist_p {
return header.get(HeaderFramework.CONNECTION_PROP_PATH) + "?selectList=&selectedListName=" + blacklistToUse; return header.get(HeaderFramework.CONNECTION_PROP_PATH) + "?selectList=&selectedListName=" + blacklistToUse;
} }
addBlacklistEntry(listManager.listsPath, blacklistToUse, newEntry, supportedBlacklistTypes); addBlacklistEntry(ListManager.listsPath, blacklistToUse, newEntry, supportedBlacklistTypes);
SearchEventCache.cleanupEvents(true); SearchEventCache.cleanupEvents(true);
return null; return null;
} }
@ -557,7 +557,7 @@ public class Blacklist_p {
return header.get(HeaderFramework.CONNECTION_PROP_PATH) + "?selectList=&selectedListName=" + blacklistToUse; return header.get(HeaderFramework.CONNECTION_PROP_PATH) + "?selectList=&selectedListName=" + blacklistToUse;
} }
deleteBlacklistEntry(listManager.listsPath, blacklistToUse, oldEntry, supportedBlacklistTypes); deleteBlacklistEntry(ListManager.listsPath, blacklistToUse, oldEntry, supportedBlacklistTypes);
SearchEventCache.cleanupEvents(true); SearchEventCache.cleanupEvents(true);
return null; return null;
} }
@ -598,7 +598,7 @@ public class Blacklist_p {
oldEntry = oldEntry + "/.*"; oldEntry = oldEntry + "/.*";
} }
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) {
Switchboard.urlBlacklist.remove(supportedBlacklistTypes[blTypes],oldEntry.substring(0, pos), oldEntry.substring(pos + 1)); Switchboard.urlBlacklist.remove(supportedBlacklistTypes[blTypes],oldEntry.substring(0, pos), oldEntry.substring(pos + 1));
} }
} }
@ -655,7 +655,7 @@ public class Blacklist_p {
// add to blacklist // add to blacklist
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse)) {
Switchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes], newEntry.substring(0, pos), newEntry.substring(pos + 1)); Switchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes], newEntry.substring(0, pos), newEntry.substring(pos + 1));
} }
} }

12
htroot/Blog.java
Unescape View File

@ -40,8 +40,8 @@ import java.util.Locale;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.blogBoard; import de.anomic.data.BlogBoard;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -63,7 +63,7 @@ public class Blog {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
blogBoard.BlogEntry page = null; BlogBoard.BlogEntry page = null;
boolean hasRights = sb.verifyAuthentication(header, true); boolean hasRights = sb.verifyAuthentication(header, true);
@ -91,8 +91,8 @@ public class Blog {
final int num = post.getInt("num",10); //indicates how many entries should be shown final int num = post.getInt("num",10); //indicates how many entries should be shown
if(!hasRights){ if(!hasRights){
final userDB.Entry userentry = sb.userDB.proxyAuth(header.get(RequestHeader.AUTHORIZATION, "xxxxxx")); final UserDB.Entry userentry = sb.userDB.proxyAuth(header.get(RequestHeader.AUTHORIZATION, "xxxxxx"));
if(userentry != null && userentry.hasRight(userDB.Entry.BLOG_RIGHT)){ if(userentry != null && userentry.hasRight(UserDB.Entry.BLOG_RIGHT)){
hasRights=true; hasRights=true;
} else if(post.containsKey("login")) { } else if(post.containsKey("login")) {
//opens login window if login link is clicked - contrib [MN] //opens login window if login link is clicked - contrib [MN]
@ -316,7 +316,7 @@ public class Blog {
private static serverObjects putBlogEntry( private static serverObjects putBlogEntry(
final serverObjects prop, final serverObjects prop,
final blogBoard.BlogEntry entry, final BlogBoard.BlogEntry entry,
final String address, final String address,
final int number, final int number,
final boolean hasRights, final boolean hasRights,

24
htroot/BlogComments.java
Unescape View File

@ -44,11 +44,11 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import de.anomic.data.blogBoard; import de.anomic.data.BlogBoard;
import de.anomic.data.blogBoardComments; import de.anomic.data.BlogBoardComments;
import de.anomic.data.messageBoard; import de.anomic.data.MessageBoard;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.data.blogBoard.BlogEntry; import de.anomic.data.BlogBoard.BlogEntry;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -66,7 +66,7 @@ public class BlogComments {
public static serverObjects respond(final RequestHeader header, serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
blogBoard.BlogEntry page = null; BlogBoard.BlogEntry page = null;
boolean hasRights = sb.verifyAuthentication(header, true); boolean hasRights = sb.verifyAuthentication(header, true);
if (hasRights) prop.put("mode_admin", "1"); if (hasRights) prop.put("mode_admin", "1");
@ -78,8 +78,8 @@ public class BlogComments {
} }
if(!hasRights){ if(!hasRights){
final userDB.Entry userentry = sb.userDB.proxyAuth(header.get(RequestHeader.AUTHORIZATION, "xxxxxx")); final UserDB.Entry userentry = sb.userDB.proxyAuth(header.get(RequestHeader.AUTHORIZATION, "xxxxxx"));
if(userentry != null && userentry.hasRight(userDB.Entry.BLOG_RIGHT)){ if(userentry != null && userentry.hasRight(UserDB.Entry.BLOG_RIGHT)){
hasRights=true; hasRights=true;
} }
//opens login window if login link is clicked - contrib [MN] //opens login window if login link is clicked - contrib [MN]
@ -152,7 +152,7 @@ public class BlogComments {
sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content)); sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content));
prop.putHTML("LOCATION","BlogComments.html?page=" + pagename); prop.putHTML("LOCATION","BlogComments.html?page=" + pagename);
messageBoard.entry msgEntry = null; MessageBoard.entry msgEntry = null;
try { try {
sb.messageDB.write(msgEntry = sb.messageDB.newEntry( sb.messageDB.write(msgEntry = sb.messageDB.newEntry(
"blogComment", "blogComment",
@ -190,7 +190,7 @@ public class BlogComments {
} }
if(hasRights && post.containsKey("allow") && post.containsKey("page") && post.containsKey("comment")) { if(hasRights && post.containsKey("allow") && post.containsKey("page") && post.containsKey("comment")) {
final blogBoardComments.CommentEntry entry = sb.blogCommentDB.read(post.get("comment")); final BlogBoardComments.CommentEntry entry = sb.blogCommentDB.read(post.get("comment"));
entry.allow(); entry.allow();
sb.blogCommentDB.write(entry); sb.blogCommentDB.write(entry);
} }
@ -244,7 +244,7 @@ public class BlogComments {
final Iterator<String> i = page.getComments().iterator(); final Iterator<String> i = page.getComments().iterator();
final int commentMode = page.getCommentMode(); final int commentMode = page.getCommentMode();
String pageid; String pageid;
blogBoardComments.CommentEntry entry; BlogBoardComments.CommentEntry entry;
boolean xml = false; boolean xml = false;
if(post.containsKey("xml")) { if(post.containsKey("xml")) {
xml = true; xml = true;
@ -326,7 +326,7 @@ public class BlogComments {
return prop; return prop;
} }
private static void messageForwardingViaEmail(final Switchboard sb, final messageBoard.entry msgEntry) { private static void messageForwardingViaEmail(final Switchboard sb, final MessageBoard.entry msgEntry) {
try { try {
if (!Boolean.parseBoolean(sb.getConfig("msgForwardingEnabled","false"))) return; if (!Boolean.parseBoolean(sb.getConfig("msgForwardingEnabled","false"))) return;

28
htroot/Bookmarks.java
Unescape View File

@ -48,9 +48,9 @@ import net.yacy.kelondro.util.DateFormatter;
import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.CrawlProfile;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Segments; import de.anomic.search.Segments;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -62,7 +62,7 @@ public class Bookmarks {
private static final serverObjects prop = new serverObjects(); private static final serverObjects prop = new serverObjects();
private static Switchboard sb = null; private static Switchboard sb = null;
private static userDB.Entry user = null; private static UserDB.Entry user = null;
private static boolean isAdmin = false; private static boolean isAdmin = false;
final static int SORT_ALPHA = 1; final static int SORT_ALPHA = 1;
@ -82,7 +82,7 @@ public class Bookmarks {
prop.clear(); prop.clear();
sb = (Switchboard) env; sb = (Switchboard) env;
user = sb.userDB.getUser(header); user = sb.userDB.getUser(header);
isAdmin=(sb.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); isAdmin=(sb.verifyAuthentication(header, true) || user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT));
// set user name // set user name
if(user != null) username=user.getUserName(); if(user != null) username=user.getUserName();
@ -145,11 +145,11 @@ public class Bookmarks {
pathString="/unsorted"; //default folder pathString="/unsorted"; //default folder
} }
tagsString=tagsString+","+pathString; tagsString=tagsString+","+pathString;
final Set<String> tags=listManager.string2set(BookmarkHelper.cleanTagsString(tagsString)); final Set<String> tags=ListManager.string2set(BookmarkHelper.cleanTagsString(tagsString));
final bookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(url, username); final BookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(url, username);
if(bookmark != null){ if(bookmark != null){
bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_TITLE, title); bookmark.setProperty(BookmarksDB.Bookmark.BOOKMARK_TITLE, title);
bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_DESCRIPTION, description); bookmark.setProperty(BookmarksDB.Bookmark.BOOKMARK_DESCRIPTION, description);
if(user!=null){ if(user!=null){
bookmark.setOwner(user.getUserName()); bookmark.setOwner(user.getUserName());
} }
@ -184,7 +184,7 @@ public class Bookmarks {
prop.put("mode_public", "0"); prop.put("mode_public", "0");
prop.put("mode_feed", "0"); prop.put("mode_feed", "0");
} else { } else {
final bookmarksDB.Bookmark bookmark = sb.bookmarksDB.getBookmark(urlHash); final BookmarksDB.Bookmark bookmark = sb.bookmarksDB.getBookmark(urlHash);
if (bookmark == null) { if (bookmark == null) {
// try to get the bookmark from the LURL database // try to get the bookmark from the LURL database
final URIMetadataRow urlentry = sb.indexSegments.urlMetadata(Segments.Process.PUBLIC).load(urlHash.getBytes(), null, 0); final URIMetadataRow urlentry = sb.indexSegments.urlMetadata(Segments.Process.PUBLIC).load(urlHash.getBytes(), null, 0);
@ -272,7 +272,7 @@ public class Bookmarks {
//----------------------- //-----------------------
int count=0; int count=0;
Iterator<String> it = null; Iterator<String> it = null;
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
Set<String> tags; Set<String> tags;
Iterator<String> tagsIt; Iterator<String> tagsIt;
int tagCount; int tagCount;
@ -359,8 +359,8 @@ public class Bookmarks {
private static void printTagList(final String id, final String tagName, final int comp, final int max, final boolean opt){ private static void printTagList(final String id, final String tagName, final int comp, final int max, final boolean opt){
int count=0; int count=0;
bookmarksDB.Tag tag; BookmarksDB.Tag tag;
Iterator<bookmarksDB.Tag> it = null; Iterator<BookmarksDB.Tag> it = null;
if (tagName.equals("")) { if (tagName.equals("")) {
it = sb.bookmarksDB.getTagIterator(isAdmin, comp, max); it = sb.bookmarksDB.getTagIterator(isAdmin, comp, max);
@ -391,7 +391,7 @@ public class Bookmarks {
private static int recurseFolders(final Iterator<String> it, String root, int count, final boolean next, final String prev){ private static int recurseFolders(final Iterator<String> it, String root, int count, final boolean next, final String prev){
String fn=""; String fn="";
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
if (next) fn = it.next(); if (next) fn = it.next();
else fn = prev; else fn = prev;

34
htroot/ConfigAccounts_p.java
Unescape View File

@ -37,7 +37,7 @@ import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Base64Order;
import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.Digest;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.HTTPDemon;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -48,7 +48,7 @@ public class ConfigAccounts_p {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final Switchboard sb = Switchboard.getSwitchboard(); final Switchboard sb = Switchboard.getSwitchboard();
userDB.Entry entry=null; UserDB.Entry entry=null;
// admin password // admin password
boolean localhostAccess = sb.getConfigBool("adminAccountForLocalhost", false); boolean localhostAccess = sb.getConfigBool("adminAccountForLocalhost", false);
@ -107,8 +107,8 @@ public class ConfigAccounts_p {
prop.put("address", ""); prop.put("address", "");
prop.put("timelimit", ""); prop.put("timelimit", "");
prop.put("timeused", ""); prop.put("timeused", "");
final String[] rightNames=userDB.Entry.RIGHT_NAMES.split(","); final String[] rightNames=UserDB.Entry.RIGHT_NAMES.split(",");
final String[] rights=userDB.Entry.RIGHT_TYPES.split(","); final String[] rights=UserDB.Entry.RIGHT_TYPES.split(",");
int i; int i;
for(i=0;i<rights.length;i++){ for(i=0;i<rights.length;i++){
prop.put("rights_"+i+"_name", rights[i]); prop.put("rights_"+i+"_name", rights[i]);
@ -175,13 +175,13 @@ public class ConfigAccounts_p {
if( post.get("current_user").equals("newuser")){ //new user if( post.get("current_user").equals("newuser")){ //new user
if(!pw1.equals("")){ //change only if set if(!pw1.equals("")){ //change only if set
mem.put(userDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(username+":"+pw1)); mem.put(UserDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(username+":"+pw1));
} }
mem.put(userDB.Entry.USER_FIRSTNAME, firstName); mem.put(UserDB.Entry.USER_FIRSTNAME, firstName);
mem.put(userDB.Entry.USER_LASTNAME, lastName); mem.put(UserDB.Entry.USER_LASTNAME, lastName);
mem.put(userDB.Entry.USER_ADDRESS, address); mem.put(UserDB.Entry.USER_ADDRESS, address);
mem.put(userDB.Entry.TIME_LIMIT, timeLimit); mem.put(UserDB.Entry.TIME_LIMIT, timeLimit);
mem.put(userDB.Entry.TIME_USED, timeUsed); mem.put(UserDB.Entry.TIME_USED, timeUsed);
for(i=0;i<rights.length;i++) for(i=0;i<rights.length;i++)
mem.put(rights[i], rightsSet.get(rights[i])); mem.put(rights[i], rightsSet.get(rights[i]));
@ -200,13 +200,13 @@ public class ConfigAccounts_p {
if(entry != null){ if(entry != null){
try{ try{
if(! pw1.equals("")){ if(! pw1.equals("")){
entry.setProperty(userDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(username+":"+pw1)); entry.setProperty(UserDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(username+":"+pw1));
} }
entry.setProperty(userDB.Entry.USER_FIRSTNAME, firstName); entry.setProperty(UserDB.Entry.USER_FIRSTNAME, firstName);
entry.setProperty(userDB.Entry.USER_LASTNAME, lastName); entry.setProperty(UserDB.Entry.USER_LASTNAME, lastName);
entry.setProperty(userDB.Entry.USER_ADDRESS, address); entry.setProperty(UserDB.Entry.USER_ADDRESS, address);
entry.setProperty(userDB.Entry.TIME_LIMIT, timeLimit); entry.setProperty(UserDB.Entry.TIME_LIMIT, timeLimit);
entry.setProperty(userDB.Entry.TIME_USED, timeUsed); entry.setProperty(UserDB.Entry.TIME_USED, timeUsed);
for(i=0;i<rights.length;i++) for(i=0;i<rights.length;i++)
entry.setProperty(rights[i], rightsSet.get(rights[i])); entry.setProperty(rights[i], rightsSet.get(rights[i]));
} catch (final Exception e) { } catch (final Exception e) {
@ -222,7 +222,7 @@ public class ConfigAccounts_p {
} }
//Generate Userlist //Generate Userlist
final Iterator<userDB.Entry> it = sb.userDB.iterator(true); final Iterator<UserDB.Entry> it = sb.userDB.iterator(true);
int numUsers=0; int numUsers=0;
while(it.hasNext()){ while(it.hasNext()){
entry = it.next(); entry = it.next();

4
htroot/ConfigBasic.java
Unescape View File

@ -37,7 +37,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.workflow.InstantBusyThread; import net.yacy.kelondro.workflow.InstantBusyThread;
import de.anomic.data.WorkTables; import de.anomic.data.WorkTables;
import de.anomic.data.translator; import de.anomic.data.Translator;
import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.HTTPDemon;
import de.anomic.http.server.HTTPDFileHandler; import de.anomic.http.server.HTTPDFileHandler;
import de.anomic.net.UPnP; import de.anomic.net.UPnP;
@ -84,7 +84,7 @@ public class ConfigBasic {
// language settings // language settings
if ((post != null) && (!(post.get("language", "default").equals(lang)))) { if ((post != null) && (!(post.get("language", "default").equals(lang)))) {
if (translator.changeLang(env, langPath, post.get("language", "default") + ".lng")) if (Translator.changeLang(env, langPath, post.get("language", "default") + ".lng"))
prop.put("changedLanguage", "1"); prop.put("changedLanguage", "1");
} }

8
htroot/ConfigLanguage_p.java
Unescape View File

@ -43,7 +43,7 @@ import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import de.anomic.data.WorkTables; import de.anomic.data.WorkTables;
import de.anomic.data.translator; import de.anomic.data.Translator;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -82,7 +82,7 @@ public class ConfigLanguage_p {
* directory traversal attacks! * directory traversal attacks!
*/ */
if (langFiles.contains(selectedLanguage) || selectedLanguage.startsWith("default")) { if (langFiles.contains(selectedLanguage) || selectedLanguage.startsWith("default")) {
translator.changeLang(env, langPath, selectedLanguage); Translator.changeLang(env, langPath, selectedLanguage);
} }
//delete language file //delete language file
@ -122,7 +122,7 @@ public class ConfigLanguage_p {
return prop; return prop;
} }
if(post.containsKey("use_lang") && (post.get("use_lang")).equals("on")){ if(post.containsKey("use_lang") && (post.get("use_lang")).equals("on")){
translator.changeLang(env, langPath, url.substring(url.lastIndexOf('/'), url.length())); Translator.changeLang(env, langPath, url.substring(url.lastIndexOf('/'), url.length()));
} }
} }
} }
@ -130,7 +130,7 @@ public class ConfigLanguage_p {
//reread language files //reread language files
langFiles = FileUtils.getDirListing(langPath, LANG_FILENAME_FILTER); langFiles = FileUtils.getDirListing(langPath, LANG_FILENAME_FILTER);
Collections.sort(langFiles); Collections.sort(langFiles);
final Map<String, String> langNames = translator.langMap(env); final Map<String, String> langNames = Translator.langMap(env);
String langKey, langName; String langKey, langName;
//virtual entry //virtual entry

10
htroot/Crawler_p.java
Unescape View File

@ -49,8 +49,8 @@ import de.anomic.crawler.SitemapImporter;
import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.Request;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.WorkTables; import de.anomic.data.WorkTables;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.search.Segment; import de.anomic.search.Segment;
import de.anomic.search.Segments; import de.anomic.search.Segments;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
@ -279,12 +279,12 @@ public class Crawler_p {
if (reasonString == null) { if (reasonString == null) {
// create a bookmark from crawl start url // create a bookmark from crawl start url
Set<String> tags=listManager.string2set(BookmarkHelper.cleanTagsString(post.get("bookmarkFolder","/crawlStart"))); Set<String> tags=ListManager.string2set(BookmarkHelper.cleanTagsString(post.get("bookmarkFolder","/crawlStart")));
tags.add("crawlStart"); tags.add("crawlStart");
if (post.get("createBookmark","off").equals("on")) { if (post.get("createBookmark","off").equals("on")) {
bookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(crawlingStart, "admin"); BookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(crawlingStart, "admin");
if(bookmark != null){ if(bookmark != null){
bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_TITLE, post.get("bookmarkTitle", crawlingStart)); bookmark.setProperty(BookmarksDB.Bookmark.BOOKMARK_TITLE, post.get("bookmarkTitle", crawlingStart));
bookmark.setOwner("admin"); bookmark.setOwner("admin");
bookmark.setPublic(false); bookmark.setPublic(false);
bookmark.setTags(tags, true); bookmark.setTags(tags, true);

12
htroot/IndexControlRWIs_p.java
Unescape View File

@ -54,7 +54,7 @@ import net.yacy.kelondro.util.FileUtils;
import net.yacy.repository.Blacklist; import net.yacy.repository.Blacklist;
import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.CrawlProfile;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.http.client.Cache; import de.anomic.http.client.Cache;
import de.anomic.search.QueryParams; import de.anomic.search.QueryParams;
import de.anomic.search.RankingProcess; import de.anomic.search.RankingProcess;
@ -320,7 +320,7 @@ public class IndexControlRWIs_p {
PrintWriter pw; PrintWriter pw;
try { try {
final String[] supportedBlacklistTypes = env.getConfig("BlackLists.types", "").split(","); final String[] supportedBlacklistTypes = env.getConfig("BlackLists.types", "").split(",");
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, blacklist), true)); pw = new PrintWriter(new FileWriter(new File(ListManager.listsPath, blacklist), true));
DigestURI url; DigestURI url;
for (byte[] b: urlb) { for (byte[] b: urlb) {
try { try {
@ -334,7 +334,7 @@ public class IndexControlRWIs_p {
url = e.metadata().url(); url = e.metadata().url();
pw.println(url.getHost() + "/" + url.getFile()); pw.println(url.getHost() + "/" + url.getFile());
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklist)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklist)) {
Switchboard.urlBlacklist.add( Switchboard.urlBlacklist.add(
supportedBlacklistTypes[blTypes], supportedBlacklistTypes[blTypes],
url.getHost(), url.getHost(),
@ -353,7 +353,7 @@ public class IndexControlRWIs_p {
PrintWriter pw; PrintWriter pw;
try { try {
final String[] supportedBlacklistTypes = Blacklist.BLACKLIST_TYPES_STRING.split(","); final String[] supportedBlacklistTypes = Blacklist.BLACKLIST_TYPES_STRING.split(",");
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, blacklist), true)); pw = new PrintWriter(new FileWriter(new File(ListManager.listsPath, blacklist), true));
DigestURI url; DigestURI url;
for (byte[] b: urlb) { for (byte[] b: urlb) {
try { try {
@ -367,7 +367,7 @@ public class IndexControlRWIs_p {
url = e.metadata().url(); url = e.metadata().url();
pw.println(url.getHost() + "/.*"); pw.println(url.getHost() + "/.*");
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklist)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklist)) {
Switchboard.urlBlacklist.add( Switchboard.urlBlacklist.add(
supportedBlacklistTypes[blTypes], supportedBlacklistTypes[blTypes],
url.getHost(), ".*"); url.getHost(), ".*");
@ -477,7 +477,7 @@ public class IndexControlRWIs_p {
prop.put("genUrlList_urlList", i); prop.put("genUrlList_urlList", i);
prop.putHTML("genUrlList_keyString", keystring); prop.putHTML("genUrlList_keyString", keystring);
prop.put("genUrlList_count", i); prop.put("genUrlList_count", i);
putBlacklists(prop, FileUtils.getDirListing(listManager.listsPath)); putBlacklists(prop, FileUtils.getDirListing(ListManager.listsPath));
} }
} }

4
htroot/Messages_p.java
Unescape View File

@ -37,7 +37,7 @@ import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import de.anomic.data.messageBoard; import de.anomic.data.MessageBoard;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -92,7 +92,7 @@ public class Messages_p {
prop.put("mode_error", "0"); prop.put("mode_error", "0");
String action = ((post == null) ? "list" : post.get("action", "list")); String action = ((post == null) ? "list" : post.get("action", "list"));
messageBoard.entry message; MessageBoard.entry message;
// first reset notification // first reset notification
final File notifierSource = new File(sb.getAppPath(), sb.getConfig("htRootPath", "htroot") + "/env/grafics/empty.gif"); final File notifierSource = new File(sb.getAppPath(), sb.getConfig("htRootPath", "htroot") + "/env/grafics/empty.gif");

10
htroot/User.java
Unescape View File

@ -34,7 +34,7 @@ import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Base64Order;
import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.Digest;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.HTTPDemon;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -46,7 +46,7 @@ public class User{
public static servletProperties respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) { public static servletProperties respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) {
final servletProperties prop = new servletProperties(); final servletProperties prop = new servletProperties();
final Switchboard sb = Switchboard.getSwitchboard(); final Switchboard sb = Switchboard.getSwitchboard();
userDB.Entry entry=null; UserDB.Entry entry=null;
//default values //default values
prop.put("logged_in", "0"); prop.put("logged_in", "0");
@ -128,7 +128,7 @@ public class User{
if(post.get("newpass").equals(post.get("newpass2"))){ if(post.get("newpass").equals(post.get("newpass2"))){
if(!post.get("newpass", "").equals("")){ if(!post.get("newpass", "").equals("")){
try { try {
entry.setProperty(userDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(entry.getUserName()+":"+post.get("newpass", ""))); entry.setProperty(UserDB.Entry.MD5ENCODED_USERPWD_STRING, Digest.encodeMD5Hex(entry.getUserName()+":"+post.get("newpass", "")));
prop.put("status_password", "0"); //changes prop.put("status_password", "0"); //changes
} catch (final Exception e) { } catch (final Exception e) {
Log.logException(e); Log.logException(e);
@ -147,9 +147,9 @@ public class User{
if(post!=null && post.containsKey("logout")){ if(post!=null && post.containsKey("logout")){
prop.put("logged-in", "0"); prop.put("logged-in", "0");
if(entry != null){ if(entry != null){
entry.logout((requestHeader.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "xxxxxx")), userDB.getLoginToken(requestHeader.getHeaderCookies())); //todo: logout cookie entry.logout((requestHeader.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "xxxxxx")), UserDB.getLoginToken(requestHeader.getHeaderCookies())); //todo: logout cookie
}else{ }else{
sb.userDB.adminLogout(userDB.getLoginToken(requestHeader.getHeaderCookies())); sb.userDB.adminLogout(UserDB.getLoginToken(requestHeader.getHeaderCookies()));
} }
//XXX: This should not be needed anymore, because of isLoggedout //XXX: This should not be needed anymore, because of isLoggedout
if(! (requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx")).equals("xxxxxx")){ if(! (requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx")).equals("xxxxxx")){

6
htroot/Wiki.java
Unescape View File

@ -41,7 +41,7 @@ import java.util.Locale;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.diff; import de.anomic.data.Diff;
import de.anomic.data.wiki.WikiBoard; import de.anomic.data.wiki.WikiBoard;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -243,10 +243,10 @@ public class Wiki {
} }
if (post.containsKey("compare") && oentry != null && nentry != null) { if (post.containsKey("compare") && oentry != null && nentry != null) {
// TODO: split into paragraphs and compare them with the same diff-algo // TODO: split into paragraphs and compare them with the same diff-algo
final diff diff = new diff( final Diff diff = new Diff(
new String(oentry.page(), "UTF-8"), new String(oentry.page(), "UTF-8"),
new String(nentry.page(), "UTF-8"), 3); new String(nentry.page(), "UTF-8"), 3);
prop.put("mode_versioning_diff", de.anomic.data.diff.toHTML(new diff[] { diff })); prop.put("mode_versioning_diff", de.anomic.data.Diff.toHTML(new Diff[] { diff }));
prop.put("mode_versioning", "1"); prop.put("mode_versioning", "1");
} else if (post.containsKey("viewold") && oentry != null) { } else if (post.containsKey("viewold") && oentry != null) {
prop.put("mode_versioning", "2"); prop.put("mode_versioning", "2");

10
htroot/api/blacklists.java
Unescape View File

@ -5,7 +5,7 @@ import java.util.List;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -14,8 +14,8 @@ public class blacklists {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
final List<String> dirlist = FileUtils.getDirListing(listManager.listsPath); final List<String> dirlist = FileUtils.getDirListing(ListManager.listsPath);
int blacklistCount=0; int blacklistCount=0;
final String blackListName = (post == null) ? "" : post.get("listname", ""); final String blackListName = (post == null) ? "" : post.get("listname", "");
@ -27,9 +27,9 @@ public class blacklists {
if (blackListName.equals("") || element.equals(blackListName)) { if (blackListName.equals("") || element.equals(blackListName)) {
prop.putXML("lists_" + blacklistCount + "_name", element); prop.putXML("lists_" + blacklistCount + "_name", element);
if (listManager.listSetContains("BlackLists.Shared", element)) { if (ListManager.listSetContains("BlackLists.Shared", element)) {
list = FileUtils.getListArray(new File(listManager.listsPath, element)); list = FileUtils.getListArray(new File(ListManager.listsPath, element));
count=0; count=0;
for (int j=0;j<list.size();++j){ for (int j=0;j<list.size();++j){

12
htroot/api/blacklists_p.java
Unescape View File

@ -6,7 +6,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import net.yacy.repository.Blacklist; import net.yacy.repository.Blacklist;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -16,8 +16,8 @@ public class blacklists_p {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
final List<String> dirlist = FileUtils.getDirListing(listManager.listsPath); final List<String> dirlist = FileUtils.getDirListing(ListManager.listsPath);
int blacklistCount=0; int blacklistCount=0;
final String blackListName = (post == null) ? "" : post.get("listname", ""); final String blackListName = (post == null) ? "" : post.get("listname", "");
@ -30,7 +30,7 @@ public class blacklists_p {
if (blackListName.equals("") || element.equals(blackListName)) { if (blackListName.equals("") || element.equals(blackListName)) {
prop.putXML("lists_" + blacklistCount + "_name", element); prop.putXML("lists_" + blacklistCount + "_name", element);
if (listManager.listSetContains("BlackLists.Shared", element)) { if (ListManager.listSetContains("BlackLists.Shared", element)) {
prop.put("lists_" + blacklistCount + "_shared", "1"); prop.put("lists_" + blacklistCount + "_shared", "1");
} else { } else {
prop.put("lists_" + blacklistCount + "_shared", "0"); prop.put("lists_" + blacklistCount + "_shared", "0");
@ -40,12 +40,12 @@ public class blacklists_p {
for (int j=0; j<types.length; j++) { for (int j=0; j<types.length; j++) {
prop.putXML("lists_" + blacklistCount + "_types_" + j + "_name", types[j]); prop.putXML("lists_" + blacklistCount + "_types_" + j + "_name", types[j]);
prop.put("lists_" + blacklistCount + "_types_" + j + "_value", prop.put("lists_" + blacklistCount + "_types_" + j + "_value",
listManager.listSetContains(types[j] + ".BlackLists", element) ? 1 : 0); ListManager.listSetContains(types[j] + ".BlackLists", element) ? 1 : 0);
} }
prop.put("lists_" + blacklistCount + "_types", types.length); prop.put("lists_" + blacklistCount + "_types", types.length);
if ( ! (attrOnly.equals("1") || attrOnly.equals("true"))) { if ( ! (attrOnly.equals("1") || attrOnly.equals("true"))) {
list = FileUtils.getListArray(new File(listManager.listsPath, element)); list = FileUtils.getListArray(new File(ListManager.listsPath, element));
count=0; count=0;
for (int j=0;j<list.size();++j){ for (int j=0;j<list.size();++j){

12
htroot/api/bookmarks/get_bookmarks.java
Unescape View File

@ -9,8 +9,8 @@ import net.yacy.document.parser.html.CharacterCoding;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -19,7 +19,7 @@ public class get_bookmarks {
private static final serverObjects prop = new serverObjects(); private static final serverObjects prop = new serverObjects();
private static Switchboard sb = null; private static Switchboard sb = null;
private static userDB.Entry user = null; private static UserDB.Entry user = null;
private static boolean isAdmin = false; private static boolean isAdmin = false;
private static int R = 1; // TODO: solve the recursion problem an remove global variable private static int R = 1; // TODO: solve the recursion problem an remove global variable
@ -43,7 +43,7 @@ public class get_bookmarks {
prop.clear(); prop.clear();
sb = (Switchboard) env; sb = (Switchboard) env;
user = sb.userDB.getUser(header); user = sb.userDB.getUser(header);
isAdmin = (sb.verifyAuthentication(header, true) || user != null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); isAdmin = (sb.verifyAuthentication(header, true) || user != null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT));
// set user name // set user name
final String username; final String username;
@ -90,7 +90,7 @@ public class get_bookmarks {
int start = 0; int start = 0;
final Iterator<String> it; final Iterator<String> it;
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
switch (display) { switch (display) {
case XBEL: case XBEL:
@ -228,7 +228,7 @@ public class get_bookmarks {
} }
private static int print_XBEL(final Iterator<String> bit, int count) { private static int print_XBEL(final Iterator<String> bit, int count) {
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
Date date; Date date;
while(bit.hasNext()){ while(bit.hasNext()){
bookmark=sb.bookmarksDB.getBookmark(bit.next()); bookmark=sb.bookmarksDB.getBookmark(bit.next());

10
htroot/api/bookmarks/get_folders.java
Unescape View File

@ -5,8 +5,8 @@ import java.util.Iterator;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -15,7 +15,7 @@ public class get_folders {
private static final serverObjects prop = new serverObjects(); private static final serverObjects prop = new serverObjects();
private static Switchboard sb = null; private static Switchboard sb = null;
private static userDB.Entry user = null; private static UserDB.Entry user = null;
private static boolean isAdmin = false; private static boolean isAdmin = false;
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
@ -23,7 +23,7 @@ public class get_folders {
prop.clear(); prop.clear();
sb = (Switchboard) env; sb = (Switchboard) env;
user = sb.userDB.getUser(header); user = sb.userDB.getUser(header);
isAdmin = (sb.verifyAuthentication(header, true) || user != null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); isAdmin = (sb.verifyAuthentication(header, true) || user != null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT));
// set user name // set user name
final String username; final String username;
@ -72,7 +72,7 @@ public class get_folders {
// loop through bookmarkList // loop through bookmarkList
it = sb.bookmarksDB.getBookmarksIterator(root, isAdmin); it = sb.bookmarksDB.getBookmarksIterator(root, isAdmin);
bookmarksDB.Bookmark bm; BookmarksDB.Bookmark bm;
while (it.hasNext()) { while (it.hasNext()) {
bm = sb.bookmarksDB.getBookmark(it.next()); bm = sb.bookmarksDB.getBookmark(it.next());
// TODO: get rid of bmtype // TODO: get rid of bmtype

16
htroot/api/bookmarks/posts/add_p.java
Unescape View File

@ -5,9 +5,9 @@ import java.util.Set;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -18,7 +18,7 @@ public class add_p {
private static final serverObjects prop = new serverObjects(); private static final serverObjects prop = new serverObjects();
private static Switchboard sb = null; private static Switchboard sb = null;
private static userDB.Entry user = null; private static UserDB.Entry user = null;
private static boolean isAdmin = false; private static boolean isAdmin = false;
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
@ -46,11 +46,11 @@ public class add_p {
String tagsString = post.get("tags",""); String tagsString = post.get("tags","");
String pathString = post.get("path","/unsorted"); String pathString = post.get("path","/unsorted");
tagsString=tagsString+","+pathString; tagsString=tagsString+","+pathString;
final Set<String> tags=listManager.string2set(BookmarkHelper.cleanTagsString(tagsString)); final Set<String> tags=ListManager.string2set(BookmarkHelper.cleanTagsString(tagsString));
final bookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(url, username); final BookmarksDB.Bookmark bookmark = sb.bookmarksDB.createBookmark(url, username);
if(bookmark != null){ if(bookmark != null){
bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_TITLE, title); bookmark.setProperty(BookmarksDB.Bookmark.BOOKMARK_TITLE, title);
bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_DESCRIPTION, description); bookmark.setProperty(BookmarksDB.Bookmark.BOOKMARK_DESCRIPTION, description);
if(user!=null){ if(user!=null){
bookmark.setOwner(user.getUserName()); bookmark.setOwner(user.getUserName());
} }

4
htroot/api/bookmarks/posts/all.java
Unescape View File

@ -6,7 +6,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.Digest;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -29,7 +29,7 @@ public class all {
final boolean extendedXML = (post != null && post.containsKey("extendedXML")); final boolean extendedXML = (post != null && post.containsKey("extendedXML"));
int count=0; int count=0;
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
Date date; Date date;
while(it.hasNext()){ while(it.hasNext()){
bookmark=switchboard.bookmarksDB.getBookmark(it.next()); bookmark=switchboard.bookmarksDB.getBookmark(it.next());

4
htroot/api/bookmarks/posts/get.java
Unescape View File

@ -9,7 +9,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.Digest;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -47,7 +47,7 @@ public class get {
final ArrayList<String> bookmark_hashes=switchboard.bookmarksDB.getDate(Long.toString(parsedDate.getTime())).getBookmarkList(); final ArrayList<String> bookmark_hashes=switchboard.bookmarksDB.getDate(Long.toString(parsedDate.getTime())).getBookmarkList();
final Iterator<String> it=bookmark_hashes.iterator(); final Iterator<String> it=bookmark_hashes.iterator();
bookmarksDB.Bookmark bookmark=null; BookmarksDB.Bookmark bookmark=null;
while(it.hasNext()){ while(it.hasNext()){
bookmark=switchboard.bookmarksDB.getBookmark(it.next()); bookmark=switchboard.bookmarksDB.getBookmark(it.next());
if(DateFormatter.formatISO8601(new Date(bookmark.getTimeStamp())).equals(date) && if(DateFormatter.formatISO8601(new Date(bookmark.getTimeStamp())).equals(date) &&

2
htroot/api/bookmarks/tags/addTag_p.java
Unescape View File

@ -3,7 +3,7 @@ import net.yacy.cora.protocol.RequestHeader;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
import de.anomic.data.bookmarksDB.Bookmark; import de.anomic.data.BookmarksDB.Bookmark;
public class addTag_p { public class addTag_p {

6
htroot/api/bookmarks/tags/getTag.java
Unescape View File

@ -3,7 +3,7 @@ import java.util.Iterator;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -18,7 +18,7 @@ public class getTag {
final Switchboard switchboard = (Switchboard) env; final Switchboard switchboard = (Switchboard) env;
final boolean isAdmin=switchboard.verifyAuthentication(header, true); final boolean isAdmin=switchboard.verifyAuthentication(header, true);
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
Iterator<bookmarksDB.Tag> it = null; Iterator<BookmarksDB.Tag> it = null;
String tagName = ""; String tagName = "";
int top = SHOW_ALL; int top = SHOW_ALL;
int comp = SORT_ALPHA; int comp = SORT_ALPHA;
@ -55,7 +55,7 @@ public class getTag {
int count=0; int count=0;
if(it != null) { if(it != null) {
bookmarksDB.Tag tag; BookmarksDB.Tag tag;
while (it.hasNext()) { while (it.hasNext()) {
tag = it.next(); tag = it.next();
if(!tag.getTagName().startsWith("/")) { // ignore folder tags if(!tag.getTagName().startsWith("/")) { // ignore folder tags

4
htroot/api/bookmarks/xbel/xbel.java
Unescape View File

@ -8,7 +8,7 @@ import net.yacy.document.parser.html.CharacterCoding;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarkHelper;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -104,7 +104,7 @@ public class xbel {
return count; return count;
} }
private static int print_XBEL(final Iterator<String> bit, int count) { private static int print_XBEL(final Iterator<String> bit, int count) {
bookmarksDB.Bookmark bookmark; BookmarksDB.Bookmark bookmark;
Date date; Date date;
while(bit.hasNext()){ while(bit.hasNext()){
bookmark=switchboard.bookmarksDB.getBookmark(bit.next()); bookmark=switchboard.bookmarksDB.getBookmark(bit.next());

6
htroot/api/ymarks/add_ymark.java
Unescape View File

@ -5,7 +5,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -17,9 +17,9 @@ public class add_ymark {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
if(isAdmin || isAuthUser) { if(isAdmin || isAuthUser) {
final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN); final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);

6
htroot/api/ymarks/delete_ymark.java
Unescape View File

@ -4,7 +4,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -18,9 +18,9 @@ public class delete_ymark {
sb = (Switchboard) env; sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
if(isAdmin || isAuthUser) { if(isAdmin || isAuthUser) {
final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN); final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);

6
htroot/api/ymarks/get_treeview.java
Unescape View File

@ -12,7 +12,7 @@ import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.DateFormatter;
import de.anomic.data.YMarkKeyValueEntry; import de.anomic.data.YMarkKeyValueEntry;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.data.YMarkTables.METADATA; import de.anomic.data.YMarkTables.METADATA;
import de.anomic.search.Segments; import de.anomic.search.Segments;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
@ -29,9 +29,9 @@ public class get_treeview {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
prop = new serverObjects(); prop = new serverObjects();
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
if(isAdmin || isAuthUser) { if(isAdmin || isAuthUser) {

6
htroot/api/ymarks/get_xbel.java
Unescape View File

@ -9,7 +9,7 @@ import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.YMarksXBELImporter; import de.anomic.data.YMarksXBELImporter;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -23,9 +23,9 @@ public class get_xbel {
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final HashSet<String> alias = new HashSet<String>(); final HashSet<String> alias = new HashSet<String>();
final StringBuilder buffer = new StringBuilder(250); final StringBuilder buffer = new StringBuilder(250);
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
final String bmk_user; final String bmk_user;
if(isAdmin || isAuthUser) { if(isAdmin || isAuthUser) {

6
htroot/api/ymarks/get_ymark.java
Unescape View File

@ -7,7 +7,7 @@ import net.yacy.kelondro.blob.Tables;
import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -24,9 +24,9 @@ public class get_ymark {
boolean tags = false; boolean tags = false;
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
final TreeSet<String> bookmarks = new TreeSet<String>(); final TreeSet<String> bookmarks = new TreeSet<String>();
if(isAdmin || isAuthUser) { if(isAdmin || isAuthUser) {

6
htroot/api/ymarks/import_ymark.java
Unescape View File

@ -10,7 +10,7 @@ import net.yacy.kelondro.logging.Log;
import de.anomic.data.YMarkTables; import de.anomic.data.YMarkTables;
import de.anomic.data.YMarksHTMLImporter; import de.anomic.data.YMarksHTMLImporter;
import de.anomic.data.YMarksXBELImporter; import de.anomic.data.YMarksXBELImporter;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -21,9 +21,9 @@ public class import_ymark {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env; final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final userDB.Entry user = sb.userDB.getUser(header); final UserDB.Entry user = sb.userDB.getUser(header);
final boolean isAdmin = (sb.verifyAuthentication(header, true)); final boolean isAdmin = (sb.verifyAuthentication(header, true));
final boolean isAuthUser = user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT); final boolean isAuthUser = user!= null && user.hasRight(UserDB.Entry.BOOKMARK_RIGHT);
Thread t; Thread t;
HashMap<String,String> bmk; HashMap<String,String> bmk;
ByteArrayInputStream byteIn = null; ByteArrayInputStream byteIn = null;

14
htroot/sharedBlacklist_p.java
Unescape View File

@ -39,7 +39,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.data.list.ListAccumulator; import de.anomic.data.list.ListAccumulator;
import de.anomic.data.list.XMLBlacklistImporter; import de.anomic.data.list.XMLBlacklistImporter;
import de.anomic.search.SearchEventCache; import de.anomic.search.SearchEventCache;
@ -87,12 +87,12 @@ public class sharedBlacklist_p {
if (post != null) { if (post != null) {
// initialize the list manager // initialize the list manager
listManager.switchboard = (Switchboard) env; ListManager.switchboard = (Switchboard) env;
listManager.listsPath = new File(listManager.switchboard.getDataPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// loading all blacklist files located in the directory // loading all blacklist files located in the directory
final List<String> dirlist = FileUtils.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER); final List<String> dirlist = FileUtils.getDirListing(ListManager.listsPath, BLACKLIST_FILENAME_FILTER);
// List BlackLists // List BlackLists
int blacklistCount = 0; int blacklistCount = 0;
@ -215,7 +215,7 @@ public class sharedBlacklist_p {
PrintWriter pw = null; PrintWriter pw = null;
try { try {
// open the blacklist file // open the blacklist file
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, selectedBlacklistName), true)); pw = new PrintWriter(new FileWriter(new File(ListManager.listsPath, selectedBlacklistName), true));
// loop through the received entry list // loop through the received entry list
final int num = Integer.parseInt( post.get("num") ); final int num = Integer.parseInt( post.get("num") );
@ -245,7 +245,7 @@ public class sharedBlacklist_p {
final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(","); final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) { for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",selectedBlacklistName)) { if (ListManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",selectedBlacklistName)) {
Switchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes],newItem.substring(0, pos), newItem.substring(pos + 1)); Switchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes],newItem.substring(0, pos), newItem.substring(pos + 1));
} }
} }
@ -271,7 +271,7 @@ public class sharedBlacklist_p {
// generate the html list // generate the html list
if (otherBlacklist != null) { if (otherBlacklist != null) {
// loading the current blacklist content // loading the current blacklist content
final HashSet<String> Blacklist = new HashSet<String>(FileUtils.getListArray(new File(listManager.listsPath, selectedBlacklistName))); final HashSet<String> Blacklist = new HashSet<String>(FileUtils.getListArray(new File(ListManager.listsPath, selectedBlacklistName)));
int count = 0; int count = 0;
while (otherBlacklist.hasNext()) { while (otherBlacklist.hasNext()) {

6
htroot/yacy/message.java
Unescape View File

@ -40,7 +40,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import de.anomic.data.messageBoard; import de.anomic.data.MessageBoard;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -132,7 +132,7 @@ public final class message {
prop.put("response", "Thank you!"); prop.put("response", "Thank you!");
// save message // save message
messageBoard.entry msgEntry = null; MessageBoard.entry msgEntry = null;
byte[] mb; byte[] mb;
try { try {
mb = message.getBytes("UTF-8"); mb = message.getBytes("UTF-8");
@ -171,7 +171,7 @@ public final class message {
#[message]# #[message]#
*/ */
private static void messageForwardingViaEmail(final Switchboard sb, final messageBoard.entry msgEntry) { private static void messageForwardingViaEmail(final Switchboard sb, final MessageBoard.entry msgEntry) {
try { try {
if (!Boolean.parseBoolean(sb.getConfig("msgForwardingEnabled","false"))) return; if (!Boolean.parseBoolean(sb.getConfig("msgForwardingEnabled","false"))) return;

24
source/de/anomic/data/blogBoard.java → source/de/anomic/data/BlogBoard.java
Unescape View File

@ -59,13 +59,13 @@ import de.anomic.data.wiki.WikiBoard;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public class blogBoard { public class BlogBoard {
private static final int KEY_LENGTH = 64; private static final int KEY_LENGTH = 64;
private MapHeap database = null; private MapHeap database = null;
public blogBoard(final File actpath) throws IOException { public BlogBoard(final File actpath) throws IOException {
new File(actpath.getParent()).mkdir(); new File(actpath.getParent()).mkdir();
//database = new MapView(BLOBTree.toHeap(actpath, true, true, keyLength, recordSize, '_', NaturalOrder.naturalOrder, newFile), 500, '_'); //database = new MapView(BLOBTree.toHeap(actpath, true, true, keyLength, recordSize, '_', NaturalOrder.naturalOrder, newFile), 500, '_');
database = new MapHeap(actpath, KEY_LENGTH, NaturalOrder.naturalOrder, 1024 * 64, 500, '_'); database = new MapHeap(actpath, KEY_LENGTH, NaturalOrder.naturalOrder, 1024 * 64, 500, '_');
@ -308,7 +308,7 @@ public class blogBoard {
Iterator<byte[]> blogIter; Iterator<byte[]> blogIter;
//blogBoard.BlogEntry nextEntry; //blogBoard.BlogEntry nextEntry;
public BlogIterator(final boolean up) throws IOException { public BlogIterator(final boolean up) throws IOException {
this.blogIter = blogBoard.this.database.keys(up, false); this.blogIter = BlogBoard.this.database.keys(up, false);
//this.nextEntry = null; //this.nextEntry = null;
} }
@ -369,7 +369,7 @@ public class blogBoard {
this.key = key; this.key = key;
this.record = record; this.record = record;
if (this.record.get("comments") == null) { if (this.record.get("comments") == null) {
this.record.put("comments", listManager.collection2string(new ArrayList<String>())); this.record.put("comments", ListManager.collection2string(new ArrayList<String>()));
} }
if (this.record.get("commentMode") == null || this.record.get("commentMode").equals("")) { if (this.record.get("commentMode") == null || this.record.get("commentMode").equals("")) {
this.record.put("commentMode", "2"); this.record.put("commentMode", "2");
@ -457,19 +457,19 @@ public class blogBoard {
record.put("comments", record.get("comments").substring(1)); record.put("comments", record.get("comments").substring(1));
writeBlogEntry(this); writeBlogEntry(this);
} }
final List<String> commentsize = listManager.string2arraylist(record.get("comments")); final List<String> commentsize = ListManager.string2arraylist(record.get("comments"));
return commentsize.size(); return commentsize.size();
} }
public List<String> getComments() { public List<String> getComments() {
return listManager.string2arraylist(record.get("comments")); return ListManager.string2arraylist(record.get("comments"));
} }
private void setComments(final List<String> comments) { private void setComments(final List<String> comments) {
if (comments == null) { if (comments == null) {
record.put("comments", listManager.collection2string(new ArrayList<String>())); record.put("comments", ListManager.collection2string(new ArrayList<String>()));
} else { } else {
record.put("comments", listManager.collection2string(comments)); record.put("comments", ListManager.collection2string(comments));
} }
} }
@ -503,15 +503,15 @@ public class blogBoard {
} }
public void addComment(final String commentID) { public void addComment(final String commentID) {
final List<String> comments = listManager.string2arraylist(record.get("comments")); final List<String> comments = ListManager.string2arraylist(record.get("comments"));
comments.add(commentID); comments.add(commentID);
record.put("comments", listManager.collection2string(comments)); record.put("comments", ListManager.collection2string(comments));
} }
public boolean removeComment(final String commentID) { public boolean removeComment(final String commentID) {
final List<String> comments = listManager.string2arraylist(record.get("comments")); final List<String> comments = ListManager.string2arraylist(record.get("comments"));
final boolean success = comments.remove(commentID); final boolean success = comments.remove(commentID);
record.put("comments", listManager.collection2string(comments)); record.put("comments", ListManager.collection2string(comments));
return success; return success;
} }

6
source/de/anomic/data/blogBoardComments.java → source/de/anomic/data/BlogBoardComments.java
Unescape View File

@ -55,7 +55,7 @@ import org.xml.sax.SAXException;
import de.anomic.data.wiki.WikiBoard; import de.anomic.data.wiki.WikiBoard;
public class blogBoardComments { public class BlogBoardComments {
private final static int KEY_LENGTH = 64; private final static int KEY_LENGTH = 64;
private final static String DATE_FORMAT = "yyyyMMddHHmmss"; private final static String DATE_FORMAT = "yyyyMMddHHmmss";
@ -67,7 +67,7 @@ public class blogBoardComments {
private MapHeap database = null; private MapHeap database = null;
public blogBoardComments(final File actpath) throws IOException { public BlogBoardComments(final File actpath) throws IOException {
new File(actpath.getParent()).mkdir(); new File(actpath.getParent()).mkdir();
//database = new MapView(BLOBTree.toHeap(actpath, true, true, keyLength, recordSize, '_', NaturalOrder.naturalOrder, newFile), 500, '_'); //database = new MapView(BLOBTree.toHeap(actpath, true, true, keyLength, recordSize, '_', NaturalOrder.naturalOrder, newFile), 500, '_');
database = new MapHeap(actpath, KEY_LENGTH, NaturalOrder.naturalOrder, 1024 * 64, 500, '_'); database = new MapHeap(actpath, KEY_LENGTH, NaturalOrder.naturalOrder, 1024 * 64, 500, '_');
@ -262,7 +262,7 @@ public class blogBoardComments {
this.key = key; this.key = key;
this.record = record; this.record = record;
if (this.record.get("comments") == null) { if (this.record.get("comments") == null) {
this.record.put("comments", listManager.collection2string(new ArrayList<String>())); this.record.put("comments", ListManager.collection2string(new ArrayList<String>()));
} }
} }

16
source/de/anomic/data/BookmarkDate.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import de.anomic.data.bookmarksDB.Bookmark; import de.anomic.data.BookmarksDB.Bookmark;
import net.yacy.kelondro.blob.MapHeap; import net.yacy.kelondro.blob.MapHeap;
import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.index.RowSpaceExceededException;
@ -112,20 +112,20 @@ public class BookmarkDate {
//round to seconds, but store as milliseconds (java timestamp) //round to seconds, but store as milliseconds (java timestamp)
date=String.valueOf((Long.parseLong(mydate)/1000)*1000); date=String.valueOf((Long.parseLong(mydate)/1000)*1000);
mem=new HashMap<String, String>(); mem=new HashMap<String, String>();
mem.put(URL_HASHES, listManager.collection2string(entries)); mem.put(URL_HASHES, ListManager.collection2string(entries));
} }
public void add(final String urlHash){ public void add(final String urlHash){
final String urlHashes = mem.get(URL_HASHES); final String urlHashes = mem.get(URL_HASHES);
ArrayList<String> list; ArrayList<String> list;
if(urlHashes != null && !urlHashes.equals("")){ if(urlHashes != null && !urlHashes.equals("")){
list=listManager.string2arraylist(urlHashes); list=ListManager.string2arraylist(urlHashes);
}else{ }else{
list=new ArrayList<String>(); list=new ArrayList<String>();
} }
if(!list.contains(urlHash) && urlHash != null && !urlHash.equals("")){ if(!list.contains(urlHash) && urlHash != null && !urlHash.equals("")){
list.add(urlHash); list.add(urlHash);
} }
this.mem.put(URL_HASHES, listManager.collection2string(list)); this.mem.put(URL_HASHES, ListManager.collection2string(list));
/*if(urlHashes!=null && !urlHashes.equals("") ){ /*if(urlHashes!=null && !urlHashes.equals("") ){
if(urlHashes.indexOf(urlHash) <0){ if(urlHashes.indexOf(urlHash) <0){
this.mem.put(URL_HASHES, urlHashes+","+urlHash); this.mem.put(URL_HASHES, urlHashes+","+urlHash);
@ -135,11 +135,11 @@ public class BookmarkDate {
}*/ }*/
} }
public void delete(final String urlHash){ public void delete(final String urlHash){
final ArrayList<String> list=listManager.string2arraylist(this.mem.get(URL_HASHES)); final ArrayList<String> list=ListManager.string2arraylist(this.mem.get(URL_HASHES));
if(list.contains(urlHash)){ if(list.contains(urlHash)){
list.remove(urlHash); list.remove(urlHash);
} }
this.mem.put(URL_HASHES, listManager.collection2string(list)); this.mem.put(URL_HASHES, ListManager.collection2string(list));
} }
public void setDatesTable() { public void setDatesTable() {
if (this.size() >0) { if (this.size() >0) {
@ -160,10 +160,10 @@ public class BookmarkDate {
return date; return date;
} }
public ArrayList<String> getBookmarkList(){ public ArrayList<String> getBookmarkList(){
return listManager.string2arraylist(this.mem.get(URL_HASHES)); return ListManager.string2arraylist(this.mem.get(URL_HASHES));
} }
public int size(){ public int size(){
return listManager.string2arraylist(this.mem.get(URL_HASHES)).size(); return ListManager.string2arraylist(this.mem.get(URL_HASHES)).size();
} }
} }
} }

18
source/de/anomic/data/BookmarkHelper.java
Unescape View File

@ -50,8 +50,8 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import de.anomic.data.bookmarksDB.Bookmark; import de.anomic.data.BookmarksDB.Bookmark;
import de.anomic.data.bookmarksDB.Tag; import de.anomic.data.BookmarksDB.Tag;
import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.document.parser.html.ContentScraper; import net.yacy.document.parser.html.ContentScraper;
import net.yacy.document.parser.html.TransformerWriter; import net.yacy.document.parser.html.TransformerWriter;
@ -112,7 +112,7 @@ public class BookmarkHelper {
// bookmarksDB's Import/Export functions // bookmarksDB's Import/Export functions
// -------------------------------------- // --------------------------------------
public static int importFromBookmarks(bookmarksDB db, final DigestURI baseURL, final String input, final String tag, final boolean importPublic){ public static int importFromBookmarks(BookmarksDB db, final DigestURI baseURL, final String input, final String tag, final boolean importPublic){
try { try {
// convert string to input stream // convert string to input stream
final ByteArrayInputStream byteIn = new ByteArrayInputStream(input.getBytes("UTF-8")); final ByteArrayInputStream byteIn = new ByteArrayInputStream(input.getBytes("UTF-8"));
@ -125,7 +125,7 @@ public class BookmarkHelper {
} }
} }
private static int importFromBookmarks(bookmarksDB db, final DigestURI baseURL, final InputStreamReader input, final String tag, final boolean importPublic){ private static int importFromBookmarks(BookmarksDB db, final DigestURI baseURL, final InputStreamReader input, final String tag, final boolean importPublic){
int importCount = 0; int importCount = 0;
@ -133,7 +133,7 @@ public class BookmarkHelper {
String title; String title;
MultiProtocolURI url; MultiProtocolURI url;
Bookmark bm; Bookmark bm;
final Set<String> tags=listManager.string2set(tag); //this allow multiple default tags final Set<String> tags=ListManager.string2set(tag); //this allow multiple default tags
try { try {
//load the links //load the links
final ContentScraper scraper = new ContentScraper(baseURL); final ContentScraper scraper = new ContentScraper(baseURL);
@ -163,7 +163,7 @@ public class BookmarkHelper {
} }
public static int importFromXML(bookmarksDB db, final String input, final boolean importPublic){ public static int importFromXML(BookmarksDB db, final String input, final boolean importPublic){
try { try {
// convert string to input stream // convert string to input stream
final ByteArrayInputStream byteIn = new ByteArrayInputStream(input.getBytes("UTF-8")); final ByteArrayInputStream byteIn = new ByteArrayInputStream(input.getBytes("UTF-8"));
@ -175,7 +175,7 @@ public class BookmarkHelper {
} }
} }
private static int importFromXML(bookmarksDB db, final InputStream input, final boolean importPublic){ private static int importFromXML(BookmarksDB db, final InputStream input, final boolean importPublic){
final DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance(); final DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
factory.setValidating(false); factory.setValidating(false);
factory.setNamespaceAware(false); factory.setNamespaceAware(false);
@ -192,7 +192,7 @@ public class BookmarkHelper {
} }
private static int parseXMLimport(bookmarksDB db, final Node doc, final boolean importPublic){ private static int parseXMLimport(BookmarksDB db, final Node doc, final boolean importPublic){
int importCount = 0; int importCount = 0;
if (doc.getNodeName().equals("post")) { if (doc.getNodeName().equals("post")) {
final NamedNodeMap attributes = doc.getAttributes(); final NamedNodeMap attributes = doc.getAttributes();
@ -223,7 +223,7 @@ public class BookmarkHelper {
bm.setProperty(Bookmark.BOOKMARK_TITLE, title); bm.setProperty(Bookmark.BOOKMARK_TITLE, title);
} }
if(tagsString!=null){ if(tagsString!=null){
tags = listManager.string2set(tagsString.replace(' ', ',')); tags = ListManager.string2set(tagsString.replace(' ', ','));
} }
bm.setTags(tags, true); bm.setTags(tags, true);
if(time != null){ if(time != null){

20
source/de/anomic/data/bookmarksDB.java → source/de/anomic/data/BookmarksDB.java
Unescape View File

@ -42,7 +42,7 @@ import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.NaturalOrder;
public class bookmarksDB { public class BookmarksDB {
// ------------------------------------ // ------------------------------------
// Declaration of Class-Attributes // Declaration of Class-Attributes
@ -64,7 +64,7 @@ public class bookmarksDB {
// bookmarksDB's class constructor // bookmarksDB's class constructor
// ------------------------------------ // ------------------------------------
public bookmarksDB(final File bookmarksFile, final File datesFile) throws IOException { public BookmarksDB(final File bookmarksFile, final File datesFile) throws IOException {
// bookmarks // bookmarks
bookmarksFile.getParentFile().mkdirs(); bookmarksFile.getParentFile().mkdirs();
@ -159,7 +159,7 @@ public class bookmarksDB {
final Bookmark bookmark = getBookmark(urlHash); final Bookmark bookmark = getBookmark(urlHash);
if (bookmark == null) return false; //does not exist if (bookmark == null) return false; //does not exist
final Set<String> tagSet = bookmark.getTags(); final Set<String> tagSet = bookmark.getTags();
bookmarksDB.Tag tag=null; BookmarksDB.Tag tag=null;
final Iterator<String> it=tagSet.iterator(); final Iterator<String> it=tagSet.iterator();
while(it.hasNext()){ while(it.hasNext()){
tag=getTag(BookmarkHelper.tagHash(it.next())); tag=getTag(BookmarkHelper.tagHash(it.next()));
@ -374,7 +374,7 @@ public class bookmarksDB {
tagHash = hash; tagHash = hash;
mem = map; mem = map;
if (mem.containsKey(URL_HASHES)) { if (mem.containsKey(URL_HASHES)) {
urlHashes = listManager.string2set(mem.get(URL_HASHES)); urlHashes = ListManager.string2set(mem.get(URL_HASHES));
} else { } else {
urlHashes = new HashSet<String>(); urlHashes = new HashSet<String>();
} }
@ -393,7 +393,7 @@ public class bookmarksDB {
} }
public Map<String, String> getMap(){ public Map<String, String> getMap(){
mem.put(URL_HASHES, listManager.collection2string(this.urlHashes)); mem.put(URL_HASHES, ListManager.collection2string(this.urlHashes));
return mem; return mem;
} }
@ -469,7 +469,7 @@ public class bookmarksDB {
entry = map; entry = map;
this.urlHash = urlHash; this.urlHash = urlHash;
tagNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); tagNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
if (map.containsKey(BOOKMARK_TAGS)) tagNames.addAll(listManager.string2set(map.get(BOOKMARK_TAGS))); if (map.containsKey(BOOKMARK_TAGS)) tagNames.addAll(ListManager.string2set(map.get(BOOKMARK_TAGS)));
loadTimestamp(); loadTimestamp();
} }
@ -516,7 +516,7 @@ public class bookmarksDB {
} }
Map<String, String> toMap() { Map<String, String> toMap() {
entry.put(BOOKMARK_TAGS, listManager.collection2string(tagNames)); entry.put(BOOKMARK_TAGS, ListManager.collection2string(tagNames));
entry.put(BOOKMARK_TIMESTAMP, String.valueOf(this.timestamp)); entry.put(BOOKMARK_TIMESTAMP, String.valueOf(this.timestamp));
return entry; return entry;
} }
@ -539,7 +539,7 @@ public class bookmarksDB {
} }
public String getTagsString() { public String getTagsString() {
final String s[] = listManager.collection2string(getTags()).split(","); final String s[] = ListManager.collection2string(getTags()).split(",");
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
for (final String element : s){ for (final String element : s){
if(!element.startsWith("/")){ if(!element.startsWith("/")){
@ -551,7 +551,7 @@ public class bookmarksDB {
} }
public String getFoldersString(){ public String getFoldersString(){
final String s[] = listManager.collection2string(getTags()).split(","); final String s[] = ListManager.collection2string(getTags()).split(",");
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
for (final String element : s){ for (final String element : s){
if(element.startsWith("/")){ if(element.startsWith("/")){
@ -676,7 +676,7 @@ public class bookmarksDB {
public bookmarkIterator(final boolean up) throws IOException { public bookmarkIterator(final boolean up) throws IOException {
//flushBookmarkCache(); //XXX: this will cost performance //flushBookmarkCache(); //XXX: this will cost performance
this.bookmarkIter = bookmarksDB.this.bookmarks.keys(up, false); this.bookmarkIter = BookmarksDB.this.bookmarks.keys(up, false);
//this.nextEntry = null; //this.nextEntry = null;
} }

26
source/de/anomic/data/diff.java → source/de/anomic/data/Diff.java
Unescape View File

@ -36,7 +36,7 @@ import net.yacy.document.parser.html.CharacterCoding;
/** /**
* This class provides a diff-functionality. * This class provides a diff-functionality.
*/ */
public class diff { public class Diff {
private final ArrayList <Part> parts = new ArrayList<Part>(); private final ArrayList <Part> parts = new ArrayList<Part>();
protected final Object[] original; protected final Object[] original;
@ -47,7 +47,7 @@ public class diff {
* @param changed the new <code>String</code> * @param changed the new <code>String</code>
* @throws NullPointerException if one of the arguments is <code>null</code> * @throws NullPointerException if one of the arguments is <code>null</code>
*/ */
public diff(final String original, final String changed) { public Diff(final String original, final String changed) {
this(original, changed, 1); this(original, changed, 1);
} }
@ -60,7 +60,7 @@ public class diff {
* @throws NullPointerException if <code>original</code> or <code>changed</code> is * @throws NullPointerException if <code>original</code> or <code>changed</code> is
* <code>null</code> * <code>null</code>
*/ */
public diff(final String original, final String changed, final int minConsecutive) { public Diff(final String original, final String changed, final int minConsecutive) {
if (original == null || changed == null) throw new NullPointerException("input Strings must be null"); if (original == null || changed == null) throw new NullPointerException("input Strings must be null");
this.original = new Comparable[original.length()]; this.original = new Comparable[original.length()];
for (int i=0; i<original.length(); i++) for (int i=0; i<original.length(); i++)
@ -71,7 +71,7 @@ public class diff {
parse((minConsecutive > 0) ? minConsecutive : 1); parse((minConsecutive > 0) ? minConsecutive : 1);
} }
public diff(final Object[] original, final Object[] changed, final int minConsecutive) { public Diff(final Object[] original, final Object[] changed, final int minConsecutive) {
if (original == null || changed == null) throw new NullPointerException("input Objects must be null"); if (original == null || changed == null) throw new NullPointerException("input Objects must be null");
this.original = original; this.original = original;
this.changed = changed; this.changed = changed;
@ -222,10 +222,10 @@ public class diff {
final StringBuilder sb = new StringBuilder(this.posNew - this.posOld); final StringBuilder sb = new StringBuilder(this.posNew - this.posOld);
if (this.action == ADDED) { if (this.action == ADDED) {
for (int i = this.posOld; i < this.posNew; i++) for (int i = this.posOld; i < this.posNew; i++)
sb.append(diff.this.changed[i]); sb.append(Diff.this.changed[i]);
} else { } else {
for (int i = this.posOld; i < this.posNew; i++) for (int i = this.posOld; i < this.posNew; i++)
sb.append(diff.this.original[i]); sb.append(Diff.this.original[i]);
} }
return sb.toString(); return sb.toString();
} }
@ -245,18 +245,18 @@ public class diff {
} }
} }
public static String toHTML(final diff[] diffs) { public static String toHTML(final Diff[] diffs) {
final StringBuilder sb = new StringBuilder(diffs.length * 60); final StringBuilder sb = new StringBuilder(diffs.length * 60);
diff.Part[] ps; Diff.Part[] ps;
for (diff d : diffs) { for (Diff d : diffs) {
sb.append("<p class=\"diff\">\n"); sb.append("<p class=\"diff\">\n");
ps = d.getParts(); ps = d.getParts();
for (diff.Part part :ps) { for (Diff.Part part :ps) {
sb.append("<span\nclass=\""); sb.append("<span\nclass=\"");
switch (part.getAction()) { switch (part.getAction()) {
case diff.Part.UNCHANGED: sb.append("unchanged"); break; case Diff.Part.UNCHANGED: sb.append("unchanged"); break;
case diff.Part.ADDED: sb.append("added"); break; case Diff.Part.ADDED: sb.append("added"); break;
case diff.Part.DELETED: sb.append("deleted"); break; case Diff.Part.DELETED: sb.append("deleted"); break;
} }
sb.append("\">").append(CharacterCoding.unicode2html(part.getString(), true).replaceAll("\n", "<br />")); sb.append("\">").append(CharacterCoding.unicode2html(part.getString(), true).replaceAll("\n", "<br />"));
sb.append("</span>"); sb.append("</span>");

2
source/de/anomic/data/listManager.java → source/de/anomic/data/ListManager.java
Unescape View File

@ -43,7 +43,7 @@ import java.util.List;
// The Naming of the functions is a bit strange... // The Naming of the functions is a bit strange...
public class listManager { public class ListManager {
public static Switchboard switchboard = null; public static Switchboard switchboard = null;
public static File listsPath = null; public static File listsPath = null;

4
source/de/anomic/data/messageBoard.java → source/de/anomic/data/MessageBoard.java
Unescape View File

@ -39,7 +39,7 @@ import net.yacy.kelondro.order.Base64Order;
import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.NaturalOrder;
public class messageBoard { public class MessageBoard {
private static final int categoryLength = 12; private static final int categoryLength = 12;
private static final String dateFormat = "yyyyMMddHHmmss"; private static final String dateFormat = "yyyyMMddHHmmss";
@ -53,7 +53,7 @@ public class messageBoard {
private MapHeap database = null; private MapHeap database = null;
private int sn = 0; private int sn = 0;
public messageBoard(final File path) throws IOException { public MessageBoard(final File path) throws IOException {
new File(path.getParent()).mkdir(); new File(path.getParent()).mkdir();
if (database == null) { if (database == null) {
//database = new MapView(BLOBTree.toHeap(path, true, true, categoryLength + dateFormat.length() + 2, recordSize, '_', NaturalOrder.naturalOrder, pathNew), 500, '_'); //database = new MapView(BLOBTree.toHeap(path, true, true, categoryLength + dateFormat.length() + 2, recordSize, '_', NaturalOrder.naturalOrder, pathNew), 500, '_');

35
source/de/anomic/data/translator.java → source/de/anomic/data/Translator.java
Unescape View File

@ -40,7 +40,6 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.HashMap; import java.util.HashMap;
import java.util.Hashtable;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -58,11 +57,11 @@ import java.util.Set;
* *
* Uses a Property like file with phrases or single words to translate a string or a file * Uses a Property like file with phrases or single words to translate a string or a file
* */ * */
public class translator { public class Translator {
public static String translate(final String source, final Map<String, String> translationTable){ public static String translate(final String source, final Map<String, String> translationTable){
final Set<String> keys = translationTable.keySet(); final Set<String> keys = translationTable.keySet();
String result = source; String result = source;
for (String key : keys){ for (final String key : keys){
final Pattern pattern = Pattern.compile(key); final Pattern pattern = Pattern.compile(key);
final Matcher matcher = pattern.matcher(result); final Matcher matcher = pattern.matcher(result);
if (matcher.find()) { if (matcher.find()) {
@ -82,15 +81,15 @@ public class translator {
* @return a Hashtable, which contains for each File a Hashtable with translations. * @return a Hashtable, which contains for each File a Hashtable with translations.
*/ */
public static Map<String, Map<String, String>> loadTranslationsLists(final File translationFile){ public static Map<String, Map<String, String>> loadTranslationsLists(final File translationFile){
final Map<String, Map<String, String>> lists = new Hashtable<String, Map<String, String>>(); //list of translationLists for different files. final Map<String, Map<String, String>> lists = new HashMap<String, Map<String, String>>(); //list of translationLists for different files.
Map<String, String> translationList = new Hashtable<String, String>(); //current Translation Table Map<String, String> translationList = new HashMap<String, String>(); //current Translation Table
final List<String> list = FileUtils.getListArray(translationFile); final List<String> list = FileUtils.getListArray(translationFile);
String forFile = ""; String forFile = "";
for (final String line : list){ for (final String line : list){
if (line.length() == 0 || line.charAt(0) != '#'){ if (line.length() == 0 || line.charAt(0) != '#'){
String[] split = line.split("==", 2); final String[] split = line.split("==", 2);
if (split.length == 2) { if (split.length == 2) {
translationList.put(split[0], split[1]); translationList.put(split[0], split[1]);
//}else{ //Invalid line //}else{ //Invalid line
@ -105,9 +104,9 @@ public class translator {
forFile=line.substring(6); forFile=line.substring(6);
} }
if (lists.containsKey(forFile)) { if (lists.containsKey(forFile)) {
translationList=lists.get(forFile); translationList = lists.get(forFile);
} else { } else {
translationList = new Hashtable<String, String>(); translationList = new HashMap<String, String>();
} }
} }
} }
@ -149,7 +148,7 @@ public class translator {
}catch(final IOException e){ }catch(final IOException e){
return false; return false;
} finally { } finally {
if(bw != null) { if (bw != null) {
try { try {
bw.close(); bw.close();
} catch (final Exception e) {} } catch (final Exception e) {}
@ -166,13 +165,13 @@ public class translator {
public static boolean translateFiles(final File sourceDir, final File destDir, final File baseDir, final Map<String, Map<String, String>> translationLists, final String extensions){ public static boolean translateFiles(final File sourceDir, final File destDir, final File baseDir, final Map<String, Map<String, String>> translationLists, final String extensions){
destDir.mkdirs(); destDir.mkdirs();
final File[] sourceFiles = sourceDir.listFiles(); final File[] sourceFiles = sourceDir.listFiles();
final List<String> exts = listManager.string2vector(extensions); final List<String> exts = ListManager.string2vector(extensions);
boolean rightExtension; boolean rightExtension;
String relativePath; String relativePath;
for(final File sourceFile : sourceFiles){ for (final File sourceFile : sourceFiles) {
rightExtension=false; rightExtension=false;
for(final String ext : exts){ for (final String ext : exts) {
if(sourceFile.getName().endsWith(ext)){ if (sourceFile.getName().endsWith(ext)) {
rightExtension=true; rightExtension=true;
break; break;
} }
@ -181,7 +180,7 @@ public class translator {
try { try {
relativePath=sourceFile.getAbsolutePath().substring(baseDir.getAbsolutePath().length()+1); //+1 to get the "/" relativePath=sourceFile.getAbsolutePath().substring(baseDir.getAbsolutePath().length()+1); //+1 to get the "/"
relativePath = relativePath.replace(File.separatorChar, '/'); relativePath = relativePath.replace(File.separatorChar, '/');
} catch (final IndexOutOfBoundsException e){ } catch (final IndexOutOfBoundsException e) {
Log.logSevere("TRANSLATOR", "Error creating relative Path for "+sourceFile.getAbsolutePath()); Log.logSevere("TRANSLATOR", "Error creating relative Path for "+sourceFile.getAbsolutePath());
relativePath = "wrong path"; //not in translationLists relativePath = "wrong path"; //not in translationLists
} }
@ -205,8 +204,8 @@ public class translator {
public static boolean translateFilesRecursive(final File sourceDir, final File destDir, final File translationFile, final String extensions, final String notdir){ public static boolean translateFilesRecursive(final File sourceDir, final File destDir, final File translationFile, final String extensions, final String notdir){
final List<File> dirList=FileUtils.getDirsRecursive(sourceDir, notdir); final List<File> dirList=FileUtils.getDirsRecursive(sourceDir, notdir);
dirList.add(sourceDir); dirList.add(sourceDir);
for (final File file : dirList){ for (final File file : dirList) {
if(file.isDirectory() && !file.getName().equals(notdir)){ if(file.isDirectory() && !file.getName().equals(notdir)) {
//cuts the sourcePath and prepends the destPath //cuts the sourcePath and prepends the destPath
File file2 = new File(destDir, file.getPath().substring(sourceDir.getPath().length())); File file2 = new File(destDir, file.getPath().substring(sourceDir.getPath().length()));
translateFiles(file, file2, sourceDir, translationFile, extensions); translateFiles(file, file2, sourceDir, translationFile, extensions);
@ -229,7 +228,7 @@ public class translator {
public static boolean changeLang(final serverSwitch env, final String langPath, final String lang) { public static boolean changeLang(final serverSwitch env, final String langPath, final String lang) {
boolean ret = false; boolean ret = false;
if ((lang.equals("default")) || (lang.equals("default.lng"))) { if ("default".equals(lang) || "default.lng".equals(lang)) {
env.setConfig("locale.language", "default"); env.setConfig("locale.language", "default");
ret = true; ret = true;
} else { } else {
@ -242,7 +241,7 @@ public class translator {
final File translationFile = new File(langPath, lang); final File translationFile = new File(langPath, lang);
//if (translator.translateFiles(sourceDir, destDir, translationFile, "html")) { //if (translator.translateFiles(sourceDir, destDir, translationFile, "html")) {
if (translator.translateFilesRecursive(sourceDir, destDir, translationFile, "html,template,inc", "locale")) { if (Translator.translateFilesRecursive(sourceDir, destDir, translationFile, "html,template,inc", "locale")) {
env.setConfig("locale.language", lang.substring(0, lang.length() - 4)); env.setConfig("locale.language", lang.substring(0, lang.length() - 4));
Formatter.setLocale(env.getConfig("locale.language", "en")); Formatter.setLocale(env.getConfig("locale.language", "en"));
try { try {

10
source/de/anomic/data/userDB.java → source/de/anomic/data/UserDB.java
Unescape View File

@ -47,7 +47,7 @@ import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.kelondroException; import net.yacy.kelondro.util.kelondroException;
public final class userDB { public final class UserDB {
private static final int USERNAME_MIN_LENGTH = 4; private static final int USERNAME_MIN_LENGTH = 4;
@ -56,7 +56,7 @@ public final class userDB {
private final Map<String, String> ipUsers = new HashMap<String, String>(); private final Map<String, String> ipUsers = new HashMap<String, String>();
private final Map<String, Object> cookieUsers = new HashMap<String, Object>(); private final Map<String, Object> cookieUsers = new HashMap<String, Object>();
public userDB(final File userTableFile) throws IOException { public UserDB(final File userTableFile) throws IOException {
this.userTableFile = userTableFile; this.userTableFile = userTableFile;
userTableFile.getParentFile().mkdirs(); userTableFile.getParentFile().mkdirs();
//this.userTable = new MapView(BLOBTree.toHeap(userTableFile, true, true, 128, 256, '_', NaturalOrder.naturalOrder, userTableFile), 10, '_'); //this.userTable = new MapView(BLOBTree.toHeap(userTableFile, true, true, 128, 256, '_', NaturalOrder.naturalOrder, userTableFile), 10, '_');
@ -488,7 +488,7 @@ public final class userDB {
} }
try { try {
userDB.this.userTable.insert(getUserName().getBytes(), this.mem); UserDB.this.userTable.insert(getUserName().getBytes(), this.mem);
} catch(final Exception e){ } catch(final Exception e){
Log.logException(e); Log.logException(e);
} }
@ -505,7 +505,7 @@ public final class userDB {
public void setProperty(final String propName, final String newValue) throws IOException, RowSpaceExceededException { public void setProperty(final String propName, final String newValue) throws IOException, RowSpaceExceededException {
this.mem.put(propName, newValue); this.mem.put(propName, newValue);
userDB.this.userTable.insert(getUserName().getBytes(), this.mem); UserDB.this.userTable.insert(getUserName().getBytes(), this.mem);
} }
public String getProperty(final String propName, final String defaultValue) { public String getProperty(final String propName, final String defaultValue) {
@ -621,7 +621,7 @@ public final class userDB {
//userDB.Entry nextEntry; //userDB.Entry nextEntry;
public userIterator(final boolean up) throws IOException { public userIterator(final boolean up) throws IOException {
this.userIter = userDB.this.userTable.keys(up, false); this.userIter = UserDB.this.userTable.keys(up, false);
//this.nextEntry = null; //this.nextEntry = null;
} }

4
source/de/anomic/data/YMarkTables.java
Unescape View File

@ -183,7 +183,7 @@ public class YMarkTables {
} }
public static Date parseISO8601(final String s) throws ParseException { public static Date parseISO8601(final String s) throws ParseException {
if(s == null || s.isEmpty()) { if(s == null || s.length() < 1) {
throw new ParseException("parseISO8601 - empty string, nothing to parse", 0); throw new ParseException("parseISO8601 - empty string, nothing to parse", 0);
} }
SimpleDateFormat dateformat; SimpleDateFormat dateformat;
@ -205,7 +205,7 @@ public class YMarkTables {
public static String getISO8601(final byte[] date) { public static String getISO8601(final byte[] date) {
if(date != null) { if(date != null) {
final String s = new String(date); final String s = new String(date);
if(!s.isEmpty()) if(s != null && s.length() > 0)
return DateFormatter.formatISO8601(new Date(Long.parseLong(s))); return DateFormatter.formatISO8601(new Date(Long.parseLong(s)));
} }
return ""; return "";

10
source/de/anomic/http/server/HTTPDemon.java
Unescape View File

@ -72,7 +72,7 @@ import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.RequestContext; import org.apache.commons.fileupload.RequestContext;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.search.Switchboard; import de.anomic.search.Switchboard;
import de.anomic.server.serverCore; import de.anomic.server.serverCore;
import de.anomic.server.serverHandler; import de.anomic.server.serverHandler;
@ -328,21 +328,21 @@ public final class HTTPDemon implements serverHandler, Cloneable {
if (this.use_proxyAccounts) { if (this.use_proxyAccounts) {
final String auth = header.get(RequestHeader.PROXY_AUTHORIZATION,"xxxxxx"); final String auth = header.get(RequestHeader.PROXY_AUTHORIZATION,"xxxxxx");
userDB.Entry entry=switchboard.userDB.ipAuth(session.userAddress.getHostAddress()); UserDB.Entry entry=switchboard.userDB.ipAuth(session.userAddress.getHostAddress());
if(entry == null){ if(entry == null){
entry=switchboard.userDB.proxyAuth(auth, session.userAddress.getHostAddress()); entry=switchboard.userDB.proxyAuth(auth, session.userAddress.getHostAddress());
} }
if(entry != null){ if(entry != null){
final int returncode=entry.surfRight(); final int returncode=entry.surfRight();
if(returncode==userDB.Entry.PROXY_ALLOK){ if(returncode==UserDB.Entry.PROXY_ALLOK){
return true; return true;
} }
final serverObjects tp=new serverObjects(); final serverObjects tp=new serverObjects();
if(returncode==userDB.Entry.PROXY_TIMELIMIT_REACHED){ if(returncode==UserDB.Entry.PROXY_TIMELIMIT_REACHED){
tp.put("limit", "1");//time per day tp.put("limit", "1");//time per day
tp.put("limit_timelimit", entry.getTimeLimit()); tp.put("limit_timelimit", entry.getTimeLimit());
sendRespondError(prop, session.out, 403, "Internet-Timelimit reached", new File("proxymsg/proxylimits.inc"), tp, null); sendRespondError(prop, session.out, 403, "Internet-Timelimit reached", new File("proxymsg/proxylimits.inc"), tp, null);
}else if(returncode==userDB.Entry.PROXY_NORIGHT){ }else if(returncode==UserDB.Entry.PROXY_NORIGHT){
tp.put("limit", "0"); tp.put("limit", "0");
sendRespondError(prop, session.out, 403, "Proxy use forbidden", new File("proxymsg/proxylimits.inc"), tp, null); sendRespondError(prop, session.out, 403, "Proxy use forbidden", new File("proxymsg/proxylimits.inc"), tp, null);
} }

38
source/de/anomic/search/Switchboard.java
Unescape View File

@ -132,12 +132,12 @@ import de.anomic.crawler.retrieval.Response;
import de.anomic.data.LibraryProvider; import de.anomic.data.LibraryProvider;
import de.anomic.data.WorkTables; import de.anomic.data.WorkTables;
import de.anomic.data.URLLicense; import de.anomic.data.URLLicense;
import de.anomic.data.blogBoard; import de.anomic.data.BlogBoard;
import de.anomic.data.blogBoardComments; import de.anomic.data.BlogBoardComments;
import de.anomic.data.bookmarksDB; import de.anomic.data.BookmarksDB;
import de.anomic.data.listManager; import de.anomic.data.ListManager;
import de.anomic.data.messageBoard; import de.anomic.data.MessageBoard;
import de.anomic.data.userDB; import de.anomic.data.UserDB;
import de.anomic.data.wiki.WikiBoard; import de.anomic.data.wiki.WikiBoard;
import de.anomic.data.wiki.WikiCode; import de.anomic.data.wiki.WikiCode;
import de.anomic.data.wiki.WikiParser; import de.anomic.data.wiki.WikiParser;
@ -202,10 +202,10 @@ public final class Switchboard extends serverSwitch {
public CrawlQueues crawlQueues; public CrawlQueues crawlQueues;
public ResultURLs crawlResults; public ResultURLs crawlResults;
public CrawlStacker crawlStacker; public CrawlStacker crawlStacker;
public messageBoard messageDB; public MessageBoard messageDB;
public WikiBoard wikiDB; public WikiBoard wikiDB;
public blogBoard blogDB; public BlogBoard blogDB;
public blogBoardComments blogCommentDB; public BlogBoardComments blogCommentDB;
public RobotsTxt robots; public RobotsTxt robots;
public boolean rankingOn; public boolean rankingOn;
public CRDistribution rankingOwnDistribution; public CRDistribution rankingOwnDistribution;
@ -214,8 +214,8 @@ public final class Switchboard extends serverSwitch {
public volatile long proxyLastAccess, localSearchLastAccess, remoteSearchLastAccess; public volatile long proxyLastAccess, localSearchLastAccess, remoteSearchLastAccess;
public yacyCore yc; public yacyCore yc;
public ResourceObserver observer; public ResourceObserver observer;
public userDB userDB; public UserDB userDB;
public bookmarksDB bookmarksDB; public BookmarksDB bookmarksDB;
public WebStructureGraph webStructure; public WebStructureGraph webStructure;
public ArrayList<QueryParams> localSearches; // array of search result properties as HashMaps public ArrayList<QueryParams> localSearches; // array of search result properties as HashMaps
public ArrayList<QueryParams> remoteSearches; // array of search result properties as HashMaps public ArrayList<QueryParams> remoteSearches; // array of search result properties as HashMaps
@ -410,9 +410,9 @@ public final class Switchboard extends serverSwitch {
this.log.logConfig("Loading blacklist ..."); this.log.logConfig("Loading blacklist ...");
final File blacklistsPath = getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT); final File blacklistsPath = getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT);
urlBlacklist = new Blacklist(blacklistsPath); urlBlacklist = new Blacklist(blacklistsPath);
listManager.switchboard = this; ListManager.switchboard = this;
listManager.listsPath = blacklistsPath; ListManager.listsPath = blacklistsPath;
listManager.reloadBlacklists(); ListManager.reloadBlacklists();
// load badwords (to filter the topwords) // load badwords (to filter the topwords)
if (badwords == null || badwords.isEmpty()) { if (badwords == null || badwords.isEmpty()) {
@ -479,7 +479,7 @@ public final class Switchboard extends serverSwitch {
// Init User DB // Init User DB
this.log.logConfig("Loading User DB"); this.log.logConfig("Loading User DB");
final File userDbFile = new File(getDataPath(), "DATA/SETTINGS/user.heap"); final File userDbFile = new File(getDataPath(), "DATA/SETTINGS/user.heap");
this.userDB = new userDB(userDbFile); this.userDB = new UserDB(userDbFile);
this.log.logConfig("Loaded User DB from file " + userDbFile.getName() + this.log.logConfig("Loaded User DB from file " + userDbFile.getName() +
", " + this.userDB.size() + " entries" + ", " + this.userDB.size() + " entries" +
", " + ppRamString(userDbFile.length()/1024)); ", " + ppRamString(userDbFile.length()/1024));
@ -995,7 +995,7 @@ public final class Switchboard extends serverSwitch {
public void initMessages() throws IOException { public void initMessages() throws IOException {
this.log.logConfig("Starting Message Board"); this.log.logConfig("Starting Message Board");
final File messageDbFile = new File(workPath, "message.heap"); final File messageDbFile = new File(workPath, "message.heap");
this.messageDB = new messageBoard(messageDbFile); this.messageDB = new MessageBoard(messageDbFile);
this.log.logConfig("Loaded Message Board DB from file " + messageDbFile.getName() + this.log.logConfig("Loaded Message Board DB from file " + messageDbFile.getName() +
", " + this.messageDB.size() + " entries" + ", " + this.messageDB.size() + " entries" +
", " + ppRamString(messageDbFile.length()/1024)); ", " + ppRamString(messageDbFile.length()/1024));
@ -1013,13 +1013,13 @@ public final class Switchboard extends serverSwitch {
public void initBlog() throws IOException { public void initBlog() throws IOException {
this.log.logConfig("Starting Blog"); this.log.logConfig("Starting Blog");
final File blogDbFile = new File(workPath, "blog.heap"); final File blogDbFile = new File(workPath, "blog.heap");
this.blogDB = new blogBoard(blogDbFile); this.blogDB = new BlogBoard(blogDbFile);
this.log.logConfig("Loaded Blog DB from file " + blogDbFile.getName() + this.log.logConfig("Loaded Blog DB from file " + blogDbFile.getName() +
", " + this.blogDB.size() + " entries" + ", " + this.blogDB.size() + " entries" +
", " + ppRamString(blogDbFile.length()/1024)); ", " + ppRamString(blogDbFile.length()/1024));
final File blogCommentDbFile = new File(workPath, "blogComment.heap"); final File blogCommentDbFile = new File(workPath, "blogComment.heap");
this.blogCommentDB = new blogBoardComments(blogCommentDbFile); this.blogCommentDB = new BlogBoardComments(blogCommentDbFile);
this.log.logConfig("Loaded Blog-Comment DB from file " + blogCommentDbFile.getName() + this.log.logConfig("Loaded Blog-Comment DB from file " + blogCommentDbFile.getName() +
", " + this.blogCommentDB.size() + " entries" + ", " + this.blogCommentDB.size() + " entries" +
", " + ppRamString(blogCommentDbFile.length()/1024)); ", " + ppRamString(blogCommentDbFile.length()/1024));
@ -1031,7 +1031,7 @@ public final class Switchboard extends serverSwitch {
final File tagsFile = new File(workPath, "bookmarkTags.heap"); final File tagsFile = new File(workPath, "bookmarkTags.heap");
final File datesFile = new File(workPath, "bookmarkDates.heap"); final File datesFile = new File(workPath, "bookmarkDates.heap");
tagsFile.delete(); tagsFile.delete();
this.bookmarksDB = new bookmarksDB(bookmarksFile, datesFile); this.bookmarksDB = new BookmarksDB(bookmarksFile, datesFile);
this.log.logConfig("Loaded Bookmarks DB from files "+ bookmarksFile.getName()+ ", "+tagsFile.getName()); this.log.logConfig("Loaded Bookmarks DB from files "+ bookmarksFile.getName()+ ", "+tagsFile.getName());
this.log.logConfig(this.bookmarksDB.tagsSize()+" Tag, "+this.bookmarksDB.bookmarksSize()+" Bookmarks"); this.log.logConfig(this.bookmarksDB.tagsSize()+" Tag, "+this.bookmarksDB.bookmarksSize()+" Bookmarks");
} }

4
source/net/yacy/yacy.java
Unescape View File

@ -71,7 +71,7 @@ import net.yacy.kelondro.util.OS;
//import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; //import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import de.anomic.data.translator; import de.anomic.data.Translator;
//import de.anomic.http.client.Client; //import de.anomic.http.client.Client;
import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.HTTPDemon;
//import de.anomic.http.server.ResponseContainer; //import de.anomic.http.server.ResponseContainer;
@ -359,7 +359,7 @@ public final class yacy {
if (!currentRev.equals(sb.getConfig("svnRevision", ""))) try { //is this another version?! if (!currentRev.equals(sb.getConfig("svnRevision", ""))) try { //is this another version?!
final File sourceDir = new File(sb.getConfig("htRootPath", "htroot")); final File sourceDir = new File(sb.getConfig("htRootPath", "htroot"));
final File destDir = new File(sb.getDataPath("locale.translated_html", "DATA/LOCALE/htroot"), lang); final File destDir = new File(sb.getDataPath("locale.translated_html", "DATA/LOCALE/htroot"), lang);
if (translator.translateFilesRecursive(sourceDir, destDir, new File(locale_work, lang + ".lng"), "html,template,inc", "locale")){ //translate it if (Translator.translateFilesRecursive(sourceDir, destDir, new File(locale_work, lang + ".lng"), "html,template,inc", "locale")){ //translate it
//write the new Versionnumber //write the new Versionnumber
final BufferedWriter bw = new BufferedWriter(new PrintWriter(new FileWriter(new File(destDir, "version")))); final BufferedWriter bw = new BufferedWriter(new PrintWriter(new FileWriter(new File(destDir, "version"))));
bw.write(sb.getConfig("svnRevision", "Error getting Version")); bw.write(sb.getConfig("svnRevision", "Error getting Version"));

Write Preview
Loading…
Cancel
Save