Grahame Grieve
42461e6162
Add resource type to messages for clarity + fix typos in messages
2020-04-05 20:35:22 +10:00
markiantorno
7affad01fc
Cleanup
2020-04-03 14:12:47 -04:00
markiantorno
0e45efb766
Cleaning up validator
2020-04-03 14:04:03 -04:00
markiantorno
a31ce48e6e
Merge branch 'master' of ssh://github.com/hapifhir/org.hl7.fhir.core into cli_cleanup
2020-04-03 09:36:37 -04:00
Grahame Grieve
03be5d65a8
debugging fix
2020-04-04 00:02:53 +11:00
markiantorno
6e9b760b75
wip
2020-04-02 22:46:49 -04:00
Grahame Grieve
101fbe3126
more work on Measure/MeasureReport validation
2020-04-03 12:16:33 +11:00
markiantorno
b0a15a11a2
Cleaning up cli code
2020-04-02 11:40:44 -04:00
Grahame Grieve
ab581fdf86
further modularise validator and add Measure Validation
2020-04-02 11:05:55 +11:00
Grahame Grieve
232f1ff8ff
Start building support for measure validation
2020-03-31 10:14:12 +11:00
Grahame Grieve
32b0563ea1
fox for "Any" in extension context (from R3)
2020-03-28 06:10:43 +11:00
Grahame Grieve
200f149222
Release new version 4.2.10
2020-03-26 08:29:01 +11:00
Grahame Grieve
ac72dff882
More validation of URL charaters in XHTML ```a``` and ```img```
2020-03-26 06:47:53 +11:00
Grahame Grieve
298b39e615
add cross version snapshot generation tests
2020-03-17 11:15:53 +11:00
Grahame Grieve
335b5587b3
add cross version snapshot tests
2020-03-17 11:15:12 +11:00
patrick-werner
5f7a6efe60
NPE fix
2020-03-13 19:24:55 +01:00
patrick-werner
fe4b4acc3f
Merge branch 'i18nUtilities' into i18n_fixes
2020-03-13 18:45:26 +01:00
patrick-werner
a44d1c3582
added german translations for new properties
...
removed unused property, added html message part as property in InstanceValidator
minor fixes
2020-03-13 18:45:12 +01:00
patrick-werner
109b80ed6f
start movin i18n code Contexts -> utilities
2020-03-13 09:53:59 +01:00
patrick-werner
df8682428a
readding all the i18n work
2020-03-13 08:49:05 +01:00
Grahame Grieve
cb3178ec14
add document date test
2020-03-13 12:58:13 +11:00
Grahame Grieve
1757e27caf
check version before checking cache if no version specified when loading a package
2020-03-13 12:57:24 +11:00
Grahame Grieve
9c2473e527
readd document date test
2020-03-13 12:55:17 +11:00
patrick-werner
86711ac16f
readding all the i18n work
2020-03-12 23:26:05 +01:00
patrick-werner
34c63d0555
Merge remote-tracking branch 'origin/master' into i18n
...
# Conflicts:
# org.hl7.fhir.validation/src/main/resources/Messages_de.properties
2020-03-12 08:07:00 +01:00
patrick-werner
c7b8767a4c
renamed Message_de properties
2020-03-11 01:09:05 +01:00
patrick-werner
fdb07ba097
added german translation
2020-03-10 23:16:08 +01:00
patrick-werner
162341b97a
processed new JsonParser errors
2020-03-10 18:36:35 +01:00
patrick-werner
f5a7961ef7
Merge remote-tracking branch 'origin/master' into i18n
2020-03-10 18:18:21 +01:00
patrick-werner
108efaaf92
finished i18N processing
2020-03-10 18:07:14 +01:00
patrick-werner
14a0f7d687
added i18N handling to JsonParser, TurtleParser, XMLParser
2020-03-10 15:48:43 +01:00
patrick-werner
9443b1c1c3
added i18N handling to JsonParser
2020-03-10 14:32:46 +01:00
patrick-werner
c8187bc8f2
added i18N handling to all ParserBase
...
FIXED "'" escaping in properties
2020-03-10 14:19:19 +01:00
Grahame Grieve
130cc3892c
remove dead code
2020-03-10 17:57:31 +11:00
Grahame Grieve
d77b687d95
fix bug in testing for validation cases
2020-03-10 06:47:55 +11:00
patrick-werner
41e9b0e9fa
Merge remote-tracking branch 'origin/master' into i18n
2020-03-09 14:12:04 +01:00
Grahame Grieve
e14ff0eefe
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2020-03-06 12:31:01 +11:00
Grahame Grieve
dcb3e1f7f0
improve documentation
2020-03-06 12:30:41 +11:00
Grahame Grieve
a680074406
Merge pull request #150 from hapifhir/improveFileIgnores
...
improved recursive if scanning ignores
2020-03-06 12:26:03 +11:00
patrick-werner
7858ba9717
removed unnecessary check
2020-03-05 22:19:19 +01:00
patrick-werner
bb11af20fd
improved recursive if scanning ignores
2020-03-05 22:16:35 +01:00
patrick-werner
277d22fad6
fixed missed replaces
2020-03-05 19:03:17 +01:00
patrick-werner
306efd21ac
i18n: moved i18N message handling to BaseWorkerContext
2020-03-05 18:49:25 +01:00
patrick-werner
253570a7d8
i18n: slicingHint finished
2020-03-05 16:10:49 +01:00
patrick-werner
2f596be5b0
i18n: slicingHint
2020-03-05 15:52:37 +01:00
patrick-werner
54bcac00ed
moved i18StringConstants class -> fhir.utilities
...
Extracted error messages of ProfileUtilities
2020-03-05 15:03:03 +01:00
Grahame Grieve
071a3dd927
Properly process invariants that have a source in the validator
2020-03-05 16:47:28 +11:00
Grahame Grieve
65fd77ed76
Fix version issue in validation engine + handle loading latest version of a package
2020-03-03 21:27:37 +11:00
Grahame Grieve
c923cba4e2
Merge pull request #146 from hapifhir/ja_20200302_use_validationoptions
...
Use ValidationOptions instead of TerminologyServiceOptions
2020-03-03 08:41:15 +11:00
Grahame Grieve
ca240e4659
fix for $145 -proxy Flag treated as File to validate
2020-03-03 08:37:36 +11:00
Grahame Grieve
09e3816d37
make ProfileUtilities methods not static
2020-03-03 07:41:34 +11:00
Grahame Grieve
f1d81dde81
fix version extension package issue
2020-03-03 07:40:37 +11:00
jamesagnew
109dea9a02
Use ValidationOptions instead of TerminologyServiceOptions
2020-03-02 06:18:00 -05:00
patrick-werner
08447d040e
escaped needed single quotes
2020-03-02 00:07:52 +01:00
patrick-werner
1fd35f8423
removed escape chars
2020-03-02 00:00:56 +01:00
Grahame Grieve
65f65b461a
Merge pull request #143 from hapifhir/i18n
...
I18n
2020-03-02 09:27:02 +11:00
Grahame Grieve
bc9ad8d608
fix failing tests
2020-03-02 09:00:57 +11:00
patrick-werner
b626f5867b
always check for contained key
2020-03-01 22:51:57 +01:00
patrick-werner
ca6d92c390
deleted unnecessary imports
2020-03-01 22:47:41 +01:00
patrick-werner
822b50b8d7
replaced Exception controll flow
2020-03-01 22:44:28 +01:00
patrick-werner
594d77985d
extracted Throwable messages
2020-03-01 22:37:34 +01:00
patrick-werner
ba5eea6774
fixed MessageFormat.format for messages without arguments
...
removed duplicage entry from property file
2020-03-01 22:22:52 +01:00
patrick-werner
446c9462a0
String Constant and properties ordered A->Z
2020-03-01 21:57:57 +01:00
patrick-werner
02ff8c5ddf
extracted: bpCheck|warningOrError|suppressedwarning
2020-03-01 20:54:09 +01:00
patrick-werner
013dddf2b6
Revert "extracted: bpCheck|warningOrError|suppressedwarning|*Exception|Error"
...
This reverts commit ef65d094
2020-03-01 20:34:26 +01:00
patrick-werner
ef65d09497
extracted: bpCheck|warningOrError|suppressedwarning|*Exception|Error
2020-03-01 20:28:53 +01:00
patrick-werner
3291aaf03a
manually fixed duplicated rule entry message
2020-03-01 18:30:42 +01:00
patrick-werner
8b329d283b
almost ready to merge
...
replaced all property keys, added String Constant Class
2020-03-01 18:04:08 +01:00
patrick-werner
d84f93e8a8
Merge branch 'master' into i18n
...
# Conflicts:
# org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
2020-03-01 14:50:52 +01:00
Grahame Grieve
b15d72a755
fix to compile + adjust validator messages
2020-02-29 06:21:02 +11:00
Grahame Grieve
a3d7acdf35
Release new version 4.2.4
2020-02-28 15:16:44 +11:00
Grahame Grieve
1c8797f628
support slicing on patternCoding
2020-02-28 14:27:04 +11:00
patrick-werner
f8d4b2b49d
moved Locale to IWorkerContext
...
moved LocaleHandling into BaseValidator
2020-02-26 13:00:35 +01:00
markiantorno
5984a0c693
Fixing bad quotation in string.substring
2020-02-25 14:14:40 -05:00
patrick-werner
40d6cd4108
added messageArgument aware method
2020-02-25 19:16:59 +01:00
patrick-werner
2a2d9575e5
added messageArgument aware method
2020-02-25 19:00:52 +01:00
patrick-werner
4cd4044a0e
almost done
2020-02-25 18:53:10 +01:00
patrick-werner
5be8bc9f74
Merge branch 'master' into i18n
2020-02-25 18:31:08 +01:00
patrick-werner
a80fcd345c
replacing quotation marks
2020-02-25 18:27:35 +01:00
patrick-werner
9cd6460df5
replacing quotation marks
2020-02-25 18:26:16 +01:00
patrick-werner
95e0204399
added missin quotation mark
2020-02-25 18:11:06 +01:00
patrick-werner
2814394566
externalized InstanceValidator String
...
txRule missing, still some bugs
2020-02-25 14:45:58 +01:00
patrick-werner
393d7d24fb
added message properties file
2020-02-25 14:37:10 +01:00
patrick-werner
f8bda2174b
replaced escaped quotations with single quotes for better parsability
2020-02-25 14:27:32 +01:00
patrick-werner
dc1c68e55a
added another missing closing quotation mark
2020-02-25 10:19:01 +01:00
patrick-werner
c88d763bd8
added missing closing quotation mark
2020-02-25 10:12:53 +01:00
Grahame Grieve
66b855c540
clean up validator
2020-02-25 09:24:58 +11:00
markiantorno
52246a8ce5
cleanup
2020-02-24 15:38:18 -05:00
markiantorno
3a1d621f65
reorg package structure
2020-02-24 15:30:34 -05:00
Grahame Grieve
be38cc8e58
updates for version conversion routines
2020-02-24 12:18:14 +11:00
markiantorno
dc40256af4
Cleanup
2020-02-21 17:05:49 -05:00
markiantorno
a91b9886ce
Trying to refactor the NodeStack class a little so I can pull it out
2020-02-21 16:32:20 -05:00
markiantorno
e54d7556b1
Refactoring ResourceValidationTracker
2020-02-21 16:09:13 -05:00
markiantorno
8c2679a200
Refactoring EntrySummary
2020-02-21 15:55:36 -05:00
markiantorno
23677ca155
Refactoring EntrySummary
2020-02-21 15:52:01 -05:00
markiantorno
eded933a2d
Refactoring ResolvedReference
2020-02-21 15:43:15 -05:00
markiantorno
ae30afdf53
Refactored ElementInfo
2020-02-21 15:34:55 -05:00
markiantorno
4df9e568e6
ChildIterator refactored
2020-02-21 15:23:24 -05:00
markiantorno
a00c71bb32
ChildIterator refactored
2020-02-21 15:18:44 -05:00
markiantorno
abd46acae3
Indexed Element refactored.
2020-02-21 15:06:36 -05:00
markiantorno
6af30d5f7f
refactoring InstanceValidator code for readability.
2020-02-21 14:58:02 -05:00
Grahame Grieve
8b5c8586f2
Allow search references in transactions
2020-02-18 14:34:06 +11:00
Grahame Grieve
d535bbaacb
Use packages.fhir.org
2020-02-18 14:31:09 +11:00
Grahame Grieve
52bc73a561
more fixes for Questionnaire validation
2020-02-13 12:08:05 +11:00
Grahame Grieve
91e475a1a1
fix Questionnaire EnableWhen validation + fix up tests for public package server
2020-02-13 10:13:35 +11:00
Grahame Grieve
fccd3c1871
test for existence of both lang and xml:lang on the xhtml div
2020-02-12 20:24:09 +11:00
Grahame Grieve
977026e62e
Improve error message when profile generation fails
2020-02-12 17:44:54 +11:00
Grahame Grieve
0f74f25078
Add more debugging for conversion failures
2020-02-12 17:44:19 +11:00
Grahame Grieve
4708fcb49e
add support for file: in package version (per NPM spec)
2020-02-09 08:14:30 +11:00
James Agnew
076ee562e3
Avoid trying to fetch SD by null URL (test case added)
2020-02-06 11:16:17 -05:00
James Agnew
57136da0bb
Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core
2020-02-05 20:11:10 -05:00
James Agnew
6e2b58a4be
Remove debug code
2020-02-05 20:10:52 -05:00
Grahame Grieve
df9e11c40a
fix bug in validator on search params with no references + fix bug in cache manager on github urls
2020-02-02 22:52:43 +11:00
Grahame Grieve
53fc5cf770
add logic to test capability statement
2020-02-02 06:13:24 +11:00
Grahame Grieve
6e9fd79a2a
Add support for assumeValidRestReferences
2020-01-31 08:20:33 +11:00
Grahame Grieve
d807becebb
improve slicing hints and fix validation of FHIRPath URLs
2020-01-30 11:08:12 +11:00
Grahame Grieve
c7f3a47ec9
better rendering of slicing logic
2020-01-30 11:05:54 +11:00
Grahame Grieve
01c5789b89
Deal with choices that constrain elements and not types
2020-01-29 19:32:43 +11:00
Grahame Grieve
1c3061dbf7
track slice validation for users to resolve slicing issues
2020-01-29 13:39:49 +11:00
Grahame Grieve
cb1fa1dad9
fix bug in validator around fullUrl testing
2020-01-29 06:51:22 +11:00
markiantorno
3132dbfc7f
Refactored main version convertor files
...
- All convertors now have static access, previously 10_30, 10_40, 10_50
needed to be instantiated
- All code specific to resource types has been moved into it's own file.
Ex. Patient dstu3 -> r5 is located in conv30_50/Patient30_50.java
2020-01-27 10:29:42 -05:00
Grahame Grieve
00080d7c48
change resolve interface (pass source as well) + don't validate perferred if any other profiles are specified + fix bug resolving references in bundles + pre-calculate bundle references
2020-01-27 21:14:40 +11:00
Grahame Grieve
ab0f3f0996
autofix slice names
2020-01-27 21:13:02 +11:00
Grahame Grieve
9e0e8fec3b
fixes for change to validator resolve interface
2020-01-27 21:12:09 +11:00
Grahame Grieve
f69173d445
fix bug checking reference type and allow tools extensions
2020-01-24 17:19:33 +11:00
Grahame Grieve
9b64f03a3e
Merge pull request #104 from ahdis/oliveregger_fmltests
...
FML updates for tests and validator
2020-01-22 06:17:10 +11:00
Grahame Grieve
a09a657be7
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
...
# Conflicts:
# org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
2020-01-21 12:25:48 +11:00
Grahame Grieve
300c87a657
better validation of example references by validator
2020-01-21 11:38:05 +11:00
patrick-werner
610989c24d
fixed check for "URI values cannot have whitespace"
2020-01-20 17:37:38 +01:00
Grahame Grieve
240e412cf6
Release new version
2020-01-20 21:56:07 +11:00
Grahame Grieve
2ce844175f
fix bugs with extension context checking
2020-01-19 16:53:48 +11:00
Grahame Grieve
6d87bebfe3
implement contextInvariant, and finish implementing memberOf
2020-01-17 21:41:33 +11:00
Grahame Grieve
6300ba24b7
rebuild instance validator to get reference profile checking working properly, many downstream issues with validation uncovered and fixes
2020-01-17 10:51:42 +11:00
Grahame Grieve
8482ba43c5
refactor profile handling in validator
2020-01-16 23:37:30 +11:00
Grahame Grieve
c13de56203
fixes to snapshot generation and validation for Bundle.tnry slicing by resource profile
2020-01-15 17:55:24 +11:00
Grahame Grieve
f2b7c518c5
handle validation for current version better
2020-01-15 08:07:20 +11:00
Grahame Grieve
362ae7bd5f
Improve code system validation error messages
2020-01-14 10:40:57 +11:00
Grahame Grieve
6840eb3133
add icd-10 to known url list
2020-01-13 23:18:27 +11:00
Grahame Grieve
184e923c0c
Add icd-10 to known url list
2020-01-13 23:17:26 +11:00
Oliver Egger
0ad3882132
FML updates for tests and validator
2020-01-11 00:10:07 +01:00
Grahame Grieve
377aaed23c
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2020-01-11 06:25:03 +11:00
Grahame Grieve
ef085a847e
fix how CodeableConcept is validated, and add Tx interaction logging by validator
2020-01-11 06:22:16 +11:00
Grahame Grieve
7c0645d119
Merge pull request #113 from hapifhir/prepareMulitLang
...
extracted errorMessage building
2020-01-11 06:06:05 +11:00
Grahame Grieve
8b25da3443
re-org validator tests
2019-12-30 10:25:59 +11:00
Grahame Grieve
91cf756386
fix bugs in v1.4 validation
2019-12-30 10:25:05 +11:00
Grahame Grieve
0fbbd1ff02
re-org R5 source core preparatory to regenerating
2019-12-22 08:05:58 +11:00
Grahame Grieve
3f09f99356
fix xver extension synthesis
2019-12-21 09:13:34 +11:00
Grahame Grieve
44893b89b9
be specific about which resource types to cache up from core package
2019-12-21 09:13:18 +11:00
Grahame Grieve
9e62243e67
fix error validating references to search parameters
2019-12-20 08:00:20 +11:00
Grahame Grieve
001ca1f755
improve error message when slicing broken
2019-12-19 21:48:32 +11:00
Grahame Grieve
a732d84037
Release new version
2019-12-19 17:36:36 +11:00
Grahame Grieve
b83302092b
Deal with data type changes between versions for cross version extensions
2019-12-19 17:35:54 +11:00
Grahame Grieve
7d86a93d52
improve error message around fixed values
2019-12-19 12:58:18 +11:00
Grahame Grieve
3ce532968a
Cross version extennsion support + improve extension validation
2019-12-19 10:50:25 +11:00
Grahame Grieve
4922522adf
improve test output for hints
2019-12-19 10:48:52 +11:00
Grahame Grieve
48473f3b5c
fix up NativeHostServive and add tests for it
2019-12-18 11:41:40 +11:00
Grahame Grieve
ac923179d1
fix todo in validator
2019-12-16 23:36:43 +11:00
Grahame Grieve
ba4628eb28
fix OID translation case
2019-12-13 22:05:49 +11:00
Grahame Grieve
ea7f3a7957
refactor validation options, and improve codeableConcept validation, and improve code system rendering
2019-12-12 10:33:22 +11:00
patrick-werner
99786a87d2
replaced String.format
2019-12-11 15:06:15 +01:00
patrick-werner
215afe52dd
extracted errorMessage building
2019-12-11 14:50:52 +01:00
Grahame Grieve
1fb2da565b
fix issue not validating displays in CodeableConcepts
2019-12-11 18:12:47 +11:00
Grahame Grieve
234cca0471
Release new version
2019-12-09 17:45:28 +11:00
Grahame Grieve
250496c9b1
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-12-09 17:36:02 +11:00
Grahame Grieve
ebb3170a24
improve error message for fixed value, and fix handling of profile choices
2019-12-09 17:35:11 +11:00
Grahame Grieve
f04fdc7931
check info count in test suite
2019-12-09 17:34:13 +11:00
Grahame Grieve
8482e5cc3b
fix version display
2019-12-09 17:33:29 +11:00
Grahame Grieve
4aeb9f0bcc
fix up version display on validator
2019-12-09 17:29:12 +11:00
Grahame Grieve
a6ccb8d835
Merge pull request #112 from hapifhir/minor_polish
...
merged 2 if statement into 1
2019-12-07 07:08:55 +11:00
Grahame Grieve
5cfa2ffe0d
Add deeper profile testing support
2019-12-07 06:55:58 +11:00
Grahame Grieve
0cbb586dd1
add support for integer64
2019-12-07 06:54:16 +11:00
patrick-werner
03473a585a
merged 2 if statement into 1
2019-12-06 11:12:47 +01:00
Grahame Grieve
62c1f0af77
set snomed extension in validator
2019-12-03 12:33:16 +11:00
Grahame Grieve
a301973ce0
update validator for new R5 rule around messages
2019-12-03 12:32:37 +11:00
Grahame Grieve
4a282a3d66
Post devdays validation blitz
2019-11-29 13:26:03 +11:00
Grahame Grieve
60703efdd4
updates for packages changes
2019-11-26 18:56:52 +11:00
Grahame Grieve
e52c78daa2
Merge pull request #101 from ahdis/oliveregger_validator_logicalmodel
...
validator enhancement for logical models (conversion) and FHIRPath expressions
2019-11-19 08:46:40 +13:00
Grahame Grieve
aebb7dd407
Merge pull request #103 from ahdis/oliveregger_valabsolutetypes
...
validator support for absolute type definitions
2019-11-19 08:43:02 +13:00
Grahame Grieve
bd8df9ba90
Merge pull request #106 from ahdis/oliveregger_validator_transform_r4
...
fml: validator change transform to elementmodel
2019-11-19 08:39:18 +13:00
Grahame Grieve
fb8974efd5
fix problem with rootResource and Bundles and contained resources
2019-11-17 19:05:24 +11:00
Grahame Grieve
2aacccd5bb
recognise SIDs in validator
2019-11-17 03:10:58 +11:00
Oliver Egger
b86f5a5ac8
use ElementModel for FML in create
2019-11-15 16:52:09 +01:00
Oliver Egger
58bee0754a
fml: validator change transform to elementmodel
2019-11-13 19:42:00 +01:00
Oliver Egger
ea786ddedc
evaluate FHIRPath for resource or logical model
2019-11-13 13:40:29 +01:00
Oliver Egger
ace4623f42
convert a resource or logical model to xml/json
2019-11-13 13:37:29 +01:00
Grahame Grieve
5fe2552a08
fix version bug generating snapshot
2019-11-12 09:07:54 +11:00
Oliver Egger
86e84a024a
validator support for absolute type definitions
2019-11-11 14:57:28 +01:00
Grahame Grieve
e45aae4867
fix package dependency loading bug + package saving bug
2019-11-12 00:17:07 +11:00
Grahame Grieve
52b80cf71c
load dependency Packages, and load content from URL correctly
2019-11-11 14:20:52 +11:00
Grahame Grieve
1d193e7c87
rework version loading when validating
2019-11-10 21:07:34 +11:00
Grahame Grieve
0fcb97aa2f
validation documentation improvements, and batch loading
2019-11-09 07:54:16 +11:00
James Agnew
0eb9f4f75b
Troubleshooting classpath issue
2019-11-07 16:15:37 -05:00
Grahame Grieve
02791ae21f
update MIMIC code and reverse testing change (maven said no)
2019-11-07 20:57:16 +11:00
Grahame Grieve
7099f904f5
more work on cache management
2019-11-07 12:04:24 +11:00
Grahame Grieve
52187af17a
Fix for R3 and R4 technical corrections and getting IGs publishing and passing (and fix version markers)
2019-11-01 11:21:06 +11:00
Grahame Grieve
888356999e
Update to support new packages, new NPM specification
2019-10-31 21:54:10 +11:00
Grahame Grieve
efd20a22fe
move test cases to fhir-test-cases repository
2019-10-28 18:06:41 +11:00
Grahame Grieve
1a89103ec5
Merge branch 'master' into ja_20191025_refactor_testcases
2019-10-28 12:11:14 +13:00
Grahame Grieve
08eb187b79
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-10-28 10:06:02 +11:00
James Agnew
34cf0628d1
Fix https://github.com/jamesagnew/hapi-fhir/issues/1549 - Account for
...
latest HAPI FHIR API interfaces
2019-10-27 17:44:22 -04:00
James Agnew
5c96742a16
Remove fixme
2019-10-25 18:00:50 -04:00
James Agnew
b68c62ff57
Refactor project to use external testcases
2019-10-25 17:59:40 -04:00
Grahame Grieve
34c4faed8f
fix enable when validator
2019-10-25 15:41:29 +11:00
Grahame Grieve
22f4a5a58f
fix document validation + add questionnaire validation tests
2019-10-25 13:25:52 +11:00
Grahame Grieve
5afc745424
check type of target resource
2019-10-25 10:23:15 +11:00
Oliver Egger
d446b4da02
allow absolute url for type.code, take 2
2019-10-22 22:50:03 +02:00
Oliver Egger
a67fe0b346
allow absolute url for type.code
2019-10-22 14:06:26 +02:00
James Agnew
2f380704de
Fix precision and validator issues
2019-10-18 10:47:20 -04:00
Grahame Grieve
8be35cc22e
Release new version
2019-10-16 09:36:57 +11:00
Grahame Grieve
9d4592730a
fix for problem with contained resources
2019-10-07 21:31:49 +07:00
Grahame Grieve
3e5fadecb0
fix issues validating resources with references
2019-10-02 14:51:43 +10:00
Grahame Grieve
fb152a24e5
Release new version
2019-09-27 14:16:04 +10:00
I325048
4f9118e9da
fix: use proper target object
2019-09-17 21:17:00 +05:30
Grahame Grieve
d857d546e5
fix test case
2019-09-18 00:23:01 +10:00
Grahame Grieve
e998722d1b
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-09-18 00:02:24 +10:00
Grahame Grieve
6fe8c492d3
more testing of FHIRPath reference resolution
2019-09-18 00:02:01 +10:00
James Agnew
c6cbf7d7a6
Allow valdation of string values in openchoice ( #81 )
2019-09-16 16:04:46 -04:00
Grahame Grieve
3a5c2eea2c
add Questionnaire example for #1062
2019-09-17 00:02:11 +10:00
Grahame Grieve
2489588d55
try yo fix tests
2019-09-15 21:57:47 +10:00
Grahame Grieve
9d164ef153
fix failing test
2019-09-15 20:42:21 +10:00
Grahame Grieve
03e928342e
Release new version
2019-09-15 01:59:25 +10:00
Grahame Grieve
9256224edc
fix failing tests
2019-09-15 01:41:59 +10:00
Grahame Grieve
3f75f9c605
more work on profile comparison
2019-09-13 00:26:25 +10:00
Grahame Grieve
6dd7346cad
more work on capability statement comparison
2019-09-12 18:31:26 +10:00
Grahame Grieve
faa4b82b2e
fix to support validating straight out of published IGs
2019-09-12 04:44:26 +10:00
Grahame Grieve
7bd5d85611
better error message
2019-09-11 22:22:05 +10:00
Grahame Grieve
1d7c80f10c
add memory info + xkcd bug link
2019-09-11 15:35:45 +10:00
Grahame Grieve
b2d2bebd85
Ad scan mode to validator
2019-09-09 13:32:11 +10:00
Grahame Grieve
b91ca35e3d
Add proxy support for validator
2019-09-06 10:14:06 +10:00
Grahame Grieve
d49dfab97a
fix error in validator for fixed value
2019-09-03 13:05:16 +10:00
Grahame Grieve
1a14bfc9e8
Change rules about how maxValueSet is validated
2019-09-02 16:04:21 +10:00
Grahame Grieve
ea913ceb30
fix problem validating LOINC codes
2019-09-02 13:48:19 +10:00
Grahame Grieve
09b74eab50
test max value set handling.
2019-09-02 11:27:19 +10:00
Grahame Grieve
34a3dfb43e
work on API comparison
2019-08-29 18:11:33 +10:00
Grahame Grieve
512c3932a3
Reconcile R4/R5 implementations
2019-08-23 15:38:58 +10:00
Grahame Grieve
c794c9393b
add validator test for duplicate properties in json
2019-08-23 14:57:30 +10:00
Grahame Grieve
3d7f701b00
update for changes to representation of special elements
2019-08-23 14:57:05 +10:00
Grahame Grieve
6d611afd48
fix so recursive loading is only by request
2019-08-18 18:15:18 +10:00
Grahame Grieve
539eee9266
Merge pull request #65 from hapifhir/iterate-subfolders
...
scanDirectory now scans all subfolders
2019-08-18 18:06:19 +10:00
Grahame Grieve
909535eea2
fix problems with skipping unknown content, and empty differentials
2019-08-18 17:47:48 +10:00
Grahame Grieve
fb249ea098
fix for narrative rendering problem with OperationDefinition
2019-08-16 07:16:24 +10:00
Grahame Grieve
75d86a15ee
set exit code to number of errors
2019-08-14 17:34:07 +10:00
Grahame Grieve
3842dbeb99
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-08-09 04:41:53 +10:00
James Agnew
d1c3e522ab
Improve validator error message if a fixed coding can't be matched
2019-08-08 14:39:45 -04:00
Grahame Grieve
7ef320b6bb
fix ref-1 constraint (define %rootResource)
2019-08-08 21:03:27 +10:00
James Agnew
ce392c47bb
Improve naming of error flag on profile registration
2019-08-07 05:37:03 -04:00
James Agnew
c1728a481d
Refactor R4 infrastructure to use the new common
...
TerminologyServiceOptions, and tweak the validation of enableWhen to
handle a few edge cases correctly.
2019-08-06 18:27:45 -04:00
Grahame Grieve
c57f578f03
Move TerminologyServiceOptions to Utilities.
2019-08-06 07:33:48 +10:00
Grahame Grieve
ce4453b0cb
Support slicing by value set using contained value sets
2019-08-05 15:48:50 +10:00
Grahame Grieve
9d1d64bb59
more working on test suite
2019-08-05 15:48:07 +10:00
Grahame Grieve
1d10470e9c
slicing by value set tests
2019-08-05 15:47:30 +10:00
Grahame Grieve
9e0a1de74c
rework slicing validation tests
2019-08-05 12:41:54 +10:00
Grahame Grieve
0a05788e57
improve error message
2019-08-05 11:33:06 +10:00
Grahame Grieve
670ae0c79a
update R5 validator
2019-08-04 07:38:45 +10:00
Grahame Grieve
4ffa343395
add -debug parameter to validator, and add additional (failing) validator tests, and update R4 code
2019-08-04 07:34:13 +10:00
Grahame Grieve
a26abe87ca
Improved error message & resource resolution
2019-08-02 14:48:34 +10:00
Grahame Grieve
0cea5c2bcc
validation fixes for bundle resolution
2019-08-02 10:50:25 +10:00
Grahame Grieve
bf9ead2c9e
fix rendering of special compiler types
2019-08-01 11:38:09 +10:00
Grahame Grieve
564d9262c6
fix test
2019-08-01 10:55:10 +10:00
Grahame Grieve
fb8b2dcd70
add new test case
2019-08-01 10:54:17 +10:00
Grahame Grieve
23b575d4f9
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-08-01 08:11:27 +10:00
Grahame Grieve
cac82546da
more snapshot generation tests and fixes
2019-08-01 08:11:21 +10:00
Lloyd McKenzie
407168cf87
New test for snapshot generation not exposing extensions
2019-07-31 11:40:53 -06:00
Lloyd McKenzie
c2d3afba99
Merge into current branch
2019-07-30 23:41:04 -06:00
Lloyd McKenzie
7c1786279f
Fix problem with link resolution within Bundles - and add test case that checks it. (Also update Synthea test case to reflect new status codes for Encounter.)
2019-07-30 23:23:48 -06:00
Grahame Grieve
a234984179
various minor fixes for IG publication
2019-07-31 14:44:38 +10:00
Grahame Grieve
f5b5737398
fix validation tests
2019-07-30 16:50:54 +10:00
Grahame Grieve
fe219985b4
fix decimal validation + fix profile slicing validation
2019-07-30 16:22:54 +10:00
patrick-werner
270a8bca71
scanDirectory now scans all subfolders
2019-07-26 19:02:13 +02:00
Grahame Grieve
538540619f
compile updates
2019-07-19 23:20:17 +10:00
James Agnew
e265477c6e
Header updates
2019-07-14 09:27:45 -04:00
James Agnew
0acb99744b
Changes needed to move HAPI FHIR to using this project directly ( #61 )
...
* Work on porting HAPI FHIR to core
* Ongoing work on HAPI FHIR merge
2019-07-14 08:55:21 -04:00
Grahame Grieve
58da7557d8
fix validation problems with questionnaires, and allow tests to still run even when offline
2019-07-13 20:50:53 +10:00
Rob Hausam
fa235a00db
Remove line instead of comment it out.
2019-07-10 20:22:05 -04:00
Rob Hausam
1cb23a14c8
Fix build - remove unneeded junit import.
2019-07-10 20:22:05 -04:00
Grahame Grieve
3a5d7146a7
check security tags are a set
2019-07-09 06:58:03 +10:00
Grahame Grieve
f3a21e4bd6
fix issue 58 - wrong support for r4
2019-07-09 06:19:10 +10:00
Grahame Grieve
e2d52143d9
get tests passing
2019-07-06 07:39:25 +10:00
Grahame Grieve
bc30ea197e
Merge pull request #56 from ahdis/oliveregger_maps3To4
...
unit test conversions r3r4
2019-07-06 07:21:02 +10:00
Grahame Grieve
f583649f87
fix generation of error locations using FHIRPath or XPath properly
2019-07-05 20:23:58 +10:00
Oliver Egger
992f870cb4
unit test conversions r3r4
2019-06-27 00:28:32 +02:00
Vadim Peretokin
d574178d6b
Don't crash on bad files present in IG, ignore & warn instead
2019-06-26 18:07:19 +02:00
Grahame Grieve
3b76303d83
fix validator bug (issue 47)
2019-06-19 09:07:29 +10:00
Grahame Grieve
23eb7282bd
Support displayLanguage through validator framework
2019-06-16 14:02:09 +10:00
Grahame Grieve
8798c5cf58
fix CDA parsing
2019-06-15 08:05:24 +10:00
Grahame Grieve
b972620ed1
more fixes
2019-06-08 06:23:01 +10:00
Grahame Grieve
2bdd175591
Release new version
2019-06-08 06:19:01 +10:00
Grahame Grieve
299014c606
Merge pull request #45 from lmckenzi/bad-bundle-reference-types
...
Bad bundle reference types
2019-06-08 05:26:50 +10:00
Lloyd McKenzie
ce26cae736
Fixed issue where wrong profile was being used, suppressed message when it wasn't needed
2019-06-05 23:40:06 -04:00
Lloyd McKenzie
f44bb526c2
Fixed problem with inconsistent values for refTypes
...
Check that when referencing resources by type/id when the target has a urn:uuid fullUrl that the type matches as well as the id.
2019-06-05 20:38:00 -04:00
Lloyd McKenzie
2a2005f93b
1. Cleaned up test cases to work after version changes in R5 (not sure what to do with uk one and patient-contained-org I'll work on next)
...
2. Added new test case for (and fixed issue with) validation problems when there are multiple target profiles declared that have the same resource type. (Previously, the validator was always choosing the first profile, even if it was invalid.)
3. Fixed problems where certain profiles were triggering silent NPEs in the validator and improved console messaging so you can tell what warnings and errors are being generated for what.
2019-06-04 20:50:49 -04:00
Grahame Grieve
766f6b55ed
add openAPI tests
2019-06-03 19:38:10 +10:00
Vadim Peretokin
ed32fca1d4
Also output JSON if requested for narrative, snapshot generation & transformations
2019-06-02 14:08:58 +02:00
Grahame Grieve
7d38ed4161
Merge pull request #38 from vadi2/improve-help
...
Be more explicit that you can pass a folder of resources to validate
2019-06-02 17:14:50 +10:00
Grahame Grieve
809e0a3a92
Merge pull request #37 from vadi2/ignore-package.json
...
Exempt package.json from being parsed as a FHIR resource
2019-06-02 17:14:24 +10:00
Vadim Peretokin
7813537fbb
Be more explicit that you can pass a folder of resources to validate
2019-06-02 08:28:53 +02:00
Vadim Peretokin
271c0cf0fc
Exempt package.json from being parsed as a FHIR resource
2019-06-02 08:11:05 +02:00
Vadim Peretokin
56a8efbb6d
Fix ignore filter in validator's directory scanning filter to actually work
2019-06-02 07:25:11 +02:00
Vadim Peretokin
2b6ebb71bb
Serialise -output as json if the filename ends on ".json"
2019-05-31 16:00:20 +02:00
Grahame Grieve
8b01f1df19
validation chagnes
2019-05-31 10:21:01 +10:00
Grahame Grieve
ee30d93b30
Merge pull request #33 from ahdis/oliveregger_bundledocval#32
...
bundledocvalidation issue#32
2019-05-31 10:17:42 +10:00
Grahame Grieve
9802237799
Merge pull request #31 from ahdis/gf#21240_3
...
Gf#21240 3: adding support patternIdentifier
2019-05-31 10:11:54 +10:00
Oliver Egger
e7ae35f41c
bundledocvalidation issue#32
2019-05-30 18:54:22 +02:00
Oliver Egger
aaea36038d
enhancing validation for patternIdentifier
2019-05-30 12:04:16 +02:00
Oliver Egger
6d94627465
adding patternIdentifier samples
2019-05-30 12:03:23 +02:00
James Agnew
f063219cde
Port fix from https://github.com/jamesagnew/hapi-fhir/pull/1228 via
...
Matti Uusitalo
2019-05-29 21:14:55 -04:00
Grahame Grieve
e3faaa5ccc
fix up display validation on codes
2019-05-29 08:39:59 +10:00
Grahame Grieve
847b6a1fc8
validation fixes for US-Core testing
2019-05-28 19:18:04 +10:00
Grahame Grieve
c9a3d8efc0
Merge branch 'master' into ValueSet-display-names
2019-05-28 08:01:09 +10:00
Grahame Grieve
2cc62df915
extend validator to handle contained profiles
2019-05-25 07:23:20 +10:00
Grahame Grieve
b6d5aa63c0
Merge pull request #27 from aehrc/issue/25
...
relax validation rules for implicit valusets
2019-05-25 06:52:24 +10:00
Lloyd McKenzie
88f3924ba7
New test case - contained profiles not supported by validator and validator doesn't check profiles asserted on references to contained resources.
2019-05-23 14:19:15 -06:00
Lloyd McKenzie
5bac79a936
Add test case for validator complaining about display names that are defined in the value set.
2019-05-23 13:33:34 -06:00
Grahame Grieve
24b6305b15
more validator tests + release new utilities
2019-05-23 13:39:21 +10:00
Grahame Grieve
0e8449d093
get all validation tests passing
2019-05-22 11:16:59 +10:00
Grahame Grieve
4e0c33755e
fix problem where slicing depends on inner slicing
2019-05-22 11:13:47 +10:00
Grahame Grieve
c5ace67136
fix evaluation of discriminators where elements may repeat
2019-05-22 11:12:56 +10:00
Michael Lawley
29f253bf2c
relax validation rules for implicit valusets
2019-05-21 15:46:27 +10:00
Grahame Grieve
1b5d17d6ef
fix failing validation tests
2019-05-20 16:53:04 +10:00
Grahame Grieve
58724b3694
Merge pull request #23 from ahdis/olivergger_gf#21240_2
...
[gf#21240]: fixing pattern[x] slices validation
2019-05-20 14:57:22 +10:00
Grahame Grieve
607817f4ce
Merge pull request #26 from lmckenzi/Snapshot-Test-error-handling
...
Snapshot test error handling
2019-05-20 14:57:07 +10:00
Oliver Egger
43d7de3559
fix manifest
2019-05-15 17:58:34 +02:00
Oliver Egger
bf99a3d8e7
[gf#21240]: fixing pattern[x] slices validation
2019-05-15 17:31:36 +02:00
Oliver Egger
d023628016
[gf#21240]: illustrating pattern[x] slices validation problem
2019-05-15 17:31:21 +02:00
Grahame Grieve
a67693bc4b
tidy up and work on tests.
2019-05-15 13:26:14 +10:00
Grahame Grieve
4e8e643df2
Merge pull request #22 from ahdis/oliveregger_gf#21472
...
[GF#21472]: org.hl7.fhir.core: Validator cannot validate BP Profile
2019-05-15 12:40:05 +10:00
Grahame Grieve
6030ea7953
Merge pull request #21 from ahdis/olivergger_gf#21240
...
[gf#21240]: org.hl7.fhir.core: Validation support for pattern[x]
2019-05-15 12:39:22 +10:00
Grahame Grieve
c17c2802d5
Merge pull request #18 from lmckenzi/Problem-with-polymorphic
...
Problem with polymorphic
2019-05-15 12:31:46 +10:00
Grahame Grieve
a8c335827f
more validation tests
2019-05-14 15:54:20 +10:00
Lloyd McKenzie
d998bfacec
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-05-13 18:45:13 -06:00
Lloyd McKenzie
2f817de46e
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
...
# Conflicts:
# org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
2019-05-13 18:29:13 -06:00
Grahame Grieve
8837fb3fd3
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-05-10 00:08:31 +10:00
Grahame Grieve
2d946790d7
generated patterns + improved package cache errors
2019-05-10 00:08:18 +10:00
James Agnew
95233858aa
A couple of validator improvements
2019-05-06 10:12:15 -04:00
Oliver Egger
30803a7a41
[GF#21472]: org.hl7.fhir.core: Validator cannot validate BP Profile
2019-05-06 11:34:20 +02:00
Oliver Egger
e6f0b26e81
[GF#21240]: support for pattern primitive Types and CodeableConcept
2019-05-05 15:46:44 +02:00
Oliver Egger
9a0c619d28
[GF#21240]: validation examples to illustrate
2019-05-05 14:31:54 +02:00
James Agnew
aa5e132307
Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core
2019-04-29 15:03:15 -04:00
James Agnew
6dfac49198
Improve suport for enableWhen validation
2019-04-29 14:46:55 -04:00
Grahame Grieve
88646a8216
Release new version
2019-04-27 09:10:16 +10:00
Oliver Egger
bce35251f3
GF#21004: fixed values for complex types
2019-04-26 16:41:33 +02:00
Oliver Egger
c3bc29f06a
GF#21004: validation examples to illustrate
2019-04-26 16:34:54 +02:00
Grahame Grieve
2ab02e2e0b
fix validation problem for current version
2019-04-25 10:13:28 +10:00
James Agnew
89b5e6964d
Whoops - Last fix was incorrect
2019-04-17 21:32:46 -04:00
James Agnew
3d366c2aa3
Fix typo in validator
2019-04-17 20:47:00 -04:00
James Agnew
2176e7c64d
Clean up enableWhen testing in validator for Questionnaire resources
2019-04-17 15:54:40 -04:00
Lloyd McKenzie
3e95b584bc
Merge branch 'master' into Problem-with-polymorphic
2019-04-13 17:46:47 -06:00
Lloyd McKenzie
67b50b286f
Resolved merge issue
2019-04-13 17:45:02 -06:00
Lloyd McKenzie
aee4e7da85
Test case showing problem when slicing polymorphic types
2019-04-13 17:37:02 -06:00
Grahame Grieve
ae26c82956
Merge pull request #17 from lmckenzi/extension-value-slicing
...
Fixed problem where discriminators containing the extension function …
2019-04-14 09:22:01 +10:00
Lloyd McKenzie
e8e8c1af4e
Fixed problem where discriminators containing the extension function didn't properly look for fixed value in the profile but instead always went to the extension definition.
2019-04-13 17:11:12 -06:00
Grahame Grieve
cf6a4bb51f
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2019-04-14 07:59:47 +10:00
Grahame Grieve
87b191fc5d
more IG maintenance work
2019-04-14 07:59:17 +10:00
Grahame Grieve
0d8b6d18a9
Merge pull request #15 from jkiddo/patch-1
...
Update InstanceValidator.java
2019-04-11 07:27:11 +10:00
Jens Kristian Villadsen
44a669b4bb
Update InstanceValidator.java
...
Corrected spelling
2019-04-10 22:52:39 +02:00
Jens Kristian Villadsen
991dcb656c
Update InstanceValidator.java
...
Corrected spelling
2019-04-10 22:50:21 +02:00
Grahame Grieve
599156202a
validate using inline questionnaires
2019-04-09 17:48:51 +10:00
Grahame Grieve
0dad5ac58e
validation related updates for IG publication
2019-04-09 14:24:05 +10:00
Grahame Grieve
3e9262afe8
Release new version
2019-04-04 11:53:45 +11:00
Grahame Grieve
f67c6e2ed8
fix spelling mistake
2019-03-26 05:47:13 +11:00
Grahame Grieve
c8c815aa44
more debugging for questionnaire validation
2019-03-18 13:29:36 +11:00
Grahame Grieve
34953525cc
fix bug evaluating questionnaire items enable status when enableBehavior is not specified
2019-03-17 09:10:40 +11:00
Grahame Grieve
b0260fbfd8
fix for questionnaire evaluation bug
2019-03-16 05:26:38 +11:00
Grahame Grieve
5653da8a27
add test for multiple discriminators, and fix validator
2019-03-05 16:59:04 +11:00
Grahame Grieve
adf972be25
allow getting children in a profile on a diff
2019-03-05 14:25:28 +11:00
Grahame Grieve
0477bf174e
GF#20480 - change error about year to warning
2019-03-05 09:10:07 +11:00
Grahame Grieve
58b3ca2c88
liquid generation in narrative generator, render min/max value sets, fix broken links in IGs from relative references in links in markdown in core
2019-03-05 06:52:15 +11:00
Grahame Grieve
88c145a00c
fixes for validation loading
2019-03-04 15:30:33 +11:00
Grahame Grieve
5a1dfba236
Improve error message when running transforms
2019-03-04 13:17:30 +11:00
Grahame Grieve
5691333e98
GF#18121 - fix so relative links in source markdown don't generate broken linke in IGs
2019-03-04 11:53:14 +11:00
Grahame Grieve
cde0df1118
fix CapabilityStatement generation
2019-03-04 11:06:33 +11:00
Oliver Egger
d60d089c23
[GF#20482] FHIRPath conformsTo Validation of Warnings/Error handling
2019-02-27 23:31:56 +01:00
Grahame Grieve
445c90ff9a
test
2019-02-24 21:31:47 +11:00
Grahame Grieve
a04b900054
fix tests
2019-02-08 16:56:53 +11:00
James Agnew
223ea04d28
Merge changes from user submitted HAPI FHIR PR: https://github.com/jamesagnew/hapi-fhir/pull/1148
2019-02-05 17:43:50 -05:00
James Agnew
caf7cea4c6
Get validator CLI working
2019-01-31 15:51:34 -05:00
Grahame Grieve
364ed14c2a
rename package cache operations for clarity + upgrade for version release
2019-02-01 06:09:03 +11:00
Grahame Grieve
f2b619b08e
fix bugs in FHIRPath engine, and work around wrong FHIRPath statements in the validator
2019-01-31 11:59:39 +11:00
Grahame Grieve
10589ea559
finish getting tests passed
2019-01-29 14:04:36 +11:00
Grahame Grieve
40c0a58eb3
more working on tests
2019-01-29 11:00:01 +11:00
Grahame Grieve
9e583e8e35
work on getting validation tests to pass
2019-01-29 08:34:34 +11:00
Grahame Grieve
528e9e2e5e
fix to compile
2019-01-15 05:59:11 +11:00
Grahame Grieve
1169a4c293
get tests passing
2019-01-15 05:12:18 +11:00
James Agnew
bd899957b0
Rename the keep files
2019-01-13 16:37:16 -06:00
James Agnew
cbde1cf488
Add keeps for empty folders
2019-01-13 16:20:50 -06:00
James Agnew
4991942755
Clean up project for Eclipse
2019-01-13 15:25:55 -06:00
James Agnew
806ab9fac8
Externalized code now committed
2019-01-13 14:33:14 -06:00