-
Notifications
You must be signed in to change notification settings - Fork 4
Handle surrogate pair characters substring #955
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,136 +1,137 @@ | ||
| /* | ||
| * Copyright (c) 2007-2019 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.flow; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.xmlbeans.XmlError; | ||
| import org.apache.xmlbeans.XmlException; | ||
| import org.apache.xmlbeans.XmlOptions; | ||
| import org.fhcrc.cpas.flow.script.xml.ScriptDef; | ||
| import org.fhcrc.cpas.flow.script.xml.ScriptDocument; | ||
| import org.xml.sax.SAXParseException; | ||
|
|
||
| import java.io.StringReader; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class ScriptParser | ||
| { | ||
| List<Error> _errors; | ||
| ScriptDef _script; | ||
|
|
||
| public ScriptParser() | ||
| { | ||
| } | ||
|
|
||
| static public class Error | ||
| { | ||
| String _message; | ||
| int _line; | ||
| int _column; | ||
|
|
||
| public Error(String message) | ||
| { | ||
| this(message, 0, 0); | ||
| } | ||
|
|
||
| public Error(String message, int line, int column) | ||
| { | ||
| _message = message; | ||
| _line = line; | ||
| _column = column; | ||
| } | ||
|
|
||
| public Error(SAXParseException spe) | ||
| { | ||
| this(spe.getLocalizedMessage(), spe.getLineNumber(), spe.getColumnNumber()); | ||
| } | ||
|
|
||
| public String getMessage() | ||
| { | ||
| return _message; | ||
| } | ||
|
|
||
| public int getLine() | ||
| { | ||
| return _line; | ||
| } | ||
|
|
||
| public int getColumn() | ||
| { | ||
| return _column; | ||
| } | ||
| } | ||
|
|
||
| public void parse(String script) | ||
| { | ||
| try | ||
| { | ||
| XmlOptions options = new XmlOptions(); | ||
| List<XmlError> errors = new ArrayList<>(); | ||
| options.setDocumentType(ScriptDocument.type); | ||
| script = StringUtils.replace(script, "<script>", "<script xmlns=\"" + ScriptDocument.type.getContentModel().getName().getNamespaceURI() + "\">"); | ||
| ScriptDocument doc = ScriptDocument.Factory.parse(new StringReader(script), options); | ||
| options.setErrorListener(errors); | ||
|
|
||
| if (!doc.validate(options)) | ||
| { | ||
| for (XmlError xmlError : errors) | ||
| { | ||
| String message = xmlError.getMessage(); | ||
| message = StringUtils.replace(message, "@" + ScriptDocument.type.getContentModel().getName().getNamespaceURI(), ""); | ||
| String location = xmlError.getCursorLocation().xmlText(); | ||
| if (location.length() > 100) | ||
| location = location.substring(0, 100); | ||
| addError(new Error("Schema Validation Error: " + message + "\nLocation of invalid XML: " + location)); | ||
| } | ||
| } | ||
| _script = doc.getScript(); | ||
| } | ||
| catch (XmlException xmlException) | ||
| { | ||
| if (xmlException.getErrors().isEmpty()) | ||
| { | ||
| addError(new Error(xmlException.toString())); | ||
| } | ||
| else | ||
| { | ||
| for (XmlError xmlError : xmlException.getErrors()) | ||
| { | ||
| addError(new Error(xmlError.getMessage(), xmlError.getLine(), xmlError.getColumn() > 0 ? xmlError.getColumn() : 1)); | ||
| } | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| addError(new Error(e.toString())); | ||
| } | ||
| } | ||
|
|
||
| void addError(Error error) | ||
| { | ||
| if (_errors == null) | ||
| _errors = new ArrayList<>(); | ||
| _errors.add(error); | ||
| } | ||
|
|
||
| public Error[] getErrors() | ||
| { | ||
| if (_errors == null || _errors.isEmpty()) | ||
| return null; | ||
| return _errors.toArray(new Error[0]); | ||
| } | ||
| } | ||
| /* | ||
| * Copyright (c) 2007-2019 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.flow; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.xmlbeans.XmlError; | ||
| import org.apache.xmlbeans.XmlException; | ||
| import org.apache.xmlbeans.XmlOptions; | ||
| import org.fhcrc.cpas.flow.script.xml.ScriptDef; | ||
| import org.fhcrc.cpas.flow.script.xml.ScriptDocument; | ||
| import org.labkey.api.util.StringUtilsLabKey; | ||
| import org.xml.sax.SAXParseException; | ||
|
|
||
| import java.io.StringReader; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class ScriptParser | ||
| { | ||
| List<Error> _errors; | ||
| ScriptDef _script; | ||
|
|
||
| public ScriptParser() | ||
| { | ||
| } | ||
|
|
||
| static public class Error | ||
| { | ||
| String _message; | ||
| int _line; | ||
| int _column; | ||
|
|
||
| public Error(String message) | ||
| { | ||
| this(message, 0, 0); | ||
| } | ||
|
|
||
| public Error(String message, int line, int column) | ||
| { | ||
| _message = message; | ||
| _line = line; | ||
| _column = column; | ||
| } | ||
|
|
||
| public Error(SAXParseException spe) | ||
| { | ||
| this(spe.getLocalizedMessage(), spe.getLineNumber(), spe.getColumnNumber()); | ||
| } | ||
|
|
||
| public String getMessage() | ||
| { | ||
| return _message; | ||
| } | ||
|
|
||
| public int getLine() | ||
| { | ||
| return _line; | ||
| } | ||
|
|
||
| public int getColumn() | ||
| { | ||
| return _column; | ||
| } | ||
| } | ||
|
|
||
| public void parse(String script) | ||
| { | ||
| try | ||
| { | ||
| XmlOptions options = new XmlOptions(); | ||
| List<XmlError> errors = new ArrayList<>(); | ||
| options.setDocumentType(ScriptDocument.type); | ||
| script = StringUtils.replace(script, "<script>", "<script xmlns=\"" + ScriptDocument.type.getContentModel().getName().getNamespaceURI() + "\">"); | ||
| ScriptDocument doc = ScriptDocument.Factory.parse(new StringReader(script), options); | ||
| options.setErrorListener(errors); | ||
|
|
||
| if (!doc.validate(options)) | ||
| { | ||
| for (XmlError xmlError : errors) | ||
| { | ||
| String message = xmlError.getMessage(); | ||
| message = StringUtils.replace(message, "@" + ScriptDocument.type.getContentModel().getName().getNamespaceURI(), ""); | ||
| String location = xmlError.getCursorLocation().xmlText(); | ||
| if (location.length() > 100) | ||
| location = StringUtilsLabKey.leftSurrogatePairFriendly(location, 100); | ||
| addError(new Error("Schema Validation Error: " + message + "\nLocation of invalid XML: " + location)); | ||
| } | ||
| } | ||
| _script = doc.getScript(); | ||
| } | ||
| catch (XmlException xmlException) | ||
| { | ||
| if (xmlException.getErrors().isEmpty()) | ||
| { | ||
| addError(new Error(xmlException.toString())); | ||
| } | ||
| else | ||
| { | ||
| for (XmlError xmlError : xmlException.getErrors()) | ||
| { | ||
| addError(new Error(xmlError.getMessage(), xmlError.getLine(), xmlError.getColumn() > 0 ? xmlError.getColumn() : 1)); | ||
| } | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| addError(new Error(e.toString())); | ||
| } | ||
| } | ||
|
|
||
| void addError(Error error) | ||
| { | ||
| if (_errors == null) | ||
| _errors = new ArrayList<>(); | ||
| _errors.add(error); | ||
| } | ||
|
|
||
| public Error[] getErrors() | ||
| { | ||
| if (_errors == null || _errors.isEmpty()) | ||
| return null; | ||
| return _errors.toArray(new Error[0]); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CRLF?