nokogiri-backport 1.11.0

data/ext/java/nokogiri/internals/HtmlDomParserContext.java

@@ -0,0 +1,252 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2012:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nokogiri.internals;
+
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+import static nokogiri.internals.NokogiriHelpers.isNamespace;
+import static nokogiri.internals.NokogiriHelpers.stringOrNil;
+
+import nokogiri.HtmlDocument;
+import nokogiri.NokogiriService;
+import nokogiri.XmlDocument;
+import nokogiri.XmlSyntaxError;
+
+import org.apache.xerces.xni.Augmentations;
+import org.apache.xerces.xni.QName;
+import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLDocumentFilter;
+import org.apache.xerces.xni.parser.XMLParserConfiguration;
+import org.cyberneko.html.HTMLConfiguration;
+import org.cyberneko.html.filters.DefaultFilter;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Parser for HtmlDocument. This class actually parses HtmlDocument using NekoHtml.
+ * 
+ * @author sergio
+ * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
+ */
+public class HtmlDomParserContext extends XmlDomParserContext {
+
+    public HtmlDomParserContext(Ruby runtime, IRubyObject options) {
+        this(runtime, runtime.getNil(), options);
+    }
+
+    public HtmlDomParserContext(Ruby runtime, IRubyObject encoding, IRubyObject options) {
+        super(runtime, encoding, options);
+        java_encoding = NokogiriHelpers.getValidEncoding(encoding);
+    }
+
+    @Override
+    protected void initParser(Ruby runtime) {
+        XMLParserConfiguration config = new HTMLConfiguration();
+        //XMLDocumentFilter removeNSAttrsFilter = new RemoveNSAttrsFilter();
+        XMLDocumentFilter elementValidityCheckFilter = new ElementValidityCheckFilter(errorHandler);
+        //XMLDocumentFilter[] filters = { removeNSAttrsFilter,  elementValidityCheckFilter};
+        XMLDocumentFilter[] filters = { elementValidityCheckFilter};
+
+        config.setErrorHandler(this.errorHandler);
+
+        parser = new NokogiriDomParser(config);
+
+        // see http://nekohtml.sourceforge.net/settings.html for details
+        setProperty("http://cyberneko.org/html/properties/default-encoding", java_encoding);
+        setProperty("http://cyberneko.org/html/properties/names/elems", "lower");
+        setProperty("http://cyberneko.org/html/properties/names/attrs", "lower");
+        setProperty("http://cyberneko.org/html/properties/filters", filters);
+        setFeature("http://cyberneko.org/html/features/report-errors", true);
+        setFeature("http://xml.org/sax/features/namespaces", false);
+    }
+    
+    @Override
+    public void setEncoding(String encoding) {
+        super.setEncoding(encoding);
+    }
+
+    /**
+     * Enable NekoHTML feature for balancing tags in a document fragment.
+     * 
+     * This method is used in XmlNode#in_context method.
+     */
+    public void enableDocumentFragment() {
+        setFeature("http://cyberneko.org/html/features/balance-tags/document-fragment", true);
+    }
+
+    @Override
+    public XmlDocument parse(ThreadContext context, RubyClass klass, IRubyObject url) {
+        XmlDocument xmlDoc = super.parse(context, klass, url);
+
+        // let's be consistent in how we handle RECOVER and NORECOVER (a.k.a. STRICT)
+        // https://github.com/sparklemotion/nokogiri/issues/2130
+        if (!options.recover && errorHandler.getErrors().size() > 0) {
+            XmlSyntaxError xmlSyntaxError = XmlSyntaxError.createXMLSyntaxError(context.runtime);
+            String exceptionMsg = String.format("%s: '%s'",
+                                                "Parser without recover option encountered error or warning",
+                                                errorHandler.getErrors().get(0));
+            xmlSyntaxError.setException(new Exception(exceptionMsg));
+            throw xmlSyntaxError.toThrowable();
+        }
+
+        return xmlDoc;
+    }
+
+    @Override
+    protected XmlDocument wrapDocument(ThreadContext context, RubyClass klass, Document document) {
+        HtmlDocument htmlDocument = new HtmlDocument(context.runtime, klass, document);
+        htmlDocument.setDocumentNode(context.runtime, document);
+        if (ruby_encoding.isNil()) {
+            // ruby_encoding might have detected by HtmlDocument::EncodingReader
+            if (detected_encoding != null && !detected_encoding.isNil()) {
+                ruby_encoding = detected_encoding;
+            } else {
+                // no encoding given & no encoding detected, then try to get it
+                String charset = tryGetCharsetFromHtml5MetaTag(document);
+                ruby_encoding = stringOrNil(context.runtime, charset);
+            }
+        }
+        htmlDocument.setEncoding(ruby_encoding);
+        htmlDocument.setParsedEncoding(java_encoding);
+        return htmlDocument;
+    }
+    
+    // NekoHtml doesn't understand HTML5 meta tag format. This fails to detect charset
+    // from an HTML5 style meta tag. Luckily, the meta tag and charset exists in DOM tree
+    // so, this method attempts to find the charset.
+    private static String tryGetCharsetFromHtml5MetaTag(Document document) {
+        if (!"html".equalsIgnoreCase(document.getDocumentElement().getNodeName())) return null;
+        NodeList list = document.getDocumentElement().getChildNodes(); Node item;
+        for (int i = 0; i < list.getLength(); i++) {
+            if ("head".equalsIgnoreCase((item = list.item(i)).getNodeName())) {
+                NodeList headers = item.getChildNodes();
+                for (int j = 0; j < headers.getLength(); j++) {
+                    if ("meta".equalsIgnoreCase((item = headers.item(j)).getNodeName())) {
+                        NamedNodeMap nodeMap = item.getAttributes();
+                        for (int k = 0; k < nodeMap.getLength(); k++) {
+                            if ("charset".equalsIgnoreCase((item = nodeMap.item(k)).getNodeName())) {
+                                return item.getNodeValue();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Filter to strip out attributes that pertain to XML namespaces.
+     */
+    public static class RemoveNSAttrsFilter extends DefaultFilter {
+        @Override
+        public void startElement(QName element, XMLAttributes attrs,
+                                 Augmentations augs) throws XNIException {
+            int i;
+            for (i = 0; i < attrs.getLength(); ++i) {
+                if (isNamespace(attrs.getQName(i))) {
+                    attrs.removeAttributeAt(i);
+                    --i;
+                }
+            }
+
+            element.uri = null;
+            super.startElement(element, attrs, augs);
+        }
+    }
+    
+    public static class ElementValidityCheckFilter extends DefaultFilter {
+        private NokogiriErrorHandler errorHandler;
+        
+        private ElementValidityCheckFilter(NokogiriErrorHandler errorHandler) {
+            this.errorHandler = errorHandler;
+        }
+        
+        // element names from xhtml1-strict.dtd
+        private static String[][] element_names = {
+            {"a", "abbr", "acronym", "address", "area"},
+            {"b", "base", "basefont", "bdo", "big", "blockquote", "body", "br", "button"},
+            {"caption", "cite", "code", "col", "colgroup"},
+            {"dd", "del", "dfn", "div", "dl", "dt"},
+            {"em"},
+            {"fieldset", "font", "form", "frame", "frameset"},
+            {}, // g
+            {"h1", "h2", "h3", "h4", "h5", "h6", "head", "hr", "html"},
+            {"i", "iframe", "img", "input", "ins"},
+            {}, // j
+            {"kbd"},
+            {"label", "legend", "li", "link"},
+            {"map", "meta"},
+            {"noframes", "noscript"},
+            {"object", "ol", "optgroup", "option"},
+            {"p", "param", "pre"},
+            {"q"},
+            {}, // r
+            {"s", "samp", "script", "select", "small", "span", "strike", "strong", "style", "sub", "sup"},
+            {"table", "tbody", "td", "textarea", "tfoot", "th", "thead", "title", "tr", "tt"},
+            {"u", "ul"},
+            {"var"},
+            {}, // w
+            {}, // x
+            {}, // y
+            {}  // z
+        };
+        
+        private static boolean isValid(final String name) {
+            int index = name.charAt(0) - 97;
+            if (index >= element_names.length) return false;
+            String[] elementNames = element_names[index];
+            for (int i=0; i<elementNames.length; i++) {
+                if (name.equals(elementNames[i])) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        
+        @Override
+        public void startElement(QName name, XMLAttributes attrs, Augmentations augs) throws XNIException {
+            if (!isValid(name.rawname)) {
+                errorHandler.addError(new Exception("Tag " + name.rawname + " invalid"));
+            }
+            super.startElement(name, attrs, augs);
+        }
+    }
+}

data/ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java

@@ -0,0 +1,20 @@
+package nokogiri.internals;
+
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+public class IgnoreSchemaErrorsErrorHandler implements ErrorHandler {
+
+    @Override
+    public void warning(SAXParseException exception) throws SAXException {
+    }
+
+    @Override
+    public void error(SAXParseException exception) throws SAXException {
+    }
+
+    @Override
+    public void fatalError(SAXParseException exception) throws SAXException {
+    }
+}

data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java

@@ -0,0 +1,151 @@
+/**
+ *
+ */
+package nokogiri.internals;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import nokogiri.XmlSaxPushParser;
+
+/**
+ * A smart input stream that signals the caller when a chunk of data is consumed
+ * from the stream. The main use of this stream is to synchronize the
+ * {@link XmlSaxPushParser} and the {@link XmlSaxParser} which runs in a
+ * different thread.
+ *
+ * @author John Shahid <jvshahid@gmail.com>
+ */
+public class NokogiriBlockingQueueInputStream extends InputStream {
+  private final LinkedBlockingQueue<Task>  queue;
+  protected Task                           currentTask;
+  protected ByteArrayInputStream           currentStream;
+  protected int                            position;
+  protected boolean                        closed = false;
+
+  public static final ByteArrayInputStream END    = new ByteArrayInputStream(new byte[0]);
+
+  private static class Task extends FutureTask<Void> {
+    private final ByteArrayInputStream stream;
+
+    public Task(ByteArrayInputStream stream) {
+      super(new Callable<Void>() {
+        @Override
+        public Void call() throws Exception {
+          // TODO Auto-generated method stub
+          return null;
+        }
+      });
+      this.stream = stream;
+    }
+
+    public ByteArrayInputStream getStream() {
+      return stream;
+    }
+
+    @Override
+    public void run() {
+      // don't do anything
+    }
+
+    @Override
+    public boolean runAndReset() {
+      // don't do anything
+      return true;
+    }
+
+    @Override
+    public void set(Void v) {
+      super.set(v);
+    }
+  }
+
+  public NokogiriBlockingQueueInputStream() {
+    queue = new LinkedBlockingQueue<Task>();
+  }
+
+  /**
+   * This method shouldn't be called unless the parser has finished parsing or
+   * threw an exception while doing so, otherwise, there'll be the protential
+   * that the read method will block indefinitely.
+   */
+  @Override
+  public synchronized void close() {
+    closed = true;
+    List<Task> tasks = new LinkedList<Task>();
+    queue.drainTo(tasks);
+    tasks.add(currentTask);
+    for (Task task : tasks) {
+      task.set(null);
+    }
+  }
+
+  /**
+   * Add @param stream to the end of the queue of data that will be returned by
+   * {@link #read()} and its variants. The method will @return a future whose
+   * {@link Future#get()} will block until the data in @param stream is read.
+   *
+   * Passing the special stream {@link #END} to this method, will cause
+   * {@link #read()} to return an eof indicator (i.e. -1) to the caller, after
+   * all the data inserted before {@link #END} is processed.
+   *
+   * @return
+   */
+  public synchronized Future<Void> addChunk(ByteArrayInputStream stream) throws ClosedStreamException {
+    if (closed)
+      throw new ClosedStreamException("Cannot add a chunk to a closed stream");
+    Task task = new Task(stream);
+    queue.add(task);
+    return task;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see java.io.InputStream#read()
+   */
+  @Override
+  public int read() throws IOException {
+    if (currentTask == null || currentStream.available() == 0)
+      if (getNextTask() == -1)
+        return -1;
+    return currentStream.read();
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see java.io.InputStream#read(byte[], int, int)
+   */
+  @Override
+  public int read(byte[] bytes, int off, int len) {
+    if (currentTask == null || currentStream.available() == 0) {
+      if (getNextTask() == -1) {
+        currentTask.set(null);
+        return -1;
+      }
+    }
+    return currentStream.read(bytes, off, len);
+  }
+
+  protected int getNextTask() {
+    while (true) {
+      try {
+        if (currentTask != null)
+          currentTask.set(null);
+        currentTask = queue.take();
+        currentStream = currentTask.getStream();
+        return currentStream.available() == 0 ? -1 : currentStream.available();
+      } catch (InterruptedException ex) {
+        // keep retrying to read
+      }
+    }
+  }
+}

data/ext/java/nokogiri/internals/NokogiriDomParser.java

@@ -0,0 +1,116 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2011:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nokogiri.internals;
+
+import java.io.IOException;
+
+import nokogiri.XmlDocument;
+
+import org.apache.xerces.parsers.DOMParser;
+import org.apache.xerces.parsers.XIncludeParserConfiguration;
+import org.apache.xerces.xni.parser.XMLParserConfiguration;
+import org.cyberneko.dtd.DTDConfiguration;
+import org.w3c.dom.Document;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Sets up a Xerces/XNI DOM Parser for use with Nokogiri.  Uses
+ * NekoDTD to parse the DTD into a tree of Nodes.
+ *
+ * @author Patrick Mahoney <pat@polycrystal.org>
+ */
+public class NokogiriDomParser extends DOMParser {
+    protected DOMParser dtd;
+    protected boolean xInclude;
+    protected XMLParserConfiguration config;
+
+    public NokogiriDomParser(XMLParserConfiguration config) {
+        super(config);
+        this.config = config;
+        initialize();
+    }
+
+    public NokogiriDomParser(ParserContext.Options options) {
+        xInclude = options.xInclude;
+        initialize();
+    }
+
+    protected void initialize() {
+        if (config == null) {
+            if (xInclude) {
+                config = new XIncludeParserConfiguration();
+            } else {
+                config = getXMLParserConfiguration();
+            }
+        }
+
+        DTDConfiguration dtdConfig = new DTDConfiguration();
+        dtd = new DOMParser(dtdConfig);
+
+        config.setDTDHandler(dtdConfig);
+        config.setDTDContentModelHandler(dtdConfig);
+    }
+
+    @Override
+    public void parse(InputSource source) throws SAXException, IOException {
+        dtd.reset();
+        if (xInclude) {
+            setEntityResolver(new NokogiriXInlcudeEntityResolver(source));
+        }
+        super.parse(source);
+        Document doc = getDocument();
+        if (doc == null)
+            throw new RuntimeException("null document");
+
+        doc.setUserData(XmlDocument.DTD_RAW_DOCUMENT, dtd.getDocument(), null);
+    }
+
+    private static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver {
+        InputSource source;
+        private NokogiriXInlcudeEntityResolver(InputSource source) {
+            this.source = source;
+        }
+
+        @Override
+        public InputSource resolveEntity(String publicId, String systemId)
+                throws SAXException, IOException {
+            if (systemId != null) source.setSystemId(systemId);
+            if (publicId != null) source.setPublicId(publicId);
+            return source;
+        }
+    }
+}

data/ext/java/nokogiri/internals/NokogiriEntityResolver.java

@@ -0,0 +1,121 @@
+package nokogiri.internals;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import nokogiri.internals.ParserContext.Options;
+
+import org.jruby.Ruby;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.EntityResolver2;
+
+/**
+ * An entity resolver aware of the fact that the Ruby runtime can
+ * change directory but the JVM cannot.  Thus any file based
+ * entity resolution that uses relative paths must be translated
+ * to be relative to the current directory of the Ruby runtime.
+ */
+public class NokogiriEntityResolver implements EntityResolver2 {
+    protected final Ruby runtime;
+    private final NokogiriErrorHandler handler;
+    private final Options options;
+
+    public NokogiriEntityResolver(Ruby runtime, NokogiriErrorHandler handler, Options options) {
+        super();
+        this.runtime = runtime;
+        this.handler = handler;
+        this.options = options;
+    }
+
+    @Override
+    public InputSource getExternalSubset(String name, String baseURI)
+        throws SAXException, IOException {
+        return null;
+    }
+
+    @Override
+    public InputSource resolveEntity(String publicId, String systemId)
+        throws SAXException, IOException {
+        return resolveEntity(runtime, null, publicId, null, systemId);
+    }
+
+    @Override
+    public InputSource resolveEntity(String name,
+                                     String publicId,
+                                     String baseURI,
+                                     String systemId)
+        throws SAXException, IOException {
+        return resolveEntity(runtime, name, publicId, baseURI, systemId);
+    }
+
+    private static File join(String parent, String child) {
+        if (new File(parent).isFile()) {
+            parent = new File(parent).getParent();
+        }
+        return new File(parent, child);
+    }
+
+    private static InputSource emptyInputSource(InputSource source) {
+        source.setByteStream(new ByteArrayInputStream(new byte[0]));
+        return source;
+    }
+
+    private boolean shouldLoadDtd() {
+      return options.dtdLoad || options.dtdValid;
+    }
+
+    private void addError(String errorMessage) {
+        if (handler != null) handler.errors.add(new Exception(errorMessage));
+    }
+
+    /**
+     * Create a file base input source taking into account the current
+     * directory of <code>runtime</code>.
+     * @throws SAXException
+     */
+    protected InputSource resolveEntity(Ruby runtime, String name, String publicId, String baseURI, String systemId)
+        throws IOException, SAXException {
+        InputSource s = new InputSource();
+        if (name.equals("[dtd]") && !shouldLoadDtd()) {
+          return emptyInputSource(s);
+        } else if (!name.equals("[dtd]") && !options.noEnt) {
+          return emptyInputSource(s);
+        }
+        String adjustedSystemId;
+        URI uri = URI.create(systemId);
+        if (options.noNet && uri.getHost() != null) {
+          addError("Attempt to load network entity " + systemId);
+          return emptyInputSource(s);
+        }
+        // if this is a url or absolute file name then use it
+        if (uri.isAbsolute() && !uri.isOpaque()) {
+          adjustedSystemId = uri.toURL().toString();
+        } else if (new File(uri.getPath()).isAbsolute()) {
+          adjustedSystemId = uri.getPath();
+        } else if (baseURI != null) {
+          URI baseuri = URI.create(baseURI);
+          if (options.noNet && baseuri.getHost() != null) {
+            addError("Attempt to load network entity " + systemId);
+            return emptyInputSource(s);
+          }
+          if (baseuri.getHost() == null) {
+            // this is a local file
+            adjustedSystemId = join(baseuri.getPath(), uri.getPath()).getCanonicalPath();
+          } else {
+            // this is a url, then resolve uri using baseuri
+            adjustedSystemId = baseuri.resolve(systemId).toURL().toString();
+          }
+        } else {
+          // baseURI is null we have to use the current working directory to resolve the entity
+          String pwd = runtime.getCurrentDirectory();
+          adjustedSystemId = join(pwd, uri.getPath()).getCanonicalPath();
+        }
+        s.setSystemId(adjustedSystemId);
+        s.setPublicId(publicId);
+        return s;
+    }
+
+}