diff --git a/.classpath b/.classpath index 111dedd42..c8eeb1798 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - + @@ -29,5 +29,8 @@ + + + diff --git a/htroot/Bookmarks_p.html b/htroot/Bookmarks_p.html index decc680c1..e96f10888 100644 --- a/htroot/Bookmarks_p.html +++ b/htroot/Bookmarks_p.html @@ -3,6 +3,8 @@ YaCy '#[clientname]#': Bookmarks #%env/templates/metas.template%# + + #%env/templates/header.template%# @@ -13,7 +15,7 @@ #(edit)#

Add Bookmark

::

Edit Bookmark

#(/edit)#
-Url:
+Url:
Title:
Description:
Tags(comma separated):
diff --git a/htroot/js/Bookmarks.js b/htroot/js/Bookmarks.js new file mode 100644 index 000000000..350d55f3e --- /dev/null +++ b/htroot/js/Bookmarks.js @@ -0,0 +1,13 @@ +function handleResponse(){ + if(http.readyState == 4){ + var response = http.responseXML; + title=response.getElementsByTagName("title")[0].firstChild.nodeValue; + document.getElementsByName("title")[0].value=title; + } +} +function loadTitle(){ + url=document.getElementsByName("url")[0].value; + if(document.getElementsByName("title")[0].value==""){ + sndReq('/xml/util/gettitle_p.xml?url='+url); + } +} diff --git a/htroot/xml/bookmarks/tags/rename_p.java b/htroot/xml/bookmarks/tags/rename_p.java index 5a35e67fb..33d309d8d 100644 --- a/htroot/xml/bookmarks/tags/rename_p.java +++ b/htroot/xml/bookmarks/tags/rename_p.java @@ -46,9 +46,6 @@ //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; diff --git a/htroot/xml/util/gettitle_p.java b/htroot/xml/util/gettitle_p.java new file mode 100644 index 000000000..11b5d4844 --- /dev/null +++ b/htroot/xml/util/gettitle_p.java @@ -0,0 +1,92 @@ +// /xml/util/gettitle_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: 29.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 + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; + +import de.anomic.http.httpHeader; +import de.anomic.http.httpc; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; + +public class gettitle_p { + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { + serverObjects prop = new serverObjects(); + prop.put("title", ""); + if(post!=null && post.containsKey("url")){ + ArrayList content; + String url; + try { + url=(String) post.get("url"); + if(url.toLowerCase().startsWith("http://")){ + url="http://"+url; + } + content = httpc.wget(new URL(url)); + Iterator it=content.iterator(); + String line; + String title; + while(it.hasNext()){ + line=(String) it.next(); + try{ + title=line.substring(line.toLowerCase().indexOf("")+7, line.toLowerCase().indexOf("")); + prop.put("title", title); + return prop; + }catch(IndexOutOfBoundsException e){} + } + } catch (MalformedURLException e) {} catch (IOException e) {} + } + // return rewrite properties + return prop; + } + +} + + + diff --git a/htroot/xml/util/gettitle_p.xml b/htroot/xml/util/gettitle_p.xml new file mode 100644 index 000000000..00111a470 --- /dev/null +++ b/htroot/xml/util/gettitle_p.xml @@ -0,0 +1,2 @@ + +#[title]# \ No newline at end of file diff --git a/source/de/anomic/data/bookmarksDB.java b/source/de/anomic/data/bookmarksDB.java index 06424fe14..c368a5abf 100644 --- a/source/de/anomic/data/bookmarksDB.java +++ b/source/de/anomic/data/bookmarksDB.java @@ -41,7 +41,6 @@ //Contributions and changes to the program code must be marked as such. package de.anomic.data; -import java.awt.print.Book; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/source/de/anomic/http/httpc.java b/source/de/anomic/http/httpc.java index ad225aae4..1311215d1 100644 --- a/source/de/anomic/http/httpc.java +++ b/source/de/anomic/http/httpc.java @@ -76,6 +76,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverByteBuffer; import de.anomic.server.serverCodings; import de.anomic.server.serverCore; @@ -1216,6 +1217,9 @@ do upload ) throws IOException { return wget(url,timeout,user,password,theRemoteProxyConfig,null); } + public static ArrayList wget(URL url) throws IOException{ + return wget(url, 6000, null, null, plasmaSwitchboard.getSwitchboard().remoteProxyConfig); + } public static ArrayList wget( URL url,