diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html index 3d7f3bcc73..05178410ee 100644 --- a/htroot/ConfigSearchPage_p.html +++ b/htroot/ConfigSearchPage_p.html @@ -268,7 +268,7 @@

#[content_showDate_date]#  | 42 kbyte -  | Metadata +  | Metadata  | Parser  | Citation  | Pictures diff --git a/htroot/IndexControlURLs_p.html b/htroot/IndexControlURLs_p.html index 119f5e26c3..a190b10076 100644 --- a/htroot/IndexControlURLs_p.html +++ b/htroot/IndexControlURLs_p.html @@ -63,7 +63,7 @@ #%env/templates/header.template%# #%env/templates/submenuIndexControl.template%#
- + API These document details can be retrieved as XHTML+RDFa document containg RDF annotations in Dublin Core vocabulary. @@ -181,7 +181,7 @@

URL Database Administration

#(genUrlProfile)# ::No entry found for URL-hash #[urlhash]# - :: + ::

diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html index 5edae66728..96414d972e 100644 --- a/htroot/ViewFile.html +++ b/htroot/ViewFile.html @@ -104,7 +104,7 @@

View URL Content

URL Metadata
URL:
#[url]#
-
Hash:
#(inurldb)##[hash]#::#[hash]# (click this for full metadata)#(/inurldb)#
+
Hash:
#(inurldb)##[hash]#::#[hash]# (click this for full metadata)#(/inurldb)#
In Metadata:
#(inurldb)#no::yes#(/inurldb)#
In Cache:
#(incache)#no::yes#(/incache)#
First Seen:
#[firstSeen]#
diff --git a/htroot/yacysearchitem.html b/htroot/yacysearchitem.html index 72cd301d97..560fd43bd3 100644 --- a/htroot/yacysearchitem.html +++ b/htroot/yacysearchitem.html @@ -41,7 +41,7 @@

#(showDate)#::#[date]##(/showDate)# #(showEvent)#::on #[date]##(/showEvent)# #(showSize)#:: | #[sizename]##(/showSize)# - #(showMetadata)#:: | Metadata#(/showMetadata)# + #(showMetadata)#:: | Metadata#(/showMetadata)# #(showParser)#:: | Parser#(/showParser)# #(showCitation)#:: | Citations#(/showCitation)# #(showPictures)#:: | Pictures#(/showPictures)# diff --git a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java index aed07c29ea..2a7e999e57 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java @@ -24,6 +24,7 @@ import java.io.Writer; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -39,6 +40,7 @@ import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.XML; @@ -58,6 +60,7 @@ import net.yacy.cora.federate.solr.SolrType; import net.yacy.cora.lod.vocabulary.DublinCore; +import net.yacy.document.parser.html.CharacterCoding; import net.yacy.search.schema.CollectionSchema; import net.yacy.search.schema.WebgraphSchema; @@ -127,6 +130,157 @@ private void writeApiLink(final Writer writer, final NamedList paramsLis writer.write("
\"API\"\n"); writer.write("This search result can also be retrieved as XML. Click the API icon to see this page as XML.
\n"); } + + /** + * Optionally (omitHeader request param must not be true) append to the writer an HTML representation of the response header. + * @param writer the output writer. Must not be null. + * @param request the initial Solr request. Must not be null. + * @param responseHeader the eventual Solr response header. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeResponseHeader(final Writer writer, final SolrQueryRequest request, final NamedList responseHeader) + throws IOException { + if (responseHeader != null && request.getParams() == null || !request.getParams().getBool(CommonParams.OMIT_HEADER, false)) { + writer.write( + "\n"); + writer.write("
\n"); + writer.write("

Response header

\n"); + writeNamedList(writer, responseHeader, 0); + writer.write("
"); + writer.write(""); + writer.write("
"); + writer.write("
\n"); + writer.write("\n"); + } + } + + /** + * Append to the writer an HTML representation of the given values. + * @param writer the output writer. Must not be null. + * @param list the values to write. Must not be null. + * @param nestingLevel the nesting level of the list. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeNamedList(final Writer writer, final NamedList list, final int nestingLevel) + throws IOException { + if (list != null && list.size() > 0) { + writer.write("
\n"); + for (final Map.Entry entry : list) { + final String key = entry.getKey(); + final Object value = entry.getValue(); + writer.write("
"); + writer.write(key); + writer.write("
\n
"); + if (value instanceof NamedList) { + if (nestingLevel < 5) { // prevent any infite recursive loop + if("params".equals(key) && nestingLevel == 0) { + writeEditableNamedList(writer, (NamedList) value, nestingLevel + 1); + } else { + writeNamedList(writer, (NamedList) value, nestingLevel + 1); + } + } + } else if (value instanceof Iterable) { + writeIterable(writer, key, (Iterable) value); + } else if (value instanceof Object[]) { + writeIterable(writer, key, Arrays.asList((Object[]) value)); + } else { + writer.write(CharacterCoding.unicode2html(String.valueOf(value), true)); + } + writer.write("
\n"); + } + writer.write("
\n"); + } + } + + /** + * Append to the writer a representation of the given values as HTML form input fields grouped in a fieldset. + * @param writer the output writer. Must not be null. + * @param list the values to write. Must not be null. + * @param nestingLevel the nesting level of the list. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeEditableNamedList(final Writer writer, final NamedList list, final int nestingLevel) + throws IOException { + if (list != null && list.size() > 0) { + writer.write("
\n"); + for (final Map.Entry entry : list) { + final String key = entry.getKey(); + final Object value = entry.getValue(); + + if (value instanceof NamedList) { + if (nestingLevel < 5) { // prevent any infite recursive loop + writeEditableNamedList(writer, (NamedList) value, nestingLevel + 1); + } + } else if (value instanceof Iterable) { + writeEditableIterable(writer, key, (Iterable) value); + } else if (value instanceof Object[]) { + writeEditableIterable(writer, key, Arrays.asList((Object[]) value)); + } else { + writeEditableValue(writer, key, key, key, value); + } + } + writer.write("
\n"); + } + } + + /** + * Append to the writer a representation of the given value as an HTML form input field. + * @param writer the output writer. Must not be null. + * @param inputLabel the html label to render. Must not be null. + * @param inputId the id attribute of the html input field to render. Must not be null. + * @param inputName the name of the html input field to render. Must not be null. + * @param value the value to write. Must not be null. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeEditableValue(final Writer writer, final String inputLabel, final String inputId, final String inputName, final Object value) throws IOException { + writer.write("
\n"); + writer.write("\n"); + writer.write("
\n"); + writer.write("\n"); + writer.write("
\n"); + } + + /** + * Append to the writer an HTML representation of the given values. + * @param writer the output writer. Must not be null. + * @param key the key of the values. Must not be null. + * @param values the values to write. Must not be null. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeIterable(final Writer writer, final String key, final Iterable values) throws IOException { + int count = 0; + for (final Object value : values) { + writer.write("
"); + writer.write(key); + writer.write("_"); + writer.write(Integer.toString(count)); + writer.write("
\n
"); + writer.write(CharacterCoding.unicode2html(String.valueOf(value), true)); + count++; + writer.write("
\n"); + } + } + + /** + * Append to the writer a representation of the given values as HTML form input fields. + * @param writer the output writer. Must not be null. + * @param key the key of the values. Must not be null. + * @param values the values to write. Must not be null. + * @throws IOException when an error occurred while appending content to the writer + */ + private void writeEditableIterable(final Writer writer, final String key, final Iterable values) + throws IOException { + int count = 0; + for (final Object value : values) { + writeEditableValue(writer, key + "_" + Integer.toString(count), key + "_" + Integer.toString(count), key, + value); + count++; + } + } @Override public void write(final Writer writer, final SolrQueryRequest request, final SolrQueryResponse rsp) throws IOException { @@ -150,7 +304,7 @@ public void write(final Writer writer, final SolrQueryRequest request, final Sol */ final SolrDocumentList docList = ((SolrDocumentList)responseObj); - writeSolrDocumentList(writer, request, coreName, paramsList, docList); + writeSolrDocumentList(writer, request, rsp.getResponseHeader(), coreName, paramsList, docList); } else if(responseObj instanceof ResultContext){ /* Regular response object */ final DocList documents = ((ResultContext)responseObj).getDocList(); @@ -169,6 +323,8 @@ public void write(final Writer writer, final SolrQueryRequest request, final Sol String title = doc.get(CollectionSchema.title.getSolrFieldName()); // title is multivalued, after translation fieldname could be in tdoc. "title_0" ..., so get it from doc writeTitle(writer, coreName, sz, title); + writeResponseHeader(writer, request, rsp.getResponseHeader()); + writeApiLink(writer, paramsList, coreName); writeDoc(writer, tdoc, coreName, rsp.getReturnFields()); @@ -182,18 +338,24 @@ public void write(final Writer writer, final SolrQueryRequest request, final Sol } } else { writer.write("No Document Found\n\n"); + + writeResponseHeader(writer, request, rsp.getResponseHeader()); + writer.write("
No documents found
\n"); } } else { writer.write("Unable to process Solr response\n\n"); + + writeResponseHeader(writer, request, rsp.getResponseHeader()); + writer.write("
Unknown Solr response format
\n"); } writer.write("\n"); } - + @Override public void write(final Writer writer, final SolrQueryRequest request, final String coreName, final QueryResponse rsp) throws IOException { writeHtmlHead(writer); @@ -203,8 +365,9 @@ public void write(final Writer writer, final SolrQueryRequest request, final Str paramsList.remove("wt"); final SolrDocumentList docsList = rsp.getResults(); + final NamedList responseHeader = rsp.getHeader(); - writeSolrDocumentList(writer, request, coreName, paramsList, docsList); + writeSolrDocumentList(writer, request, responseHeader, coreName, paramsList, docsList); writer.write("\n"); } @@ -213,12 +376,13 @@ public void write(final Writer writer, final SolrQueryRequest request, final Str * Append to the writer HTML reprensentation of the given documents list. * @param writer the output writer * @param request the initial Solr request + * @param responseHeader the eventual Solr response header * @param coreName the requested Solr core * @param paramsList the original request parameters * @param docList the result Solr documents list * @throws IOException */ - private void writeSolrDocumentList(final Writer writer, final SolrQueryRequest request, final String coreName, + private void writeSolrDocumentList(final Writer writer, final SolrQueryRequest request, final NamedList responseHeader, final String coreName, final NamedList paramsList, final SolrDocumentList docList) throws IOException { final int sz = docList.size(); if (sz > 0) { @@ -230,6 +394,8 @@ private void writeSolrDocumentList(final Writer writer, final SolrQueryRequest r final Object titleValue = doc.getFirstValue(CollectionSchema.title.getSolrFieldName()); final String firstDocTitle = formatValue(titleValue); writeTitle(writer, coreName, sz, firstDocTitle); + + writeResponseHeader(writer, request, responseHeader); writeApiLink(writer, paramsList, coreName);