From e6c2f700b1385f6c74b9493c7e7cb33c6bcef65e Mon Sep 17 00:00:00 2001 From: allo Date: Wed, 15 Feb 2006 14:35:30 +0000 Subject: [PATCH] public Tagview IMPORTANT: Fix for new(empty) Tags when adding/editing bookmarks. git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1651 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/{Bookmarks_p.html => Bookmarks.html} | 30 ++++++++-------- htroot/{Bookmarks_p.java => Bookmarks.java} | 40 +++++++++++---------- htroot/env/templates/header.template | 2 +- source/de/anomic/data/bookmarksDB.java | 2 +- 4 files changed, 40 insertions(+), 34 deletions(-) rename htroot/{Bookmarks_p.html => Bookmarks.html} (75%) rename htroot/{Bookmarks_p.java => Bookmarks.java} (92%) diff --git a/htroot/Bookmarks_p.html b/htroot/Bookmarks.html similarity index 75% rename from htroot/Bookmarks_p.html rename to htroot/Bookmarks.html index 68cce42da..14e7c5fc9 100644 --- a/htroot/Bookmarks_p.html +++ b/htroot/Bookmarks.html @@ -13,10 +13,12 @@ #(mode)# -Add Bookmark -Import XML Bookmarks +Login :: -
+Add Bookmark +Import XML Bookmarks +:: + @@ -57,7 +59,7 @@
#(edit)#

Add Bookmark

::

Edit Bookmark

#(/edit)#
:: -
+ @@ -96,30 +98,30 @@ #(public)#private bookmark::public bookmark#(/public)# #[title]#
#[description]#
-Tagged with | #{tags}##[tag]# | #{/tags}#
-Edit / -Delete +Tagged with | #{tags}##[tag]# | #{/tags}#
+Edit / +Delete

#{/bookmarks}#

#(prev-page)# -::previous page +::previous page #(/prev-page)# #(next-page)# -::next page +::next page #(/next-page)#
Show -10 -50 -100 +10 +50 +100 Bookmarks per page.

diff --git a/htroot/Bookmarks_p.java b/htroot/Bookmarks.java similarity index 92% rename from htroot/Bookmarks_p.java rename to htroot/Bookmarks.java index 1945c7d10..5956c34cb 100644 --- a/htroot/Bookmarks_p.java +++ b/htroot/Bookmarks.java @@ -50,6 +50,7 @@ import java.util.Iterator; import java.util.Vector; import de.anomic.data.bookmarksDB; +import de.anomic.data.listManager; import de.anomic.data.bookmarksDB.Tag; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaSwitchboard; @@ -57,16 +58,20 @@ import de.anomic.plasma.plasmaCrawlLURL; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -public class Bookmarks_p { +public class Bookmarks { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { serverObjects prop = new serverObjects(); plasmaSwitchboard switchboard = (plasmaSwitchboard) env; int max_count=10; String tagName=""; int start=0; + boolean isAdmin=switchboard.verifyAuthentication(header, true); //defaultvalues prop.put("mode", 0); + if(isAdmin){ + prop.put("mode", 1); + } prop.put("mode_edit", 0); prop.put("mode_title", ""); prop.put("mode_description", ""); @@ -74,15 +79,19 @@ public class Bookmarks_p { prop.put("mode_tags", ""); prop.put("mode_public", 1); //1=is public if(post != null){ - if(post.containsKey("mode")){ + + if(!isAdmin){ + if(post.containsKey("login")){ + prop.put("AUTHENTICATE","admin log-in"); + } + }else if(post.containsKey("mode")){ String mode=(String) post.get("mode"); if(mode.equals("add")){ - prop.put("mode", 1); - }else if(mode.equals("importxml")){ prop.put("mode", 2); + }else if(mode.equals("importxml")){ + prop.put("mode", 3); } - } - if(post.containsKey("add")){ //add an Entry + }else if(post.containsKey("add")){ //add an Entry String url=(String) post.get("url"); String title=(String) post.get("title"); String description=(String) post.get("description"); @@ -90,11 +99,7 @@ public class Bookmarks_p { if(tagsString.equals("")){ tagsString="unsorted"; //defaulttag } - Vector tags=new Vector(); - String[] tagsArray=tagsString.split(","); - for(int i=0;i - + diff --git a/source/de/anomic/data/bookmarksDB.java b/source/de/anomic/data/bookmarksDB.java index 667a6b56d..ceab097ce 100644 --- a/source/de/anomic/data/bookmarksDB.java +++ b/source/de/anomic/data/bookmarksDB.java @@ -745,7 +745,7 @@ public class bookmarksDB { Iterator it=tags.iterator(); while(it.hasNext()){ String tagName=(String) it.next(); - Tag tag=getTag(tagName); + Tag tag=getTag(tagHash(tagName)); if(tag == null){ tag=new Tag(tagName); }

Import XML Bookmarks
-All (#[num-bookmarks]#)
+All (#[num-bookmarks]#)
#{taglist}# -#[name]# (#[num]#)
+#[name]# (#[num]#)
#{/taglist}#
 Global Index
 Search Page
 Detailed Search
  Bookmarks
 Bookmarks
 Help