[Carrot2-cvs] carrot2/components/carrot2-shared-lib/src/com/dawidweiss/carrot/adapters/localfilter R
Brought to you by:
dawidweiss,
stachoo
From: <daw...@us...> - 2004-02-08 20:36:34
|
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src/com/dawidweiss/carrot/adapters/localfilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4513 Modified Files: RemoteToLocalAdapter.java Log Message: Only valid XML characters are now emitted. Index: RemoteToLocalAdapter.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src/com/dawidweiss/carrot/adapters/localfilter/RemoteToLocalAdapter.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RemoteToLocalAdapter.java 19 Sep 2003 10:14:53 -0000 1.1.1.1 --- RemoteToLocalAdapter.java 8 Feb 2004 20:33:28 -0000 1.2 *************** *** 23,26 **** --- 23,29 ---- import org.put.util.net.http.HTTPFormSubmitter; import org.put.util.net.http.Parameter; + + import com.dawidweiss.carrot.util.XMLSerializerHelper; + import java.io.IOException; import java.io.InputStream; *************** *** 83,86 **** --- 86,90 ---- int id = 0; ArrayList hitsArray = new ArrayList(); + XMLSerializerHelper xmlSerializer = XMLSerializerHelper.getInstance(); while (hits.hasNext()) *************** *** 96,100 **** { requestXml.append("<title>"); ! requestXml.append(org.put.util.xml.XMLHelper.escapeElementEntities(title)); requestXml.append("</title>"); } --- 100,104 ---- { requestXml.append("<title>"); ! requestXml.append(xmlSerializer.toValidXmlText(title, false)); requestXml.append("</title>"); } *************** *** 108,112 **** requestXml.append("<url>"); ! requestXml.append(org.put.util.xml.XMLHelper.escapeElementEntities(url)); requestXml.append("</url>"); --- 112,116 ---- requestXml.append("<url>"); ! requestXml.append(xmlSerializer.toValidXmlText(url, false)); requestXml.append("</url>"); *************** *** 116,120 **** { requestXml.append("<snippet>"); ! requestXml.append(org.put.util.xml.XMLHelper.escapeElementEntities(snippet)); requestXml.append("</snippet>"); } --- 120,124 ---- { requestXml.append("<snippet>"); ! requestXml.append(xmlSerializer.toValidXmlText(snippet, false)); requestXml.append("</snippet>"); } |