diff --git a/ChangeLog b/ChangeLog index 9923c79ba..9c3d7555a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ YaCy: The Search Engine with the friendly whale +version 0.44svn + * FIXED: special chars(like german umlauts) in tagNames allowed. (Allo) + * ADDED: Show public Bookmarks in Bookmarks.html, private ones, if the user is logged in. (Allo) + * FIXED: /xml/bookmarks/* now uses one file for private/public entries. private only with password. version 0.43 * UPDATED: new database handling of index entry objects, less IO overhead (Orbiter) * ADDED: many new ranking attributes and handling routines (Orbiter) diff --git a/htroot/xml/bookmarks/posts/all.java b/htroot/xml/bookmarks/posts/all.java index 19a1c5015..03f8aa635 100644 --- a/htroot/xml/bookmarks/posts/all.java +++ b/htroot/xml/bookmarks/posts/all.java @@ -59,12 +59,13 @@ public class all { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; + boolean isAdmin=switchboard.verifyAuthentication(header, true); serverObjects prop = new serverObjects(); Iterator it; if(post != null && post.containsKey("tag")){ - it=switchboard.bookmarksDB.getBookmarksIterator((String) post.get("tag"), false); + it=switchboard.bookmarksDB.getBookmarksIterator((String) post.get("tag"), isAdmin); }else{ - it=switchboard.bookmarksDB.getBookmarksIterator(false); + it=switchboard.bookmarksDB.getBookmarksIterator(isAdmin); } int count=0; bookmarksDB.Bookmark bookmark; diff --git a/htroot/xml/bookmarks/posts/all_p.java b/htroot/xml/bookmarks/posts/all_p.java deleted file mode 100644 index 12a2d865a..000000000 --- a/htroot/xml/bookmarks/posts/all_p.java +++ /dev/null @@ -1,92 +0,0 @@ -// /xml/bookmarks/posts/all_p.java -// ------------------------------- -// part of the AnomicHTTPD caching proxy -// (C) by Michael Peter Christen; mc@anomic.de -// first published on http://www.anomic.de -// Frankfurt, Germany, 2004, 2005 -// last major change: 27.12.2005 -// this file is contributed by Alexander Schier -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Using this software in any meaning (reading, learning, copying, compiling, -// running) means that you agree that the Author(s) is (are) not responsible -// for cost, loss of data or any harm that may be caused directly or indirectly -// by usage of this softare or this documentation. The usage of this software -// is on your own risk. The installation and usage (starting/running) of this -// software may allow other people or application to access your computer and -// any attached devices and is highly dependent on the configuration of the -// software which must be done by the user of the software; the author(s) is -// (are) also not responsible for proper configuration and usage of the -// software, even if provoked by documentation provided together with -// the software. -// -// Any changes to this file according to the GPL as documented in the file -// gpl.txt aside this file in the shipment you received can be done to the -// lines that follows this copyright notice here, but changes must not be -// done inside the copyright notive above. A re-distribution must contain -// the intact and unchanged copyright notice. -// Contributions and changes to the program code must be marked as such. - -// You must compile this file with -// javac -classpath .:../classes IndexCreate_p.java -// if the shell's current path is HTROOT -package xml.bookmarks.posts; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Iterator; - -import de.anomic.data.bookmarksDB; -import de.anomic.http.httpHeader; -import de.anomic.plasma.plasmaSwitchboard; -import de.anomic.server.serverCodings; -import de.anomic.server.serverObjects; -import de.anomic.server.serverSwitch; - -public class all_p { - public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - // return variable that accumulates replacements - plasmaSwitchboard switchboard = (plasmaSwitchboard) env; - serverObjects prop = new serverObjects(); - Iterator it; - if(post != null && post.containsKey("tag")){ - it=switchboard.bookmarksDB.getBookmarksIterator((String) post.get("tag"), true); - }else{ - it=switchboard.bookmarksDB.getBookmarksIterator(true); - } - int count=0; - bookmarksDB.Bookmark bookmark; - Date date; - while(it.hasNext()){ - bookmark=switchboard.bookmarksDB.getBookmark((String) it.next()); - prop.putNoHTML("posts_"+count+"_url", bookmark.getUrl()); - prop.putNoHTML("posts_"+count+"_title", bookmark.getTitle()); - prop.putNoHTML("posts_"+count+"_description", bookmark.getDescription()); - prop.putNoHTML("posts_"+count+"_md5", serverCodings.encodeMD5Hex(bookmark.getUrl())); - date=new Date(bookmark.getTimeStamp()); - prop.putNoHTML("posts_"+count+"_time", (new SimpleDateFormat("yyyy-MM-dd")).format(date)+"T"+(new SimpleDateFormat("HH:mm:ss")).format(date)+"Z"); - prop.putNoHTML("posts_"+count+"_tags", bookmark.getTags().replaceAll(","," ")); - count++; - } - prop.put("posts", count); - - // return rewrite properties - return prop; - } - -} - - - diff --git a/htroot/xml/bookmarks/posts/all_p.xml b/htroot/xml/bookmarks/posts/all_p.xml deleted file mode 100644 index 35c36b32a..000000000 --- a/htroot/xml/bookmarks/posts/all_p.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -#{posts}# -#{/posts}# - \ No newline at end of file diff --git a/htroot/xml/bookmarks/tags/get.java b/htroot/xml/bookmarks/tags/get.java index db360a424..f1203f30b 100644 --- a/htroot/xml/bookmarks/tags/get.java +++ b/htroot/xml/bookmarks/tags/get.java @@ -59,9 +59,10 @@ public class get { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; + boolean isAdmin=switchboard.verifyAuthentication(header, true); serverObjects prop = new serverObjects(); - Iterator it=switchboard.bookmarksDB.getTagIterator(false); + Iterator it=switchboard.bookmarksDB.getTagIterator(isAdmin); int count=0; bookmarksDB.Tag tag; while(it.hasNext()){ diff --git a/htroot/xml/bookmarks/tags/get_p.java b/htroot/xml/bookmarks/tags/get_p.java deleted file mode 100644 index 08820729c..000000000 --- a/htroot/xml/bookmarks/tags/get_p.java +++ /dev/null @@ -1,81 +0,0 @@ -// /xml.bookmarks/tags/get_p.java -// ------------------------------- -// part of the AnomicHTTPD caching proxy -// (C) by Michael Peter Christen; mc@anomic.de -// first published on http://www.anomic.de -// Frankfurt, Germany, 2004, 2005 -// last major change: 27.12.2005 -// this file is contributed by Alexander Schier -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Using this software in any meaning (reading, learning, copying, compiling, -// running) means that you agree that the Author(s) is (are) not responsible -// for cost, loss of data or any harm that may be caused directly or indirectly -// by usage of this softare or this documentation. The usage of this software -// is on your own risk. The installation and usage (starting/running) of this -// software may allow other people or application to access your computer and -// any attached devices and is highly dependent on the configuration of the -// software which must be done by the user of the software; the author(s) is -// (are) also not responsible for proper configuration and usage of the -// software, even if provoked by documentation provided together with -// the software. -// -// Any changes to this file according to the GPL as documented in the file -// gpl.txt aside this file in the shipment you received can be done to the -// lines that follows this copyright notice here, but changes must not be -// done inside the copyright notive above. A re-distribution must contain -// the intact and unchanged copyright notice. -// Contributions and changes to the program code must be marked as such. - -// You must compile this file with -// javac -classpath .:../classes IndexCreate_p.java -// if the shell's current path is HTROOT - -//package xml.bookmarks.tags; -package xml.bookmarks.tags; -import java.util.Iterator; - -import de.anomic.data.bookmarksDB; -import de.anomic.http.httpHeader; -import de.anomic.plasma.plasmaSwitchboard; -import de.anomic.server.serverObjects; -import de.anomic.server.serverSwitch; - -public class get_p { - public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - // return variable that accumulates replacements - plasmaSwitchboard switchboard = (plasmaSwitchboard) env; - serverObjects prop = new serverObjects(); - - Iterator it=switchboard.bookmarksDB.getTagIterator(true); - int count=0; - bookmarksDB.Tag tag; - while(it.hasNext()){ - tag=(bookmarksDB.Tag)it.next(); - prop.put("tags_"+count+"_name", tag.getTagName()); - prop.put("tags_"+count+"_count", tag.size()); - count++; - } - prop.put("tags", count); - - // return rewrite properties - return prop; - } - -} - - - diff --git a/htroot/xml/bookmarks/tags/get_p.xml b/htroot/xml/bookmarks/tags/get_p.xml deleted file mode 100644 index ca7dfd1f4..000000000 --- a/htroot/xml/bookmarks/tags/get_p.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -#{tags}# -#{/tags}# - \ No newline at end of file