[MediaWiki-commits] [Gerrit] Fix T98446: add more chars to escape list - change (wikidata...rdf)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix T98446: add more chars to escape list
......................................................................


Fix T98446: add more chars to escape list

Change-Id: I5d96781f30103877afa4e1ac2ee6be088a789c08
---
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
2 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Manybubbles: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
index d6d8899..af53965 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
@@ -68,7 +68,9 @@
             r = new URIImpl(r.stringValue().replace("ontology-beta", 
"ontology"));
         }
         // Temporary bugfix for dump URLs having bad characters in them
-        String fixed = StringUtils.replaceEach(r.stringValue(), new 
String[]{"\n", "|", "\\", "{", "}"}, new String[]{"", "%7C", "%5C", "%7B", 
"%7D"});
+        String fixed = StringUtils.replaceEach(r.stringValue(),
+                new String[]{"\n", "|",   "\\",  "{",   "}",   "`",   "^"},
+                new String[]{"",   "%7C", "%5C", "%7B", "%7D", "%60", "%5E"});
         if (!fixed.equals(r.stringValue())) {
             r = new URIImpl(fixed);
         }
diff --git 
a/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
 
b/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
index ca618d2..2119700 100644
--- 
a/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
+++ 
b/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
@@ -58,8 +58,8 @@
     public void testHandleBadChars() throws RDFHandlerException {
         StatementChecker checkStatement = new StatementChecker();
         NormalizingRdfHandler handler = new 
NormalizingRdfHandler(checkStatement);
-        Statement s = statement("Q1", RDF.TYPE, 
"http://viaf.org/processed\\BNC|a10474614\n");
-        checkStatement.expect(null, null, 
"http://viaf.org/processed%5CBNC%7Ca10474614";);
+        Statement s = statement("Q1", RDF.TYPE, 
"http://viaf.org/processed\\BNC|a10474614`^{}\n");
+        checkStatement.expect(null, null, 
"http://viaf.org/processed%5CBNC%7Ca10474614%60%5E%7B%7D";);
         handler.handleStatement(s);
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/209668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d96781f30103877afa4e1ac2ee6be088a789c08
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Jdouglas <jdoug...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits