honeymoose
/
sitemap-j
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes issue #25 (#26)

This commit is contained in:
Kamil 2016-07-21 01:06:24 +02:00 committed by dfabulich
parent c3dee10152
commit ea0594afa1
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/redfin/sitemapgenerator/AbstractSitemapUrlRenderer.java
View File

@ -5,7 +5,7 @@ abstract class AbstractSitemapUrlRenderer<T extends WebSitemapUrl> implements IS
public void render(WebSitemapUrl url, StringBuilder sb, W3CDateFormat dateFormat, String additionalData) { public void render(WebSitemapUrl url, StringBuilder sb, W3CDateFormat dateFormat, String additionalData) {
sb.append(" <url>\n"); sb.append(" <url>\n");
sb.append(" <loc>"); sb.append(" <loc>");
sb.append(url.getUrl().toString()); sb.append(UrlUtils.escapeXml(url.getUrl().toString()));
sb.append("</loc>\n"); sb.append("</loc>\n");
if (url.getLastMod() != null) { if (url.getLastMod() != null) {
sb.append(" <lastmod>"); sb.append(" <lastmod>");
@ -35,7 +35,7 @@ abstract class AbstractSitemapUrlRenderer<T extends WebSitemapUrl> implements IS
sb.append(':'); sb.append(':');
sb.append(tagName); sb.append(tagName);
sb.append('>'); sb.append('>');
sb.append(value); sb.append(UrlUtils.escapeXml(value.toString()));
sb.append("</"); sb.append("</");
sb.append(namespace); sb.append(namespace);
sb.append(':'); sb.append(':');

2
src/main/java/com/redfin/sitemapgenerator/SitemapIndexGenerator.java
View File

@ -225,7 +225,7 @@ public class SitemapIndexGenerator {
for (SitemapIndexUrl url : urls) { for (SitemapIndexUrl url : urls) {
out.write(" <sitemap>\n"); out.write(" <sitemap>\n");
out.write(" <loc>"); out.write(" <loc>");
out.write(url.url.toString()); out.write(UrlUtils.escapeXml(url.url.toString()));
out.write("</loc>\n"); out.write("</loc>\n");
Date lastMod = url.lastMod; Date lastMod = url.lastMod;

23
src/main/java/com/redfin/sitemapgenerator/UrlUtils.java
View File

@ -2,8 +2,31 @@ package com.redfin.sitemapgenerator;
import java.net.URL; import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
class UrlUtils { class UrlUtils {
private static Map<String,String> ENTITIES = new HashMap<String,String>();
static {
ENTITIES.put("&", "&amp;");
ENTITIES.put("'", "&apos;");
ENTITIES.put("\"", "&quot;");
ENTITIES.put(">", "&gt;");
ENTITIES.put("<", "&lt;");
}
private static Pattern PATTERN = Pattern.compile("(&|'|\"|>|<)");
static String escapeXml(String string){
Matcher matcher = PATTERN.matcher(string);
StringBuffer sb = new StringBuffer();
while(matcher.find()) {
matcher.appendReplacement(sb, ENTITIES.get(matcher.group(1)));
}
matcher.appendTail(sb);
return sb.toString();
}
static void checkUrl(URL url, URL baseUrl) { static void checkUrl(URL url, URL baseUrl) {
// Is there a better test to use here? // Is there a better test to use here?