*) Bugfix for soap templates

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2666 6c8d7289-2bf4-0310-a012-ef5d649a1542
19 years ago · c0f7a4124c
parent 2463e5624a
commit c0f7a4124c
2 changed files with 19 additions and 7 deletions
--- a/htroot/ViewFile.soap
+++ b/htroot/ViewFile.soap
@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <yacyUrlInfo>
+   <!-- Resource metadata -->
   <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>
+      <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>
+      <statusText>
+      #(error)#OK
+      ::No URL hash submitted
+      ::Unable to find URL Entry in DB
+      ::Invalid URL
+      ::Unable to download resource content: #[errorText]#
+      ::Unable to parse resource content: #[errorText]#
+      ::Unsupported protocol
+      #(/error)#
+      </statusText>
   </meta>
+   <!-- resource body -->
   <body mode="#(viewMode)#::1::2::3#(/viewMode)#">
      #(viewMode)#
      :: <!-- 1 -->
--- a/htroot/yacysearch.soap
+++ b/htroot/yacysearch.soap
@ -28,7 +28,7 @@
 			<pubDate>#[date]#</pubDate>
 			<size>#[size]#</size>
 			<ranking>YBR-#[ybr]#</ranking>
-			<snippet>#(snippet)#::<![CDATA[#[text]##(/snippet)#]]></snippet>
+			<snippet>#(snippet)#::<![CDATA[#[text]#]]>#(/snippet)#</snippet>
 		</yacySearchResultItem>
 		#{/results}#
 		::