boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

replaced yacy xml encoding by solr xml encoding

Browse Source
pull/1/head
Michael Peter Christen 13 years ago
parent 89fe13e73d
commit 1641835fef
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

14
source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java
Unescape View File

@ -33,13 +33,13 @@ import java.util.Set;
import net.yacy.cora.document.RSSMessage; import net.yacy.cora.document.RSSMessage;
import net.yacy.cora.lod.vocabulary.DublinCore; import net.yacy.cora.lod.vocabulary.DublinCore;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.document.parser.html.CharacterCoding;
import net.yacy.search.index.YaCySchema; import net.yacy.search.index.YaCySchema;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter; import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
@ -168,18 +168,18 @@ public class GSAResponseWriter implements QueryResponseWriter {
// if the rule is not generic, use the specific here // if the rule is not generic, use the specific here
if (YaCySchema.sku.name().equals(fieldName)) { if (YaCySchema.sku.name().equals(fieldName)) {
OpensearchResponseWriter.solitaireTag(writer, GSAToken.U.name(), CharacterCoding.unicode2xml(value.stringValue(), true)); OpensearchResponseWriter.solitaireTag(writer, GSAToken.U.name(), value.stringValue());
OpensearchResponseWriter.solitaireTag(writer, GSAToken.UE.name(), CharacterCoding.unicode2html(value.stringValue(), true)); OpensearchResponseWriter.solitaireTag(writer, GSAToken.UE.name(), value.stringValue());
continue; continue;
} }
if (YaCySchema.title.name().equals(fieldName)) { if (YaCySchema.title.name().equals(fieldName)) {
OpensearchResponseWriter.solitaireTag(writer, GSAToken.T.name(), CharacterCoding.unicode2xml(value.stringValue(), true)); OpensearchResponseWriter.solitaireTag(writer, GSAToken.T.name(), value.stringValue());
texts.add(value.stringValue()); texts.add(value.stringValue());
continue; continue;
} }
if (YaCySchema.description.name().equals(fieldName)) { if (YaCySchema.description.name().equals(fieldName)) {
description = value.stringValue(); description = value.stringValue();
OpensearchResponseWriter.solitaireTag(writer, DublinCore.Description.getURIref(), CharacterCoding.unicode2xml(description, true)); OpensearchResponseWriter.solitaireTag(writer, DublinCore.Description.getURIref(), description);
texts.add(description); texts.add(description);
continue; continue;
} }
@ -208,7 +208,7 @@ public class GSAResponseWriter implements QueryResponseWriter {
} }
} }
// compute snippet from texts // compute snippet from texts
OpensearchResponseWriter.solitaireTag(writer, RSSMessage.Token.description.name(), CharacterCoding.unicode2xml(description, true)); OpensearchResponseWriter.solitaireTag(writer, RSSMessage.Token.description.name(), description);
OpensearchResponseWriter.solitaireTag(writer, GSAToken.ENT_SOURCE.name(), "YaCy"); OpensearchResponseWriter.solitaireTag(writer, GSAToken.ENT_SOURCE.name(), "YaCy");
OpensearchResponseWriter.closeTag(writer, "R"); OpensearchResponseWriter.closeTag(writer, "R");
} }
@ -222,7 +222,7 @@ public class GSAResponseWriter implements QueryResponseWriter {
writer.write("<PARAM name=\""); writer.write("<PARAM name=\"");
writer.write(tagname); writer.write(tagname);
writer.write("\" value=\""); writer.write("\" value=\"");
writer.write(value); XML.escapeCharData(value, writer);
writer.write("\" original_value=\""); writer.write("\" original_value=\"");
writer.write(value); writer.write(value);
writer.write("\"/>"); writer.write(lb); writer.write("\"/>"); writer.write(lb);

12
source/net/yacy/cora/services/federated/solr/OpensearchResponseWriter.java
Unescape View File

@ -33,13 +33,13 @@ import java.util.Set;
import net.yacy.cora.document.RSSMessage; import net.yacy.cora.document.RSSMessage;
import net.yacy.cora.lod.vocabulary.DublinCore; import net.yacy.cora.lod.vocabulary.DublinCore;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.document.parser.html.CharacterCoding;
import net.yacy.search.index.YaCySchema; import net.yacy.search.index.YaCySchema;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter; import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
@ -159,7 +159,7 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
// apply generic matching rule // apply generic matching rule
String stag = field2tag.get(fieldName); String stag = field2tag.get(fieldName);
if (stag != null) { if (stag != null) {
solitaireTag(writer, stag, CharacterCoding.unicode2xml(value.stringValue(), true)); solitaireTag(writer, stag, value.stringValue());
continue; continue;
} }
@ -169,7 +169,7 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
continue; continue;
} }
if (YaCySchema.title.name().equals(fieldName)) { if (YaCySchema.title.name().equals(fieldName)) {
solitaireTag(writer, RSSMessage.Token.title.name(), CharacterCoding.unicode2xml(value.stringValue(), true)); solitaireTag(writer, RSSMessage.Token.title.name(), value.stringValue());
texts.add(value.stringValue()); texts.add(value.stringValue());
continue; continue;
} }
@ -181,7 +181,7 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
} }
if (YaCySchema.description.name().equals(fieldName)) { if (YaCySchema.description.name().equals(fieldName)) {
description = value.stringValue(); description = value.stringValue();
solitaireTag(writer, DublinCore.Description.getURIref(), CharacterCoding.unicode2xml(description, true)); solitaireTag(writer, DublinCore.Description.getURIref(), description);
texts.add(description); texts.add(description);
continue; continue;
} }
@ -198,7 +198,7 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
} }
} }
// compute snippet from texts // compute snippet from texts
solitaireTagNocheck(writer, RSSMessage.Token.description.name(), CharacterCoding.unicode2xml(description, true)); solitaireTagNocheck(writer, RSSMessage.Token.description.name(), description);
closeTag(writer, "item"); closeTag(writer, "item");
} }
@ -221,7 +221,7 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
public static void solitaireTagNocheck(final Writer writer, final String tagname, String value) throws IOException { public static void solitaireTagNocheck(final Writer writer, final String tagname, String value) throws IOException {
writer.write("<"); writer.write(tagname); writer.write('>'); writer.write("<"); writer.write(tagname); writer.write('>');
writer.write(value); XML.escapeCharData(value, writer);
writer.write("</"); writer.write(tagname); writer.write('>'); writer.write(lb); writer.write("</"); writer.write(tagname); writer.write('>'); writer.write(lb);
} }

Write Preview
Loading…
Cancel
Save