search profiling showed, that a major amount of time is wasted by computing url hashes. The computation does an intranet-check, which needs a DNS lookup. This caused that each urlhash computation needed 100-200 milliseconds, which caused remote searches to delay at least 1 second more that necessary. The solution to this problem is to attach a URL hash to the URL data structure, because that means that the url hash value can be filled after retrieval of the URL from the database. The redesign of the url/urlhash management caused a major redesign of many parts of the software. Since some parts had been decided to be given up they had been removed during this change to avoid unnecessary maintenance of unused code. git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4074 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
parent
66905b7c97
commit
daf0f74361
@ -1 +0,0 @@
|
||||
#[image]#
|
@ -1,69 +0,0 @@
|
||||
//Thumbnail.java
|
||||
//------------
|
||||
// part of YACY
|
||||
//
|
||||
// (C) 2007 Alexander Schier
|
||||
//
|
||||
// last change: $LastChangedDate: $ by $LastChangedBy: $
|
||||
// $LastChangedRevision: $
|
||||
//
|
||||
// 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
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.plasma.plasmaURL;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.server.servletProperties;
|
||||
|
||||
public class Thumbnail{
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
||||
servletProperties prop = new servletProperties();
|
||||
String command=env.getConfig("thumbnailProgram", "");
|
||||
if(command.equals("")||post==null||!post.containsKey("url")){
|
||||
prop.put("image", "thumbnail cannot be generated"); //TODO: put a "thumbnail not possible" image.
|
||||
return prop;
|
||||
}
|
||||
String[] cmdline=new String[3];
|
||||
cmdline[0]=env.getConfig("thumbnailProgram", "");
|
||||
cmdline[1]=post.get("url", "");
|
||||
plasmaSwitchboard sb=plasmaSwitchboard.getSwitchboard();
|
||||
File path=new File(sb.workPath, plasmaURL.urlHash(cmdline[1])+".png");
|
||||
cmdline[2]=path.getAbsolutePath();//does not contain an extension!
|
||||
try {
|
||||
Runtime.getRuntime().exec(cmdline);
|
||||
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(path)));
|
||||
String line;
|
||||
StringBuffer image=new StringBuffer();
|
||||
while((line=br.readLine())!=null){
|
||||
image.append(line);
|
||||
}
|
||||
//path.delete(); //we do not cache, yet.
|
||||
prop.put("image", image.toString());
|
||||
} catch (IOException e) {
|
||||
prop.put("image", "error creating thumbnail");//TODO: put a "thumbnail error" image.
|
||||
}
|
||||
httpHeader out_header=new httpHeader();
|
||||
out_header.put(httpHeader.CONTENT_TYPE, "image/png");
|
||||
prop.setOutgoingHeader(out_header);
|
||||
return prop;
|
||||
}
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>SOAP Service List</title>
|
||||
#%env/templates/metas.template%#
|
||||
</head>
|
||||
<body>
|
||||
#%env/templates/header.template%#
|
||||
<h2>Deployed SOAP Services</h2>
|
||||
<p>Currently #[services]# services are deployed.</p>
|
||||
|
||||
<table>
|
||||
<tr class="TableHeader">
|
||||
<td>Service name</td>
|
||||
<td>Operation</td>
|
||||
<td>WSDL</td>
|
||||
</tr>
|
||||
#{services}#<tr class="TableCell#(dark)#Light::Dark#(/dark)#">
|
||||
<td><b>#[name]#</b> [#[style]#]</td>
|
||||
<td>
|
||||
<table>
|
||||
#{methods}#<tr>
|
||||
<td>#[name]#</td>
|
||||
<td><tt>#[method]#</tt></td>
|
||||
</tr>#{/methods}#
|
||||
</table>
|
||||
</td>
|
||||
<td><a href="/soap/#[name]#?wsdl">WSDL</a></td>
|
||||
</tr>#{/services}#
|
||||
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
@ -1,105 +0,0 @@
|
||||
// ServiceList.java
|
||||
// -----------------------
|
||||
// part of YaCy
|
||||
// (C) by Michael Peter Christen; mc@anomic.de
|
||||
// first published on http://www.anomic.de
|
||||
// Frankfurt, Germany, 2004
|
||||
//
|
||||
// This File is contributed by Martin Thelian
|
||||
//
|
||||
// $LastChangedDate: 2007-02-24 13:56:32 +0000 (Sa, 24 Feb 2007) $
|
||||
// $LastChangedRevision: 3391 $
|
||||
// $LastChangedBy: karlchenofhell $
|
||||
//
|
||||
// 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 Blacklist_p.java
|
||||
// if the shell's current path is HTROOT
|
||||
|
||||
|
||||
package soap;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.apache.axis.AxisEngine;
|
||||
import org.apache.axis.ConfigurationException;
|
||||
import org.apache.axis.description.OperationDesc;
|
||||
import org.apache.axis.description.ServiceDesc;
|
||||
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
|
||||
public class ServiceList {
|
||||
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) throws ConfigurationException {
|
||||
|
||||
serverObjects prop = new serverObjects();
|
||||
|
||||
// getting the SOAP engine
|
||||
AxisEngine engine = (AxisEngine) post.get("SOAP.engine");
|
||||
|
||||
// loop through the deployed services
|
||||
int i = 0;
|
||||
boolean dark = true;
|
||||
Iterator serviceIter = engine.getConfig().getDeployedServices();
|
||||
while (serviceIter.hasNext()) {
|
||||
// getting the service description
|
||||
ServiceDesc serviceDescription = (ServiceDesc)serviceIter.next();
|
||||
prop.put("services_" + i + "_name",serviceDescription.getName());
|
||||
prop.put("services_" + i + "_style",serviceDescription.getStyle());
|
||||
prop.put("services_" + i + "_dark", ((dark) ? 1 : 0) ); dark =! dark;
|
||||
|
||||
// loop through the methods of this service
|
||||
int j = 0;
|
||||
ArrayList operations = serviceDescription.getOperations();
|
||||
while (j < operations.size()) {
|
||||
OperationDesc op = (OperationDesc)operations.get(j);
|
||||
|
||||
prop.put("services_" + i + "_methods_" + j + "_name",op.getName());
|
||||
prop.put("services_" + i + "_methods_" + j + "_method",op.getMethod());
|
||||
j++;
|
||||
}
|
||||
prop.put("services_" + i + "_methods",j);
|
||||
|
||||
i++;
|
||||
}
|
||||
prop.put("services",i);
|
||||
|
||||
return prop;
|
||||
}
|
||||
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue