Commit Graph

573 Commits

Author SHA1 Message Date
b.debeaubien 7f965c447f ServerProfileProvider now uses IdDt.getIdPart() rather than getValue() so that it can find the profiles in in FhirContext's myIdToResourceDefinition. 2014-10-27 13:53:01 -04:00
James Agnew d756b73fa5 Docs 2014-10-24 16:24:06 -04:00
James Agnew c0ed32c49a More work on versions 2014-10-24 16:21:01 -04:00
James Agnew d170c1e408 More work on DEV 2014-10-24 16:10:54 -04:00
James Agnew c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
James Agnew 69ee8a4777 Documentation updates 2014-10-23 12:32:54 -04:00
James Agnew 8f02bd734e Docs for release 0.7 2014-10-23 10:58:15 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew 084d0d3010 Doc updates 2014-10-21 13:23:25 -04:00
James Agnew 81ddb3f1d5 More versions work 2014-10-20 18:59:02 -04:00
lmds1 ebb906adae updated generated files with license comment from hapi-fhir-base build 2014-10-20 15:17:09 -04:00
lmds1 11f5a08814 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-20 14:19:25 -04:00
lmds1 45a3fa8254 updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource 2014-10-20 14:19:18 -04:00
James Agnew b07b8b9845 Start adding DEV structures 2014-10-17 18:08:37 -04:00
James Agnew 4f8eec4075 Add an example for #35 - Cookie Interceptor 2014-10-17 16:39:47 -04:00
James Agnew e31970f095 Merge pull request #35 from petromykhailysyn/master
Added Cookie interceptor.
2014-10-17 16:29:54 -04:00
James Agnew 79f92e8728 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-17 16:03:48 -04:00
James Agnew b2efa07a05 Doc updates 2014-10-17 16:03:33 -04:00
James Agnew d140e0b829 Merge pull request #34 from jjathman/remove-validation-exception
Fixes #32 - removes new validation API that doesn't use exceptions
2014-10-17 15:41:21 -04:00
James Agnew cdb1b2d03e Move Vagrant documentation into its own file 2014-10-17 15:23:04 -04:00
James Agnew 47edfb7b01 Almost have versions tests passing 2014-10-17 14:51:45 -04:00
petromykhailyshyn 10c49d2bd3 Added Cookie interceptor. 2014-10-17 12:52:09 +03:00
James Agnew bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -04:00
James Agnew 1d29b2b642 Still more versions work 2014-10-16 13:41:57 -04:00
James Agnew dbc07dcb50 More versions work 2014-10-16 11:46:25 -04:00
lmds1 a642745095 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-16 10:48:58 -04:00
lmds1 5a742a492b added missing resourcetypeenums 2014-10-16 10:48:51 -04:00
James Agnew 287162af91 Fix #33 - Server was incorrectly returning contained resources as
top-level resources
2014-10-15 16:46:28 -04:00
lmds1 9f62d18b9f Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-15 15:22:45 -04:00
lmds1 fdd9939d16 added resource type to IResource so all resource subclasses must declare what type they are (to facilitate auditing of resources) 2014-10-15 15:22:42 -04:00
James Agnew b22bcaec32 More cleanup for contained resources 2014-10-15 14:34:14 -04:00
Joseph Athman 2741f1cae5 Fixes #32
Creates new methods that return a ValidationResult object instead of throwing an exception which requires catching and inspecting the exception itself. Migrating from the old to the new API should be pretty simple as the method calls match quite closely.
2014-10-15 12:26:30 -05:00
James Agnew 2a9d92df7a Clean up encoding of contained resources so that resources are not
modified as a part of the encoding
2014-10-14 14:20:19 -04:00
lmds1 6049df0bfa Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-10 15:42:29 -04:00
James Agnew abecee2766 Some work on supporting multiple versions 2014-10-02 09:54:52 -04:00
James Agnew 507ea9bedf One more windows unit test break 2014-10-01 16:27:47 -04:00
James Agnew c6dcd4b1af Fix broken unit tests on Windows 2014-10-01 16:02:22 -04:00
James Agnew 751face0a6 Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT 2014-09-30 13:16:09 -04:00
James Agnew 1feb69b545 Revert to 0.6-SNAPSHOT version 2014-09-30 11:59:38 -04:00
James Agnew 3eeea9b0fc Merge branch 'tags-set' 2014-09-30 11:58:00 -04:00
James Agnew 24caec9f44 Get tags working as a set instead of a list 2014-09-30 11:57:15 -04:00
jamesagnew 75c5123797 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-29 21:07:01 -04:00
jamesagnew dcccf5553e Return a content-location header on update 2014-09-29 21:05:55 -04:00
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
t106uhn 2e89fd7554 fixed compile error with org-apache-commons.StringUtils 2014-09-26 18:38:38 -04:00
James Agnew 0d6eca70a9 Work on #30, still not working though... 2014-09-26 17:16:37 -04:00
James Agnew 1d084fe6b0 Fix #29 - Encoding resources with contained resources caused the parent
resource to grow with each encode pass.
2014-09-26 10:58:19 -04:00
James Agnew c362e21997 Add test for contained binary resources. Close #26 fixed by Alexander
Kley
2014-09-26 09:37:41 -04:00
James Agnew e4009bcb4a Merge pull request #28 from Cloudyle/issue-#26
Thanks for the submission! Looks good to me.
2014-09-26 09:32:35 -04:00
James Agnew 69c5663128 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-26 09:24:28 -04:00
James Agnew 4f4fdfd279 Docs 2014-09-26 09:23:03 -04:00
jamesagnew 4622af7a82 Docs 2014-09-26 07:43:25 -04:00
lmds1 86b5e4acf9 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-25 11:21:07 -04:00
jamesagnew d159584b43 Don't fail is Woodstox isn't the default StAX parser 2014-09-25 08:35:15 -04:00
akley b380a8f797 Update PraserState.java
Issue #26: XMLParser doesn't read Binary content from XML. Binary content is discarded during xml parsing, because attribute check of ID is missing in BinaryResourceState.attributeValue(...)
2014-09-25 10:36:29 +02:00
lmds1 bdad121f01 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-24 19:09:45 -04:00
lmds1 88e95c1b0a fixed exception handling for auditing interceptor 2014-09-24 19:09:35 -04:00
jamesagnew dd5e442bcb Add an explicit dependency on phloc-commons to fix a build error, thanks to Odysseas Pentakalos for the contribution. 2014-09-24 17:36:59 -04:00
lmds1 8c45f32ce3 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-24 15:52:57 -04:00
lmds1 e0d160ad7e added AuditingInterceptor and IAuditDataStore with various ResourceAuditors to provide pluggable auditing functionality to FHIR server 2014-09-24 15:52:48 -04:00
James Agnew a610c1cb38 Add client interceptor which adds bearer tokens for OAUTH2 2014-09-24 14:57:37 -04:00
James Agnew 5c0ccaab9a Resources containing entities which are not valid in basic XML (e.g.
§) will have those
				entities converted to their equivalent
unicode characters when resources are encoded, since FHIR does
				not allow extended entities in resource
instances.
2014-09-22 16:44:59 -04:00
James Agnew c214f7fe19 Fix #24 - Add a bunch of elements to the automatically generated
conformance profiles to ensure that they validate against the HL7
schemas.
2014-09-22 16:27:57 -04:00
jamesagnew 7192c9348a Doc tweaks 2014-09-19 08:52:39 -04:00
James Agnew b67a4cc4e4 Allow read/vread/search using absolute URL - Thanks to Doug Martin for
the contribution
2014-09-18 17:13:43 -04:00
James Agnew 06e2b6632d Fix build 2014-09-17 11:43:18 -04:00
lmds1 cb8dca13d2 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-17 11:36:41 -04:00
James Agnew 62bf2620f1 Properly handle bundle entry summary element 2014-09-17 11:35:57 -04:00
lmds1 4b730cc418 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-17 11:35:44 -04:00
lmds1 9906b61987 added UserInfoInterceptor to pass user context for auditing, added narratives for Medication Prescription, moved URL into RequestDetails so it's available to interceptors 2014-09-17 11:35:15 -04:00
jamesagnew b316d556b7 Fix unit test 2014-09-17 09:07:01 -04:00
jamesagnew 594b04d838 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-17 08:33:52 -04:00
jamesagnew 1fecb8ad76 Parameter type cleanup from connectathon 2014-09-17 08:32:15 -04:00
James Agnew 83f9c1c6a9 Still working on unit tests 2014-09-16 17:21:04 -04:00
James Agnew 774e38eacc Just logging in unit test 2014-09-16 17:16:03 -04:00
James Agnew 49726fb17c Properly escape characters in narrative blocks 2014-09-16 17:06:48 -04:00
James Agnew e7d2a19ac6 Fix broken build - Thanks Jenkins! 2014-09-16 15:25:20 -04:00
James Agnew af64f1b9e1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-09-16 12:06:42 -04:00
James Agnew ef57a5f47e Work on #21 - Don't depend on Servlet 3+ APIs 2014-09-16 12:05:44 -04:00
t106uhn f79b7adabd added jetty-http dependancy to allow test case classes to compile in
eclipse
2014-09-15 20:40:40 -04:00
jamesagnew 5701572e08 Fix url determination 2014-09-13 12:15:35 -05:00
jamesagnew 1f0f9176fe Work on base server URL determination code 2014-09-13 12:05:57 -05:00
jamesagnew f3ae6cbffd Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component
2014-09-12 18:57:57 -05:00
James Agnew cdd4b137fb Bump to 0.7-SNAPSHOT 2014-09-11 16:57:45 -04:00
James Agnew 0b6c985f3a Merge branch 'oauth2'
Conflicts:
2014-09-11 16:29:08 -04:00
James Agnew 960c89989c Documentation tweaks 2014-09-11 16:28:29 -04:00
James Agnew f388c6df3d Nothing 2014-09-10 14:13:01 -04:00
James Agnew 8a77ac939d Documentation enhancements 2014-09-10 14:12:11 -04:00
jamesagnew 09af35e5d8 Site tweaks for release 2014-09-08 07:51:21 -04:00
jamesagnew 13dd6d5e11 Complete 0.6 2014-09-08 07:41:44 -04:00
James Agnew 6761e9a945 Starting to rework the oauth2 filter 2014-09-04 18:03:19 -04:00
James Agnew f9419ea910 Fix up examples 2014-09-03 18:03:44 -04:00
James Agnew 095945562b Potential #19 2014-09-03 12:57:17 -04:00
jamesagnew 93c54f57fe More work on fixing #19 2014-09-03 09:08:55 -04:00
James Agnew c704aa185d Fix #19 - Now have a whitelist and a blacklist for parameter names 2014-09-02 16:41:01 -04:00
jamesagnew 9217ee28bf Starting work on #19 2014-09-02 08:21:06 -04:00
jamesagnew bda33737f1 Doc updates as suggested by David Hay 2014-09-01 20:05:16 -04:00
jamesagnew e7f34e8dbb Check compartment support in 2014-08-29 13:05:04 -04:00
James Agnew ce99ee8324 Whitespace 2014-08-28 17:42:35 -04:00
James Agnew a8be093b1f Use better valueset enums for SecurityEvent's values 2014-08-28 12:58:13 -04:00
James Agnew 4d426cb2b2 Fix resource reference encode order 2014-08-28 09:47:59 -04:00
James Agnew 46fbfeb66e Fix encoding issue on narrative blocks 2014-08-28 09:44:04 -04:00
jamesagnew d205075e35 More validator work 2014-08-28 07:53:41 -04:00
James Agnew c75c37d24d Rename SecurityEvent.Object to SecurityEvent.ObjectElement 2014-08-27 12:01:46 -04:00
James Agnew 9a58e2e56e Close #14 - HAPI will now not ignore _id parameter when choosing a
backing method
2014-08-27 11:34:13 -04:00
James Agnew 5d2d6f410f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-27 10:37:19 -04:00
James Agnew f549cd5cc4 Unit test for #14 - Doesn't pass yet though 2014-08-27 10:36:56 -04:00
jamesagnew bfd6329303 Performance improvements 2014-08-27 08:55:00 -04:00
James Agnew 794db6a141 Document interceptor framework 2014-08-26 18:18:00 -04:00
James Agnew 9bb10a5968 More tweaks 2014-08-26 16:23:56 -04:00
James Agnew 812870f5dc Make this a bit easier to read 2014-08-26 16:22:43 -04:00
James Agnew f5823a8e2f Server logging interceptor enhancements 2014-08-26 16:10:27 -04:00
James Agnew 84c479927e Add test for #11 2014-08-26 10:13:35 -04:00
James Agnew faa28cb825 Fix unit test, should close #13. Our hudson server is temporarily
offline and I need to do a better job of manually running the tests
until it is back!
2014-08-26 10:04:26 -04:00
jamesagnew 9413bfa47b Correctly parse List resource 2014-08-26 08:10:15 -04:00
jamesagnew e6d6ec88b2 Fix unit test 2014-08-25 21:53:21 -04:00
James Agnew 2cad32aa08 Detect invalid read method 2014-08-25 17:07:02 -04:00
jamesagnew d01f43e4b3 Add server interceptor layer as well as starting work on property file for versions 2014-08-25 09:11:28 -04:00
jamesagnew 8d462f3cda Add validator support 2014-08-23 16:40:26 -04:00
James Agnew 3808f95f6a Start working on server interceptors 2014-08-22 19:15:49 -04:00
jamesagnew ab17c9f3d1 Let server return profile info if configured to do so 2014-08-21 00:34:19 -04:00
jamesagnew 731d369be0 Improve documentation on exception handling for servers 2014-08-20 22:46:15 -04:00
James Agnew 45253cba5d Eclipse settings 2014-08-20 19:21:41 -04:00
James Agnew 1ec49a4f80 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
2014-08-20 15:24:39 -04:00
James Agnew 47c522ac6f Exception enhancements 2014-08-20 15:22:25 -04:00
jamesagnew f8a5acfed9 Exception enhancements 2014-08-20 09:01:09 -04:00
jamesagnew 71e6efbc31 Fix resource reference encoding for JSON parser - Thanks Tommy Nguyen for reporting! 2014-08-20 07:48:51 -04:00
jamesagnew 6bc9140def Fix unit test failure 2014-08-19 09:12:25 -04:00
jamesagnew 598eec53ed Add model visitor, and allow bundles to have categories (as allowed in the spec) 2014-08-19 07:48:06 -04:00
jamesagnew fd41bafa82 Allow bundle as param in transaction method 2014-08-17 22:58:30 -04:00
jamesagnew 8078452f78 Lots more documentation and let users interact with link self/search 2014-08-16 17:46:30 -04:00
James Agnew d67a29a366 Unit tests 2014-08-15 15:55:39 -04:00
jamesagnew d5c6623da0 Start adding ability to override fields in extended definition classes 2014-08-15 09:19:07 -04:00
James Agnew 901ce12e8e Start adding view generator 2014-08-13 18:16:34 -04:00
James Agnew 04b4d5acb7 Server sending some named queries to non named query method 2014-08-13 16:43:54 -04:00
James Agnew 408114235f Start server profiles 2014-08-12 17:22:05 -04:00
James Agnew 0ff847ac21 Fix failing unit tests 2014-08-12 12:27:51 -04:00
James Agnew d0edc03f14 Linked resources in server now correctly returned 2014-08-12 11:04:41 -04:00
jamesagnew e2b9b3318d Add OperationOutcome narrative template 2014-08-11 09:09:01 -04:00
jamesagnew 04bc96ff8e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-09 12:18:54 -04:00
jamesagnew 3e2cfcd02d Doc updates 2014-08-09 12:18:47 -04:00
James Agnew 2ede952342 Fix up CORS support 2014-08-08 17:40:43 -04:00
James Agnew 8149df964e Annotation client will not return incorrect resource types 2014-08-08 15:15:10 -04:00
James Agnew b43b6c6d2f Fix #6: Allow update operation to create a resource if it doesn't
already exist
2014-08-08 14:07:03 -04:00
jamesagnew e17af44a09 Add _language search support 2014-08-08 08:34:28 -04:00
jamesagnew ba3bc70eae Fix CORS support 2014-08-08 07:33:12 -04:00
James Agnew 95f5031251 Documentation enhancements 2014-08-07 18:41:33 -04:00
James Agnew 4ba4226dad Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-07 12:18:38 -04:00
jamesagnew deef33317d Annotation documentation updates 2014-08-07 08:27:52 -04:00
jamesagnew 0b7cfec06b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-06 09:05:21 -04:00
jamesagnew f36be04168 Typo edits 2014-08-06 09:05:01 -04:00
James Agnew 2c44a4f76e Correctly handle contained resources in client 2014-08-05 17:06:35 -04:00
James Agnew aef7ea5e9f Correctly encode JSON composite elements with extensions 2014-08-05 14:57:53 -04:00
James Agnew f29349f537 Improve conformance provider documentation 2014-08-05 13:15:08 -04:00
James Agnew 1793f6d9ab Fix #4- Create operation should return HTTP 200 2014-08-05 10:46:46 -04:00
jamesagnew 33d667d448 Doc updates 2014-08-05 07:55:58 -04:00
jamesagnew cac3306c64 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-01 07:35:59 -04:00
jamesagnew 9d4eff967e Doc updates 2014-08-01 07:35:44 -04:00
James Agnew fa3bd7f25d Start adding OpenID support 2014-07-31 18:06:04 -04:00
James Agnew 0ba7a63803 Allow repeatable prarmater values 2014-07-30 17:43:15 -04:00
James Agnew ef10560c76 Version bump to 0.6-SNAPSHOT 2014-07-30 11:58:06 -04:00
jamesagnew 0a57647b17 Tag 0.5 2014-07-30 07:58:57 -04:00
jamesagnew 67fb593146 Finalize 0.5 2014-07-29 22:26:19 -04:00
James Agnew de5aeb5c7a More tests 2014-07-29 17:27:16 -04:00
James Agnew 98d0fe679a Rebuild resource models 2014-07-29 15:59:11 -04:00
jamesagnew 0bc703107c Add suport for composite and sorting to JPA (not yet complete) 2014-07-29 09:10:25 -04:00
James Agnew 318dcfcaaf Contained resource handling improved 2014-07-23 17:02:54 -04:00
jamesagnew 4cd3bdf441 A few fixes and additions to the fluent client, as well as fixing a bug on extension encoding (null extensions were still being encoded) 2014-07-23 09:15:07 -04:00
James Agnew 622e528f43 Lots of documentation updates 2014-07-22 18:12:01 -04:00
James Agnew efb14397df Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-07-22 14:25:59 -04:00
James Agnew e53aaf0950 Add content-disposition header for binary resources 2014-07-22 14:25:33 -04:00
jamesagnew af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -04:00
James Agnew fc74cda994 Clean up examples and unit tests to use new parameter types 2014-07-21 18:37:08 -04:00
James Agnew 063e2961ab Fix bug 2- Process Content-Location header in client read invocations 2014-07-21 14:57:37 -04:00
James Agnew 64481185c7 Fixing bug 3- Instance history calls incorrectly get routed to vread
method
2014-07-21 14:15:22 -04:00
James Agnew 4713639713 Fix unit tests 2014-07-21 10:17:07 -04:00
jamesagnew ad043a1b79 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java
2014-07-21 09:24:38 -04:00
jamesagnew 6aa3560564 Starting work on consolidating params 2014-07-19 12:10:43 -04:00
James Agnew d15dbd4317 Add interceptor framework 2014-07-18 17:49:14 -04:00
James Agnew 2285d3812e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-17 13:02:21 -04:00
James Agnew bb14ad09ea Start preparingh for multiple versions of FHIR 2014-07-17 09:53:52 -04:00
jamesagnew 84af486d51 Tester now suports chained parameters 2014-07-17 08:32:01 -04:00
James Agnew 41f160ed67 Documentation updates and bump to 0.5-SNAPSHOT 2014-07-15 18:36:13 -04:00
jamesagnew 2adaa4a072 Site updates 2014-07-14 08:21:50 -04:00
jamesagnew 568972b098 Release 0.4 2014-07-13 21:59:41 -04:00
James Agnew a2a1035003 More work on tester 2014-07-11 18:27:27 -04:00
jamesagnew 0a7f7d0390 Start with sample code in tester UI 2014-07-11 09:15:38 -04:00
James Agnew 1346802403 reference params should handle resource types properly 2014-07-10 18:17:44 -04:00
James Agnew 4ddaaf0406 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java
2014-07-10 13:22:58 -04:00
James Agnew 28ebda71e1 Let IdDt clone without being heavyweight 2014-07-10 08:50:51 -04:00
jamesagnew 4d517aa76f Add ability for IDs to be client specified in JPA 2014-07-10 08:17:55 -04:00
jamesagnew 1b7b141396 Tester improvements 2014-07-08 08:44:13 -04:00
James Agnew d3b4a3ad60 Add searching by code text 2014-07-07 18:34:49 -04:00
James Agnew 0484c6509f Display queries properly in UHN implementation 2014-07-07 15:37:23 -04:00
James Agnew b1a602d88b Fix a few unit tests 2014-07-07 12:42:37 -04:00
James 46828030db Deal with max lenghts in search params 2014-07-07 12:15:20 -04:00
jamesagnew cb2b54cb09 Move searches with required parameters to unnamed queries 2014-07-07 09:23:23 -04:00
James add96f2124 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 17:19:51 -04:00
James 0d13dc886b Allow server to specify its own base 2014-07-04 17:19:33 -04:00
t106uhn 8c1c156e04 testing commit 2014-07-04 16:24:48 -04:00