*) Restructuring of YaCy SOAP services

- 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-ef5d649a1542
yacy · Sep 26, 2006 · 97615af · 97615af
1 parent 241b881
commit 97615af
Show file tree

Hide file tree

Showing 7 changed files with 520 additions and 193 deletions.
diff --git a/htroot/ViewFile.soap b/htroot/ViewFile.soap
@@ -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>
diff --git a/htroot/yacysearch.soap b/htroot/yacysearch.soap
@@ -1,26 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <yacySearch>
 	<yacySearchResult>	
 		<title>Search for #[former]#</title>
 		<description>Search for #[former]#</description>
 
 		#(type)#
-		<totalResultCount>#[totalcount]#</totalResultCount>
-		<currentResultCount>#[linkcount]#</currentResultCount>
+		<totalResultCount>#(num-results)#::::::::::#[totalcount]##(/num-results)#</totalResultCount>
+		<currentResultCount>#(num-results)#::::::::::#[linkcount]##(/num-results)#</currentResultCount>
 
-		<searchTips>
+		<!-- StopWords -->
+		<stopWords>#(excluded)#::#[stopwords]##(/excluded)#</stopWords>
+
+		<!--  YaCy Top-Worts -->
+		<topWords>
 		#(combine)#::		
-		#{words}#<searchTip query="#[newsearch]#">#[word]#</searchTip>#{/words}#
+		#{words}#<word query="#[newsearch]#">#[word]#</word>#{/words}#
 		#(/combine)#
-		</searchTips>				
+		</topWords>				
 
-		#{results}#
+		<!-- Search Results -->
+		#{results}#		
 		<yacySearchResultItem>
 			<description>#[description]#</description>
 			<link>#[url]#</link>
+			<hash>#[urlhash]#</hash>
 			<linkName>#[urlname]#</linkName>
-			<date>#[date]#</date>
+			<pubDate>#[date]#</pubDate>
 			<size>#[size]#</size>
+			<ranking>YBR-#[ybr]#</ranking>
+			<description>#(snippet)#::#[text]##(/snippet)#</description>
 		</yacySearchResultItem>
 		#{/results}#
 		::