- general functions moved to abstract service class - service class splitted into SearchService, CrawlService, StatusService *) Bugfix for SOAP search services - Attention: some xml tages where renamed See: http://www.yacy-forum.de/viewtopic.php?p=25877 *) New SOAP service function urlInfo to view the parsed content of an URL See: http://www.yacy-forum.de/viewtopic.php?p=25869 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2660 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
theli
19 years ago
parent
241b881560
commit
97615af406
@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<yacyUrlInfo>
|
||||
<meta>
|
||||
<url>#(error)#::#[url]##(/error)#</url>
|
||||
<hash>#(error)#::#[hash]##(/error)#</hash>
|
||||
<wordCount>#(error)#::#[wordCount]##(/error)#</wordCount>
|
||||
<desc>#(error)#::#[desc]##(/error)#</desc>
|
||||
<size>#(error)#::#[size]##(/error)#</size>
|
||||
<mimeType>#(error)#::#[mimeType]##(/error)#</mimeType>
|
||||
<statusCode>#(error)#0::1::2::3::4::5::6#(/error)#</statusCode>
|
||||
</meta>
|
||||
<body mode="#(viewMode)#::1::2::3#(/viewMode)#">
|
||||
#(viewMode)#
|
||||
:: <!-- 1 -->
|
||||
<![CDATA[#[plainText]#]]>
|
||||
:: <!-- 2 -->
|
||||
<![CDATA[#[parsedText]#]]>
|
||||
:: <!-- 3 -->
|
||||
#{sentences}#
|
||||
<sentence nr="#[nr]#"><![CDATA[#[text]#]]></sentence>
|
||||
#{/sentences}#
|
||||
#(/viewMode)#
|
||||
</body>
|
||||
</yacyUrlInfo>
|
||||
@ -0,0 +1,94 @@
|
||||
//CrawlService.java
|
||||
//------------------------
|
||||
//part of YaCy
|
||||
//(C) by Michael Peter Christen; mc@anomic.de
|
||||
//first published on http://www.anomic.de
|
||||
//Frankfurt, Germany, 2005
|
||||
//
|
||||
//this file was contributed by Martin Thelian
|
||||
//last major change: $LastChangedDate$ by $LastChangedBy$
|
||||
//Revision: $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
|
||||
//
|
||||
//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.
|
||||
|
||||
|
||||
package de.anomic.soap.services;
|
||||
|
||||
import org.apache.axis.AxisFault;
|
||||
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.soap.AbstractService;
|
||||
|
||||
public class CrawlService extends AbstractService {
|
||||
|
||||
/**
|
||||
* Constant: template for crawling
|
||||
*/
|
||||
private static final String TEMPLATE_CRAWLING = "IndexCreate_p.html";
|
||||
|
||||
/**
|
||||
* Service used start a new crawling job using the default settings for crawling
|
||||
*
|
||||
* @return returns the http status page containing the crawling properties to the user
|
||||
* TODO: creating an extra xml template that can be send back to the client.
|
||||
*
|
||||
* @throws AxisFault if the service could not be executed propery.
|
||||
*/
|
||||
public String crawling(String crawlingURL) throws AxisFault {
|
||||
try {
|
||||
// extracting the message context
|
||||
extractMessageContext(true);
|
||||
|
||||
// setting the crawling properties
|
||||
serverObjects args = new serverObjects();
|
||||
args.put("crawlingQ","on");
|
||||
args.put("xsstopw","on");
|
||||
args.put("crawlOrder","on");
|
||||
args.put("crawlingstart","Start New Crawl");
|
||||
args.put("crawlingDepth","2");
|
||||
args.put("crawlingFilter",".*");
|
||||
args.put("storeHTCache","on");
|
||||
args.put("localIndexing","on");
|
||||
args.put("crawlingURL",crawlingURL);
|
||||
|
||||
// triggering the crawling
|
||||
byte[] result = writeTemplate(TEMPLATE_CRAWLING, args);
|
||||
|
||||
// sending back the crawling status page to the user
|
||||
return new String(result,"UTF-8");
|
||||
} catch (Exception e) {
|
||||
throw new AxisFault(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,208 @@
|
||||
//httpdSoapService.java
|
||||
//------------------------
|
||||
//part of YaCy
|
||||
//(C) by Michael Peter Christen; mc@anomic.de
|
||||
//first published on http://www.anomic.de
|
||||
//Frankfurt, Germany, 2005
|
||||
//
|
||||
//this file was contributed by Martin Thelian
|
||||
//last major change: $LastChangedDate$ by $LastChangedBy$
|
||||
//Revision: $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
|
||||
//
|
||||
//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.
|
||||
|
||||
|
||||
package de.anomic.soap.services;
|
||||
|
||||
import org.apache.axis.AxisFault;
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
import de.anomic.plasma.plasmaSearchPreOrder;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.soap.AbstractService;
|
||||
|
||||
/**
|
||||
* SOAP Service Class that will be invoked by the httpdSoapHandler
|
||||
*
|
||||
* @author Martin Thelian
|
||||
*/
|
||||
public class SearchService extends AbstractService
|
||||
{
|
||||
/* ================================================================
|
||||
* Constants needed to set the template that should be used to
|
||||
* fullfil the request
|
||||
* ================================================================ */
|
||||
private static final String TEMPLATE_SEARCH = "yacysearch.soap";
|
||||
private static final String TEMPLATE_URLINFO = "ViewFile.soap";
|
||||
|
||||
|
||||
/**
|
||||
* Constructor of this class
|
||||
*/
|
||||
public SearchService() {
|
||||
super();
|
||||
// nothing special todo here at the moment
|
||||
}
|
||||
|
||||
/**
|
||||
* Service for doing a simple search with the standard settings
|
||||
*
|
||||
* @param searchString the search string that should be used
|
||||
* @param maxSearchCount the maximum amount of search result that should be returned
|
||||
* @param searchOrder can be a combination of YBR, Date and Quality, e.g. <code>YBR-Date-Quality</code> or <code>Date-Quality-YBR</code>
|
||||
* @param searchMode can be <code>global</code> or <code>local</code>
|
||||
* @param searchMode the total amount of seconds to use for the search
|
||||
* @param urlMask if the urlMaskfilter parameter should be used
|
||||
* @param urlMaskfilter e.g. <code>.*</code>
|
||||
* @param prefermaskfilter
|
||||
* @param category can be <code>image</code> or <code>href</code>
|
||||
*
|
||||
* @return an xml document containing the search results.
|
||||
*
|
||||
* @throws AxisFault if the service could not be executed propery.
|
||||
*/
|
||||
public Document search(
|
||||
String searchString,
|
||||
int maxSearchCount,
|
||||
String searchOrder,
|
||||
String searchMode,
|
||||
int maxSearchTime,
|
||||
boolean urlMask,
|
||||
String urlMaskfilter,
|
||||
String prefermaskfilter,
|
||||
String category
|
||||
)
|
||||
throws AxisFault {
|
||||
try {
|
||||
// extracting the message context
|
||||
extractMessageContext(false);
|
||||
|
||||
if ((searchMode == null) || !(searchMode.equalsIgnoreCase("global") || searchMode.equalsIgnoreCase("locale"))) {
|
||||
searchMode = "global";
|
||||
}
|
||||
|
||||
if (maxSearchCount < 0) {
|
||||
maxSearchCount = 10;
|
||||
}
|
||||
|
||||
if (searchOrder == null || searchOrder.length() == 0) {
|
||||
searchOrder = plasmaSearchPreOrder.canUseYBR() ? "YBR-Date-Quality" : "Date-Quality-YBR";
|
||||
}
|
||||
|
||||
if (maxSearchTime < 0) {
|
||||
maxSearchTime = 10;
|
||||
}
|
||||
|
||||
if (urlMaskfilter == null) {
|
||||
urlMaskfilter = ".*";
|
||||
}
|
||||
|
||||
if (prefermaskfilter == null) {
|
||||
prefermaskfilter = "";
|
||||
}
|
||||
|
||||
if (category == null || category.length() == 0) {
|
||||
category = "href";
|
||||
}
|
||||
|
||||
// setting the searching properties
|
||||
serverObjects args = new serverObjects();
|
||||
args.put("search",searchString);
|
||||
args.put("count",Integer.toString(maxSearchCount));
|
||||
args.put("order",searchOrder);
|
||||
args.put("resource",searchMode);
|
||||
args.put("time",Integer.toString(maxSearchTime));
|
||||
args.put("urlmask",(!urlMask)?"no":"yes");
|
||||
args.put("urlmaskfilter",urlMaskfilter);
|
||||
args.put("prefermaskfilter",prefermaskfilter);
|
||||
args.put("cat",category);
|
||||
|
||||
args.put("Enter","Search");
|
||||
|
||||
// generating the template containing the search result
|
||||
byte[] result = writeTemplate(TEMPLATE_SEARCH, args);
|
||||
|
||||
// sending back the result to the client
|
||||
return this.convertContentToXML(result);
|
||||
} catch (Exception e) {
|
||||
throw new AxisFault(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @param url the url
|
||||
* @param viewMode one of (VIEW_MODE_AS_PLAIN_TEXT = 1,
|
||||
* VIEW_MODE_AS_PARSED_TEXT = 2,
|
||||
* VIEW_MODE_AS_PARSED_SENTENCES = 3) [Source: ViewFile.java]
|
||||
* @return an xml document containing the url info.
|
||||
*
|
||||
* @throws AxisFault if the service could not be executed propery.
|
||||
*/
|
||||
public Document urlInfo(String urlHash, int viewMode) throws AxisFault {
|
||||
try {
|
||||
// extracting the message context
|
||||
extractMessageContext(true);
|
||||
|
||||
if (urlHash == null || urlHash.trim().equals("")) {
|
||||
throw new AxisFault("No Url-hash provided.");
|
||||
}
|
||||
|
||||
if (viewMode < 1 || viewMode > 3) {
|
||||
viewMode = 2;
|
||||
}
|
||||
|
||||
String viewModeStr = "sentences";
|
||||
if (viewMode == 1) viewModeStr = "plain";
|
||||
else if (viewMode == 2) viewModeStr = "parsed";
|
||||
else if (viewMode == 3) viewModeStr = "sentences";
|
||||
|
||||
|
||||
// setting the properties
|
||||
final serverObjects args = new serverObjects();
|
||||
args.put("urlHash",urlHash);
|
||||
args.put("viewMode",viewModeStr);
|
||||
|
||||
// generating the template containing the url info
|
||||
byte[] result = writeTemplate(TEMPLATE_URLINFO, args);
|
||||
|
||||
// sending back the result to the client
|
||||
return this.convertContentToXML(result);
|
||||
} catch (Exception e) {
|
||||
throw new AxisFault(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
//StatusService.java
|
||||
//------------------------
|
||||
//part of YaCy
|
||||
//(C) by Michael Peter Christen; mc@anomic.de
|
||||
//first published on http://www.anomic.de
|
||||
//Frankfurt, Germany, 2005
|
||||
//
|
||||
//this file was contributed by Martin Thelian
|
||||
//last major change: $LastChangedDate$ by $LastChangedBy$
|
||||
//Revision: $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
|
||||
//
|
||||
//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.
|
||||
|
||||
|
||||
package de.anomic.soap.services;
|
||||
|
||||
import org.apache.axis.AxisFault;
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.soap.AbstractService;
|
||||
|
||||
public class StatusService extends AbstractService {
|
||||
|
||||
/**
|
||||
* Constant: template for the network status page
|
||||
*/
|
||||
private static final String TEMPLATE_NETWORK_XML = "Network.xml";
|
||||
|
||||
/**
|
||||
* Service used to query the network properties
|
||||
* @throws AxisFault if the service could not be executed propery.
|
||||
*/
|
||||
public Document network() throws AxisFault {
|
||||
try {
|
||||
// extracting the message context
|
||||
extractMessageContext(false);
|
||||
|
||||
// generating the template containing the network status information
|
||||
byte[] result = writeTemplate(TEMPLATE_NETWORK_XML, new serverObjects());
|
||||
|
||||
// sending back the result to the client
|
||||
return this.convertContentToXML(result);
|
||||
} catch (Exception e) {
|
||||
throw new AxisFault(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue