Revision 51113
Added by Claudio Atzori about 6 years ago
modules/cnr-enabling-inspector/trunk/src/main/java/eu/dnetlib/enabling/inspector/QueryController.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.enabling.inspector; |
2 | 2 |
|
3 |
import java.util.*; |
|
3 |
import java.util.Iterator; |
|
4 |
import java.util.List; |
|
5 |
import java.util.Spliterator; |
|
6 |
import java.util.Spliterators; |
|
4 | 7 |
import java.util.stream.Collectors; |
5 | 8 |
import java.util.stream.StreamSupport; |
6 |
|
|
7 | 9 |
import javax.annotation.Resource; |
8 | 10 |
|
9 |
import com.google.common.base.Function; |
|
10 |
import com.google.common.collect.Iterators; |
|
11 |
import com.google.common.collect.Lists; |
|
12 |
import org.apache.commons.lang.StringEscapeUtils; |
|
11 |
import eu.dnetlib.xml.database.XMLDatabase; |
|
12 |
import org.apache.commons.lang3.StringEscapeUtils; |
|
13 | 13 |
import org.apache.commons.logging.Log; |
14 | 14 |
import org.apache.commons.logging.LogFactory; |
15 | 15 |
import org.springframework.stereotype.Controller; |
... | ... | |
18 | 18 |
import org.springframework.web.bind.annotation.RequestParam; |
19 | 19 |
import org.xmldb.api.base.XMLDBException; |
20 | 20 |
|
21 |
import eu.dnetlib.xml.database.XMLDatabase; |
|
22 |
|
|
23 | 21 |
/** |
24 | 22 |
* This controller offers a simple way to run arbitrary queries on the xmldb. |
25 | 23 |
* |
... | ... | |
63 | 61 |
try { |
64 | 62 |
final Iterator<String> it = xmlDatabase.xquery(query); |
65 | 63 |
final List<String> res = StreamSupport.stream(Spliterators.spliteratorUnknownSize(it, Spliterator.IMMUTABLE), false) |
66 |
.map(StringEscapeUtils::escapeHtml) |
|
64 |
.map(StringEscapeUtils::escapeHtml4)
|
|
67 | 65 |
.map(linkTool::linkfyToHtml) |
68 | 66 |
.collect(Collectors.toList()); |
69 | 67 |
|
modules/cnr-enabling-inspector/trunk/src/main/java/eu/dnetlib/enabling/inspector/ResourceTreeController.java | ||
---|---|---|
16 | 16 |
import javax.servlet.http.HttpServletResponse; |
17 | 17 |
|
18 | 18 |
import org.apache.commons.io.IOUtils; |
19 |
import org.apache.commons.lang.StringEscapeUtils; |
|
19 |
import org.apache.commons.lang3.StringEscapeUtils;
|
|
20 | 20 |
import org.apache.commons.logging.Log; |
21 | 21 |
import org.apache.commons.logging.LogFactory; |
22 | 22 |
import org.dom4j.DocumentException; |
... | ... | |
257 | 257 |
} |
258 | 258 |
|
259 | 259 |
file = touch.spanize(file); |
260 |
file = StringEscapeUtils.escapeHtml(file); |
|
260 |
file = StringEscapeUtils.escapeHtml4(file);
|
|
261 | 261 |
file = touch.escape(file); |
262 | 262 |
// log.info("XML ESCAPED:" + file); |
263 | 263 |
|
... | ... | |
343 | 343 |
model.addAttribute("creating", "true"); |
344 | 344 |
} |
345 | 345 |
|
346 |
model.addAttribute("file", StringEscapeUtils.escapeHtml(file)); |
|
346 |
model.addAttribute("file", StringEscapeUtils.escapeHtml4(file));
|
|
347 | 347 |
model.addAttribute("pathComponents", extractPathComponents(collection, "../")); |
348 | 348 |
|
349 | 349 |
return "inspector/edit"; |
Also available in: Unified diff
using apache commons lang3