You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/26 23:19:52 UTC
svn commit: r1176063 - in
/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out: EscapeStr.java
NodeFmtLib.java NodeFormatterNT.java
Author: andy
Date: Mon Sep 26 21:19:52 2011
New Revision: 1176063
URL: http://svn.apache.org/viewvc?rev=1176063&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/EscapeStr.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFmtLib.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFormatterNT.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/EscapeStr.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/EscapeStr.java?rev=1176063&r1=1176062&r2=1176063&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/EscapeStr.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/EscapeStr.java Mon Sep 26 21:19:52 2011
@@ -81,7 +81,7 @@ public class EscapeStr
} catch (IOException e) { IO.exception(e) ; return null ; }
}
- private static void stringEsc(Writer out, String s, boolean singleLineString, boolean asciiOnly) throws IOException
+ public static void stringEsc(Writer out, String s, boolean singleLineString, boolean asciiOnly) throws IOException
{
int len = s.length() ;
for (int i = 0; i < len; i++) {
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFmtLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFmtLib.java?rev=1176063&r1=1176062&r2=1176063&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFmtLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFmtLib.java Mon Sep 26 21:19:52 2011
@@ -54,17 +54,17 @@ public class NodeFmtLib
public static String str(Triple t)
{
- return str(t.getSubject(), t.getPredicate(),t.getObject()) ;
+ return strNodes(t.getSubject(), t.getPredicate(),t.getObject()) ;
}
public static String str(Quad q)
{
- return str(q.getGraph(), q.getSubject(), q.getPredicate(), q.getObject()) ;
+ return strNodes(q.getGraph(), q.getSubject(), q.getPredicate(), q.getObject()) ;
}
// Worker
- public static String str(Node ... nodes)
+ public static String strNodes(Node ... nodes)
{
StringWriter sw = new StringWriter() ;
boolean first = true ;
@@ -80,7 +80,12 @@ public class NodeFmtLib
return sw.toString() ;
}
- //public static String str(Node n)
+ public static String str(Node n)
+ {
+ StringWriter sw = new StringWriter() ;
+ str(sw, n) ;
+ return sw.toString() ;
+ }
private static final boolean onlySafeBNodeLabels = true ;
@@ -195,94 +200,4 @@ public class NodeFmtLib
catch (MalformedURLException ex) { r = rel.toString() ; }
return r ;
}
-
- // ---- Escaping.
-
- static boolean applyUnicodeEscapes = false ;
-
- static EscapeStr escaper = new EscapeStr(false) ;
-
- // take a string and make it safe for writing.
- public static String stringEsc(String s)
- {
- return stringEsc(s, true) ;
- }
-
- public static String stringEsc(String s, boolean singleLineString)
- {
- StringWriter sw = new StringWriter() ;
- if ( singleLineString )
- escaper.writeStr(sw, s) ;
- else
- escaper.writeStrMultiLine(sw, s) ;
- return sw.toString() ;
- }
-
- public static void stringEsc(StringBuilder sbuff, String s)
- { stringEsc( sbuff, s, true ) ; }
-
- public static void stringEsc(StringBuilder sbuff, String s, boolean singleLineString)
- {
- int len = s.length() ;
- for (int i = 0; i < len; i++) {
- char c = s.charAt(i);
-
- // Escape escapes and quotes
- if (c == '\\' || c == '"' )
- {
- sbuff.append('\\') ;
- sbuff.append(c) ;
- continue ;
- }
-
- // Characters to literally output.
- // This would generate 7-bit safe files
-// if (c >= 32 && c < 127)
-// {
-// sbuff.append(c) ;
-// continue;
-// }
-
- // Whitespace
- if ( singleLineString && ( c == '\n' || c == '\r' || c == '\f' ) )
- {
- if (c == '\n') sbuff.append("\\n");
- if (c == '\t') sbuff.append("\\t");
- if (c == '\r') sbuff.append("\\r");
- if (c == '\f') sbuff.append("\\f");
- continue ;
- }
-
- // Output as is (subject to UTF-8 encoding on output that is)
-
- if ( ! applyUnicodeEscapes )
- sbuff.append(c) ;
- else
- {
- // Unicode escapes
- // c < 32, c >= 127, not whitespace or other specials
- if ( c >= 32 && c < 127 )
- {
- sbuff.append(c) ;
- }
- else
- {
- String hexstr = Integer.toHexString(c).toUpperCase();
- int pad = 4 - hexstr.length();
- sbuff.append("\\u");
- for (; pad > 0; pad--)
- sbuff.append("0");
- sbuff.append(hexstr);
- }
- }
- }
- }
-
-// public static String stringEsc(String s) { return FmtUtils.stringEsc(s) ; }
-//
-// public static String stringEsc(String s, boolean singleLineString)
-// { return FmtUtils.stringEsc(s, singleLineString) ; }
-//
-// public static String unescapeStr(String s) { return ParserBase.unescapeStr(s) ; }
-
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFormatterNT.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFormatterNT.java?rev=1176063&r1=1176062&r2=1176063&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFormatterNT.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/out/NodeFormatterNT.java Mon Sep 26 21:19:52 2011
@@ -28,6 +28,8 @@ public class NodeFormatterNT extends Nod
// Formatting for NTriples
// Turtles extends this class to intercept forms it can do better.
+ private final EscapeStr escapeProc = new EscapeStr(true) ;
+
public NodeFormatterNT() {}
//@Override
@@ -70,7 +72,7 @@ public class NodeFormatterNT extends Nod
private void writeEscaped(Writer w, String lex) throws IOException
{
w.write('"') ;
- w.write(lex) ; // DO BETTER
+ escapeProc.writeStr(w, lex) ;
w.write('"') ;
}