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

htroot/Bookmarks.java

@@ -47,10 +47,13 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.ListIterator;
 import java.util.Set;
+import java.util.TreeSet;
 
 import java.lang.Math;
 
@@ -58,6 +61,7 @@ import de.anomic.data.bookmarksDB;
 import de.anomic.data.listManager;
 import de.anomic.data.userDB;
 import de.anomic.data.bookmarksDB.Tag;
+import de.anomic.data.bookmarksDB.tagComparator;
 import de.anomic.http.httpHeader;
 import de.anomic.http.httpc;
 import de.anomic.index.indexURLEntry;
@@ -67,38 +71,56 @@ import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.server.serverDate;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
+import de.anomic.server.logging.serverLog;
 import de.anomic.yacy.yacyCore;
 import de.anomic.yacy.yacyNewsPool;
 import de.anomic.yacy.yacyNewsRecord;
 import de.anomic.yacy.yacyURL;
 
+
 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) {
-    serverObjects prop = new serverObjects();
+
-    plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
+    	int max_count = 10;
-    int max_count=10;
-    String tagName="";
     	int start=0;
-    userDB.Entry user=switchboard.userDB.getUser(header);
+    	String tagName = "";
-    boolean isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT));
     	String username="";
+    	
+    	prop = new serverObjects();
+    	switchboard = (plasmaSwitchboard) env;
+    	user = switchboard.userDB.getUser(header);   
+    	isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT));
+    
+    	// set user name
     	if(user != null) username=user.getUserName();
     	else if(isAdmin) username="admin";
+    	prop.put("user", username);
     	
     	//redirect to userpage
-    /*if(username!="" &&(post == null || !post.containsKey("user") && !post.containsKey("mode")))
+    	/*
-        prop.put("LOCATION", "/Bookmarks.html?user="+username);*/
+    	if(username!="" &&(post == null || !post.containsKey("user") && !post.containsKey("mode")))
-    prop.put("user", username);
+        prop.put("LOCATION", "/Bookmarks.html?user="+username);
+    	*/
     
     	// set peer address
     	final String address = yacyCore.seedDB.mySeed().getPublicAddress();
     	prop.put("address", address);
     
     	//defaultvalues
-    prop.put("mode", "0");
+    	if(isAdmin)
-    if(isAdmin){
     		prop.put("mode", "1");
-    }
+    	else
+    		prop.put("mode", "0");   
     	prop.put("mode_edit", "0");
     	prop.put("mode_title", "");
     	prop.put("mode_description", "");
@@ -106,8 +128,8 @@ public class Bookmarks {
     	prop.put("mode_tags", "");
     	prop.put("mode_public", "1"); //1=is public
     	prop.put("mode_feed", "0"); //no newsfeed
-    if(post != null){
     	
+    	if(post != null){        
     		if(!isAdmin){
     			if(post.containsKey("login")){
     				prop.put("AUTHENTICATE","admin log-in");
@@ -135,11 +157,11 @@ public class Bookmarks {
     			if(bookmark != null){
     				bookmark.setProperty(bookmarksDB.Bookmark.BOOKMARK_TITLE, title);
     				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);
-                    
     					publishNews(url, title, description, tagsString);
     				}else{
     					bookmark.setPublic(false);
@@ -151,8 +173,6 @@ public class Bookmarks {
     				}
     				bookmark.setTags(tags, true);
     				switchboard.bookmarksDB.saveBookmark(bookmark);
-                
-                
     			}else{
     				//ERROR
     			}
@@ -218,7 +238,6 @@ public class Bookmarks {
     				File file=new File((String)post.get("bookmarksfile"));
     				switchboard.bookmarksDB.importFromBookmarks(new yacyURL(file) , post.get("bookmarksfile$file"), tags, isPublic);
     			} catch (MalformedURLException e) {}
-            
     		}else if(post.containsKey("xmlfile")){
     			boolean isPublic=false;
     			if(((String) post.get("public")).equals("public")){
@@ -229,7 +248,6 @@ public class Bookmarks {
     			String urlHash=(String) post.get("delete");
     			switchboard.bookmarksDB.removeBookmark(urlHash);
     		}
-        
     		if(post.containsKey("tag")){
     			tagName=(String) post.get("tag");
     		}
@@ -239,34 +257,28 @@ public class Bookmarks {
     		if(post.containsKey("num")){
     			max_count=Integer.parseInt((String) post.get("num"));
     		}
-    }
+    	} // END if(post != null)
-    // only list tags according to current tag-selection
+    	
-    Iterator it = null;
-        if (tagName.equals("")) {
-        	it = switchboard.bookmarksDB.getTagIterator(isAdmin);
-        } else {
-        	it = switchboard.bookmarksDB.getTagIterator(tagName, isAdmin);
-        }
     	
-    // Iterator it=switchboard.bookmarksDB.getTagIterator(isAdmin);
+    	//-----------------------
+    	// 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());
-    while(it.hasNext()){
-        tag=(Tag) it.next();
-        prop.putHTML("taglist_"+count+"_name", tag.getFriendlyName());
-        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 {
-        	prop.put("taglist_"+count+"_selected", "");
-        };
        	
-        count++;
-    }
-    prop.put("taglist", count);
        	count=0;
        	if(!tagName.equals("")){
        		prop.put("selected", "");
@@ -275,17 +287,15 @@ public class Bookmarks {
        		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){
@@ -304,11 +314,13 @@ public class Bookmarks {
        			tagsIt=tags.iterator();
        			tagCount=0;
        			while (tagsIt.hasNext()) {            	
-            	prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tagsIt.next());
+       				String tname = tagsIt.next();
+       				if (!tname.startsWith("/")) {
+       					prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tname);
        					tagCount++;
        				}
+       			}
        			prop.put("bookmarks_"+count+"_tags", tagCount);
-            
        			prop.put("bookmarks_"+count+"_hash", bookmark.getUrlHash());
        			count++;
        		}
@@ -332,7 +344,108 @@ public class Bookmarks {
        		prop.put("prev-page_num", max_count);
        	}
        	prop.put("bookmarks", count);
-    return prop;
+    
+    
+    	//-----------------------
+    	// 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()
+    }    
+    
+    private static void printTagList(String id, String tagName, int comp, int max, boolean opt){    	
+    	int count=0;
+        bookmarksDB.Tag tag;
+    	Iterator it = null;
+    	
+        if (tagName.equals("")) {
+        	it = switchboard.bookmarksDB.getTagIterator(isAdmin, comp, max);
+        } else {
+        	it = switchboard.bookmarksDB.getTagIterator(tagName, isAdmin, comp, max);
+        }
+       	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);    	
+    }
+    
+    private static int recurseFolders(Iterator it, String root, int count, boolean next, String prev){
+    	String fn="";    	
+    	bookmarksDB.Bookmark bookmark;
+   	
+    	if(next) fn = it.next().toString();    		
+    	else fn = prev;
+
+    	if(fn.equals("\uffff")) {    		
+    		int i = prev.replaceAll("[^/]","").length();
+    		while(i>0){
+    			prop.put("folderlist_"+count+"_folder", "</ul></li>");
+    			count++;
+    			i--;
+    		}    		
+    		return count;
+    	}
+   
+    	if(fn.startsWith(root)){
+    		prop.put("folderlist_"+count+"_folder", "<li>"+fn.replaceFirst(root+"/*","")+"<ul class=\"folder\">");
+    		count++;    
+    		Iterator bit=switchboard.bookmarksDB.getBookmarksIterator(fn, isAdmin);
+    		while(bit.hasNext()){
+    			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) {