reorganized code and added folders; this update might have overwritten latest changes by orbiter - sorry!

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4364 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
apfelmaennchen 17 years ago
parent 62a5df5bfc
commit a870ac32b8

@ -47,10 +47,13 @@
import java.io.File; import java.io.File;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.ListIterator;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import java.lang.Math; import java.lang.Math;
@ -58,6 +61,7 @@ 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.data.bookmarksDB.Tag; import de.anomic.data.bookmarksDB.Tag;
import de.anomic.data.bookmarksDB.tagComparator;
import de.anomic.http.httpHeader; import de.anomic.http.httpHeader;
import de.anomic.http.httpc; import de.anomic.http.httpc;
import de.anomic.index.indexURLEntry; import de.anomic.index.indexURLEntry;
@ -67,107 +71,123 @@ import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverDate; import de.anomic.server.serverDate;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
import de.anomic.server.logging.serverLog;
import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacyCore;
import de.anomic.yacy.yacyNewsPool; import de.anomic.yacy.yacyNewsPool;
import de.anomic.yacy.yacyNewsRecord; import de.anomic.yacy.yacyNewsRecord;
import de.anomic.yacy.yacyURL; import de.anomic.yacy.yacyURL;
public class Bookmarks { public class Bookmarks {
private static serverObjects prop;
private static plasmaSwitchboard switchboard;
private static userDB.Entry user;
private static boolean isAdmin;
final static int SORT_ALPHA = 1;
final static int SORT_SIZE = 2;
final static int SHOW_ALL = -1;
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
serverObjects prop = new serverObjects();
plasmaSwitchboard switchboard = (plasmaSwitchboard) env; int max_count = 10;
int max_count=10; int start=0;
String tagName=""; String tagName = "";
int start=0; String username="";
userDB.Entry user=switchboard.userDB.getUser(header);
boolean isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); prop = new serverObjects();
String username=""; switchboard = (plasmaSwitchboard) env;
if(user != null) username=user.getUserName(); user = switchboard.userDB.getUser(header);
else if(isAdmin) username="admin"; isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT));
//redirect to userpage // set user name
/*if(username!="" &&(post == null || !post.containsKey("user") && !post.containsKey("mode"))) if(user != null) username=user.getUserName();
prop.put("LOCATION", "/Bookmarks.html?user="+username);*/ else if(isAdmin) username="admin";
prop.put("user", username); prop.put("user", username);
//redirect to userpage
/*
if(username!="" &&(post == null || !post.containsKey("user") && !post.containsKey("mode")))
prop.put("LOCATION", "/Bookmarks.html?user="+username);
*/
// set peer address // set peer address
final String address = yacyCore.seedDB.mySeed().getPublicAddress(); final String address = yacyCore.seedDB.mySeed().getPublicAddress();
prop.put("address", address); prop.put("address", address);
//defaultvalues //defaultvalues
prop.put("mode", "0"); if(isAdmin)
if(isAdmin){ prop.put("mode", "1");
prop.put("mode", "1"); else
} prop.put("mode", "0");
prop.put("mode_edit", "0"); prop.put("mode_edit", "0");
prop.put("mode_title", ""); prop.put("mode_title", "");
prop.put("mode_description", ""); prop.put("mode_description", "");
prop.put("mode_url", ""); prop.put("mode_url", "");
prop.put("mode_tags", ""); prop.put("mode_tags", "");
prop.put("mode_public", "1"); //1=is public prop.put("mode_public", "1"); //1=is public
prop.put("mode_feed", "0"); //no newsfeed prop.put("mode_feed", "0"); //no newsfeed
if(post != null){
if(post != null){
if(!isAdmin){ if(!isAdmin){
if(post.containsKey("login")){ if(post.containsKey("login")){
prop.put("AUTHENTICATE","admin log-in"); prop.put("AUTHENTICATE","admin log-in");
} }
}else if(post.containsKey("mode")){ }else if(post.containsKey("mode")){
String mode=(String) post.get("mode"); String mode=(String) post.get("mode");
if(mode.equals("add")){ if(mode.equals("add")){
prop.put("mode", "2"); prop.put("mode", "2");
}else if(mode.equals("importxml")){ }else if(mode.equals("importxml")){
prop.put("mode", "3"); prop.put("mode", "3");
}else if(mode.equals("importbookmarks")){ }else if(mode.equals("importbookmarks")){
prop.put("mode", "4"); prop.put("mode", "4");
} }
}else if(post.containsKey("add")){ //add an Entry }else if(post.containsKey("add")){ //add an Entry
String url=(String) post.get("url"); String url=(String) post.get("url");
String title=(String) post.get("title"); String title=(String) post.get("title");
String description=(String) post.get("description"); String description=(String) post.get("description");
String tagsString = (String)post.get("tags"); String tagsString = (String)post.get("tags");
if(tagsString.equals("")){ if(tagsString.equals("")){
tagsString="unsorted"; //default tag tagsString="unsorted"; //default tag
} }
Set tags=listManager.string2set(tagsString.replaceAll(",\\s+", ",")); // space characters following a comma are removed Set tags=listManager.string2set(tagsString.replaceAll(",\\s+", ",")); // space characters following a comma are removed
bookmarksDB.Bookmark bookmark = switchboard.bookmarksDB.createBookmark(url, username); bookmarksDB.Bookmark bookmark = switchboard.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) bookmark.setOwner(user.getUserName()); if(user!=null){
bookmark.setOwner(user.getUserName());
if(((String) post.get("public")).equals("public")){ }
bookmark.setPublic(true); if(((String) post.get("public")).equals("public")){
bookmark.setPublic(true);
publishNews(url, title, description, tagsString); publishNews(url, title, description, tagsString);
}else{ }else{
bookmark.setPublic(false); bookmark.setPublic(false);
} }
if(post.containsKey("feed") && ((String) post.get("feed")).equals("feed")){ if(post.containsKey("feed") && ((String) post.get("feed")).equals("feed")){
bookmark.setFeed(true); bookmark.setFeed(true);
}else{ }else{
bookmark.setFeed(false); bookmark.setFeed(false);
} }
bookmark.setTags(tags, true); bookmark.setTags(tags, true);
switchboard.bookmarksDB.saveBookmark(bookmark); switchboard.bookmarksDB.saveBookmark(bookmark);
}else{
//ERROR
}else{ }
//ERROR }else if(post.containsKey("edit")){
} String urlHash=(String) post.get("edit");
}else if(post.containsKey("edit")){ prop.put("mode", "2");
String urlHash=(String) post.get("edit"); if (urlHash.length() == 0) {
prop.put("mode", "2"); prop.put("mode_edit", "0"); // create mode
if (urlHash.length() == 0) { prop.putHTML("mode_title", (String) post.get("title"));
prop.put("mode_edit", "0"); // create mode prop.putHTML("mode_description", (String) post.get("description"));
prop.putHTML("mode_title", (String) post.get("title")); prop.put("mode_url", (String) post.get("url"));
prop.putHTML("mode_description", (String) post.get("description")); prop.putHTML("mode_tags", (String) post.get("tags"));
prop.put("mode_url", (String) post.get("url")); prop.put("mode_public", "0");
prop.putHTML("mode_tags", (String) post.get("tags")); prop.put("mode_feed", "0");
prop.put("mode_public", "0"); } else {
prop.put("mode_feed", "0");
} else {
bookmarksDB.Bookmark bookmark = switchboard.bookmarksDB.getBookmark(urlHash); bookmarksDB.Bookmark bookmark = switchboard.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
@ -205,144 +225,237 @@ public class Bookmarks {
} }
} }
} }
}else if(post.containsKey("bookmarksfile")){ }else if(post.containsKey("bookmarksfile")){
boolean isPublic=false; boolean isPublic=false;
if(((String) post.get("public")).equals("public")){ if(((String) post.get("public")).equals("public")){
isPublic=true; isPublic=true;
} }
String tags=(String) post.get("tags"); String tags=(String) post.get("tags");
if(tags.equals("")){ if(tags.equals("")){
tags="unsorted"; tags="unsorted";
} }
try { try {
File file=new File((String)post.get("bookmarksfile")); File file=new File((String)post.get("bookmarksfile"));
switchboard.bookmarksDB.importFromBookmarks(new yacyURL(file) , post.get("bookmarksfile$file"), tags, isPublic); switchboard.bookmarksDB.importFromBookmarks(new yacyURL(file) , post.get("bookmarksfile$file"), tags, isPublic);
} catch (MalformedURLException e) {} } catch (MalformedURLException e) {}
}else if(post.containsKey("xmlfile")){
boolean isPublic=false;
if(((String) post.get("public")).equals("public")){
isPublic=true;
}
switchboard.bookmarksDB.importFromXML(post.get("xmlfile$file"), isPublic);
}else if(post.containsKey("delete")){
String urlHash=(String) post.get("delete");
switchboard.bookmarksDB.removeBookmark(urlHash);
}
if(post.containsKey("tag")){
tagName=(String) post.get("tag");
}
if(post.containsKey("start")){
start=Integer.parseInt((String) post.get("start"));
}
if(post.containsKey("num")){
max_count=Integer.parseInt((String) post.get("num"));
}
} // END if(post != null)
//-----------------------
// create tag list
//-----------------------
printTagList("taglist", tagName, SORT_SIZE, 25, false);
printTagList("optlist", tagName, SORT_ALPHA, SHOW_ALL, true);
//-----------------------
// create bookmark list
//-----------------------
int count=0;
bookmarksDB.Tag tag;
Iterator it = null;
bookmarksDB.Bookmark bookmark;
Set<String> tags;
Iterator<String> tagsIt;
int tagCount;
prop.put("num-bookmarks", switchboard.bookmarksDB.bookmarksSize());
count=0;
if(!tagName.equals("")){
prop.put("selected", "");
it=switchboard.bookmarksDB.getBookmarksIterator(tagName, isAdmin);
}else{
prop.put("selected", " selected=\"selected\"");
it=switchboard.bookmarksDB.getBookmarksIterator(isAdmin);
}
//skip the first entries (display next page)
count=0;
while(count < start && it.hasNext()){
it.next();
count++;
}
count=0;
while(count<max_count && it.hasNext()){
bookmark=switchboard.bookmarksDB.getBookmark((String)it.next());
if(bookmark!=null){
if(bookmark.getFeed() && isAdmin)
prop.put("bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl());
else
prop.put("bookmarks_"+count+"_link",bookmark.getUrl());
prop.putHTML("bookmarks_"+count+"_title", bookmark.getTitle());
prop.putHTML("bookmarks_"+count+"_description", bookmark.getDescription());
prop.put("bookmarks_"+count+"_date", serverDate.formatISO8601(new Date(bookmark.getTimeStamp())));
prop.put("bookmarks_"+count+"_rfc822date", httpc.dateString(new Date(bookmark.getTimeStamp())));
prop.put("bookmarks_"+count+"_public", (bookmark.getPublic() ? "1" : "0"));
}else if(post.containsKey("xmlfile")){ //List Tags.
boolean isPublic=false; tags=bookmark.getTags();
if(((String) post.get("public")).equals("public")){ tagsIt=tags.iterator();
isPublic=true; tagCount=0;
} while (tagsIt.hasNext()) {
switchboard.bookmarksDB.importFromXML(post.get("xmlfile$file"), isPublic); String tname = tagsIt.next();
}else if(post.containsKey("delete")){ if (!tname.startsWith("/")) {
String urlHash=(String) post.get("delete"); prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tname);
switchboard.bookmarksDB.removeBookmark(urlHash); tagCount++;
} }
}
if(post.containsKey("tag")){ prop.put("bookmarks_"+count+"_tags", tagCount);
tagName=(String) post.get("tag"); prop.put("bookmarks_"+count+"_hash", bookmark.getUrlHash());
} count++;
if(post.containsKey("start")){ }
start=Integer.parseInt((String) post.get("start")); }
} prop.putHTML("tag", tagName);
if(post.containsKey("num")){ prop.put("start", start);
max_count=Integer.parseInt((String) post.get("num")); if(it.hasNext()){
} prop.put("next-page", "1");
} prop.put("next-page_start", start+max_count);
// only list tags according to current tag-selection prop.putHTML("next-page_tag", tagName);
Iterator it = null; prop.put("next-page_num", max_count);
if (tagName.equals("")) { }
it = switchboard.bookmarksDB.getTagIterator(isAdmin); if(start >= max_count){
} else { start=start-max_count;
it = switchboard.bookmarksDB.getTagIterator(tagName, isAdmin); if(start <0){
} start=0;
}
prop.put("prev-page", "1");
prop.put("prev-page_start", start);
prop.putHTML("prev-page_tag", tagName);
prop.put("prev-page_num", max_count);
}
prop.put("bookmarks", count);
//-----------------------
// create folder list
//-----------------------
Set<String> folders = new TreeSet<String>();
String path = "";
it=switchboard.bookmarksDB.getTagIterator(isAdmin);
while(it.hasNext()){
tag=(Tag) it.next();
if (tag.getFriendlyName().startsWith("/")) {
path = tag.getFriendlyName();
while(!path.isEmpty()){
folders.add(path);
path = path.replaceAll("(/.[^/]*$)", "");
serverLog.logInfo("BOOKMARKS", "Path: "+path+" added to folder list.\n");
}
}
}
folders.add("\uffff");
it = folders.iterator();
count = 0;
count = recurseFolders(it,"/",0,true,"");
prop.put("folderlist", count);
return prop; // return from serverObjects respond()
}
// Iterator it=switchboard.bookmarksDB.getTagIterator(isAdmin); private static void printTagList(String id, String tagName, int comp, int max, boolean opt){
int count=0; int count=0;
bookmarksDB.Tag tag; bookmarksDB.Tag tag;
prop.put("num-bookmarks", switchboard.bookmarksDB.bookmarksSize()); Iterator it = null;
while(it.hasNext()){
tag=(Tag) it.next(); if (tagName.equals("")) {
prop.putHTML("taglist_"+count+"_name", tag.getFriendlyName()); it = switchboard.bookmarksDB.getTagIterator(isAdmin, comp, max);
prop.putHTML("taglist_"+count+"_tag", tag.getTagName());
prop.put("taglist_"+count+"_num", tag.size());
prop.put("taglist_"+count+"_size", Math.round((1.1+Math.log(tag.size())/4)*100)/100.); // font-size is pseudo-rounded to 2 decimals
if(tagName.equals(tag.getFriendlyName())){
prop.put("taglist_"+count+"_selected", " selected=\"selected\"");
} else { } else {
prop.put("taglist_"+count+"_selected", ""); it = switchboard.bookmarksDB.getTagIterator(tagName, isAdmin, comp, max);
};
count++;
}
prop.put("taglist", count);
count=0;
if(!tagName.equals("")){
prop.put("selected", "");
it=switchboard.bookmarksDB.getBookmarksIterator(tagName, isAdmin);
}else{
prop.put("selected", " selected=\"selected\"");
it=switchboard.bookmarksDB.getBookmarksIterator(isAdmin);
}
bookmarksDB.Bookmark bookmark;
//skip the first entries (display next page)
count=0;
while(count < start && it.hasNext()){
it.next();
count++;
}
count=0;
Set<String> tags;
Iterator<String> tagsIt;
int tagCount;
while(count<max_count && it.hasNext()){
bookmark=switchboard.bookmarksDB.getBookmark((String)it.next());
if(bookmark!=null){
if(bookmark.getFeed() && isAdmin)
prop.put("bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl());
else
prop.put("bookmarks_"+count+"_link",bookmark.getUrl());
prop.putHTML("bookmarks_"+count+"_title", bookmark.getTitle());
prop.putHTML("bookmarks_"+count+"_description", bookmark.getDescription());
prop.put("bookmarks_"+count+"_date", serverDate.formatISO8601(new Date(bookmark.getTimeStamp())));
prop.put("bookmarks_"+count+"_rfc822date", httpc.dateString(new Date(bookmark.getTimeStamp())));
prop.put("bookmarks_"+count+"_public", (bookmark.getPublic() ? "1" : "0"));
//List Tags.
tags=bookmark.getTags();
tagsIt=tags.iterator();
tagCount=0;
while (tagsIt.hasNext()) {
prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tagsIt.next());
tagCount++;
}
prop.put("bookmarks_"+count+"_tags", tagCount);
prop.put("bookmarks_"+count+"_hash", bookmark.getUrlHash());
count++;
} }
while(it.hasNext()){
tag=(Tag) it.next();
if (!tag.getTagName().startsWith("/")) {
prop.putHTML(id+"_"+count+"_name", tag.getFriendlyName());
prop.putHTML(id+"_"+count+"_tag", tag.getTagName());
prop.put(id+"_"+count+"_num", tag.size());
if (opt){
if(tagName.equals(tag.getFriendlyName())){
prop.put(id+"_"+count+"_selected", " selected=\"selected\"");
} else {
prop.put(id+"_"+count+"_selected", "");
}
} else {
// font-size is pseudo-rounded to 2 decimals
prop.put(id+"_"+count+"_size", Math.round((1.1+Math.log(tag.size())/4)*100)/100.);
}
count++;
}
}
prop.put(id, count);
} }
prop.putHTML("tag", tagName);
prop.put("start", start); private static int recurseFolders(Iterator it, String root, int count, boolean next, String prev){
if(it.hasNext()){ String fn="";
prop.put("next-page", "1"); bookmarksDB.Bookmark bookmark;
prop.put("next-page_start", start+max_count);
prop.putHTML("next-page_tag", tagName); if(next) fn = it.next().toString();
prop.put("next-page_num", max_count); else fn = prev;
}
if(start >= max_count){ if(fn.equals("\uffff")) {
start=start-max_count; int i = prev.replaceAll("[^/]","").length();
if(start <0){ while(i>0){
start=0; prop.put("folderlist_"+count+"_folder", "</ul></li>");
count++;
i--;
}
return count;
} }
prop.put("prev-page", "1");
prop.put("prev-page_start", start); if(fn.startsWith(root)){
prop.putHTML("prev-page_tag", tagName); prop.put("folderlist_"+count+"_folder", "<li>"+fn.replaceFirst(root+"/*","")+"<ul class=\"folder\">");
prop.put("prev-page_num", max_count); count++;
} Iterator bit=switchboard.bookmarksDB.getBookmarksIterator(fn, isAdmin);
prop.put("bookmarks", count); while(bit.hasNext()){
return prop; bookmark=switchboard.bookmarksDB.getBookmark((String)bit.next());
} prop.put("folderlist_"+count+"_folder", "<li><a href=\""+bookmark.getUrl()+"\">"+ bookmark.getTitle()+"</a></li>");
count++;
}
if(it.hasNext()){
count = recurseFolders(it, fn, count, true, fn);
}
} else {
prop.put("folderlist_"+count+"_folder", "</ul></li>");
count++;
root = root.replaceAll("(/.[^/]*$)", "");
if(root.equals("")) root = "/";
count = recurseFolders(it, root, count, false, fn);
}
return count;
}
private static void publishNews(String url, String title, String description, String tagsString) { private static void publishNews(String url, String title, String description, String tagsString) {
// create a news message // create a news message
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("url", url.replace(',', '|')); map.put("url", url.replace(',', '|'));
map.put("title", title.replace(',', ' ')); map.put("title", title.replace(',', ' '));
map.put("description", description.replace(',', ' ')); map.put("description", description.replace(',', ' '));
map.put("tags", tagsString.replace(',', ' ')); map.put("tags", tagsString.replace(',', ' '));
yacyCore.newsPool.publishMyNews(yacyNewsRecord.newRecord(yacyNewsPool.CATEGORY_BOOKMARK_ADD, map)); yacyCore.newsPool.publishMyNews(yacyNewsRecord.newRecord(yacyNewsPool.CATEGORY_BOOKMARK_ADD, map));
} }
} }

Loading…
Cancel
Save