Commit Graph

629 Commits

Author SHA1 Message Date
James Agnew 50a9995c55 Validator fixes 2016-01-07 18:37:15 -05:00
James Agnew c1afb4f54d Get overlay working for DSTU2.1 2016-01-07 15:04:56 -05:00
James Agnew a54cb06c03 More travis cleanup 2016-01-06 14:02:20 -05:00
James Agnew 7005cd52d9 Performance tweaks to the validator and get the DSTU2.1 endpoint working
with validation
2016-01-04 17:57:00 -05:00
jamesagnew 685bd9345b Add request/response validator interceptors 2016-01-03 21:52:11 -05:00
jamesagnew d47e0e5e77 Add DSTU2.1 resources 2015-11-29 11:43:09 -05:00
James Agnew 2f12c9ed01 Bump version to 1.4-SNAPSHOT 2015-11-15 20:11:05 -05:00
James Agnew f9f33f059b Version bump to 1.3 2015-11-15 12:53:02 -05:00
jamesagnew 4545b4fb7f Don't create a new version when reindexing resources 2015-11-04 08:26:33 -05:00
James Agnew ae416dcd62 Improve nexted search/read handing in transactions in JPA server 2015-10-20 10:35:18 -04:00
jamesagnew 938a251ae9 Cleanup tests for java config in JPA 2015-10-19 20:19:40 -04:00
James Agnew 39fce055e1 Fix build 2015-10-16 15:59:01 -04:00
James Agnew 6c321b83c8 Get examples working with Java config 2015-10-16 15:41:28 -04:00
jamesagnew 7e2d486d17 Working on java config 2015-10-15 08:27:58 -04:00
jamesagnew 6d93cbcaae Get content search working correctly 2015-10-13 09:18:34 -04:00
jamesagnew 0ab8ee386f Add documentation for CLI 2015-10-12 18:47:49 -04:00
jamesagnew b4c86d033e More work on fulltext search and add a failing test for subscriptions 2015-10-09 09:12:41 -04:00
James Agnew b62eb1168c Allow server operations to work at the type level 2015-10-06 11:45:49 -04:00
James Agnew 80575b5380 Generic client now allows search by URL 2015-10-05 15:30:30 -04:00
James Agnew 48d56b4722 Fix connectathon discovered issues 2015-10-03 23:52:30 -04:00
James Agnew e7e8f8dd81 Use correct status codes for failed deletes, and support multi delete in
JPA
2015-10-02 18:18:54 -04:00
James Agnew 119a4f36d9 Add error checking and better handling for match URLs in JPA server 2015-10-01 16:54:34 -04:00
jamesagnew 900c93949a Work on subscriptions, and correct indexing of codes in JPA 2015-10-01 08:56:17 -04:00
jamesagnew c385384269 More work on subscriptions 2015-09-30 08:31:38 -04:00
James Agnew 1cc6a05273 FIx validation for resources using v2 tables 2015-09-29 10:51:36 -04:00
jamesagnew 9492744018 Work on subsciprions 2015-09-28 09:06:57 -04:00
James Agnew 1361e69177 Respect server default encoding if an Accept header is received which
indicates equal weight for both encodings
2015-09-24 17:52:52 -04:00
jamesagnew a15ed8e944 Work on subscriptions, and correct an issue with DateRangeParam where comparators get ignored 2015-09-23 08:36:11 -04:00
jamesagnew ec8b3b68f6 Work on subscription 2015-09-22 08:06:23 -04:00
jamesagnew 04c2cce13f Start working on JPA subscriptions 2015-09-21 09:08:19 -04:00
jamesagnew 8fee057de3 Bump Spring and Hibernate versions 2015-09-20 10:18:33 -04:00
jamesagnew 70e942e9f8 Version bump to 1.3-SNAPSHOT 2015-09-19 11:00:57 -04:00
jamesagnew 31934ff582 Version bump to 1.2 2015-09-16 07:09:03 -04:00
de Beaubien, Bill 27764da19a #221 Conformance date now defaults to the build date/time 2015-09-09 16:47:07 -04:00
James Agnew 97e6073665 Support URI (and prepare for lat/lon search params) in JPA server, and
don't store duplicate tags
2015-09-01 17:02:35 -04:00
jamesagnew a9f978a8a2 Udate to latest DSTU2 definitions 2015-08-31 08:20:24 -04:00
jamesagnew 61cb60b293 Operations which are not resource type specific were not showing up in REST server's conformance 2015-07-18 18:44:46 -04:00
jamesagnew 626f4677e7 Fix #198 - Sorting should only sort on the individual parameter searched on, not all params of the same type 2015-07-18 15:29:24 -04:00
James Agnew 901c5c29cf Version bunp for 1.2 2015-07-14 18:08:06 -04:00
James Agnew 3fa7c54526 Tag 1.1 release 2015-07-13 10:31:02 -04:00
James Agnew d20b7e2c94 A few cleanups to allow example resources to commit cleanly 2015-07-07 17:27:10 -04:00
jamesagnew 564746a9a8 Split databases for test server into one for each FHIR version 2015-07-07 09:10:26 -04:00
jamesagnew 8a86ad5e76 Wide sweeping changes to get RI structures working in server mode 2015-07-05 17:14:15 -04:00
jamesagnew da2d4d0497 Stlye issues only 2015-06-24 08:22:05 -04:00
jamesagnew fed9f4d61e Add unit tests and update healthconnex server 2015-06-23 08:29:13 -04:00
jamesagnew 71fbfe5214 Add consolidated test package and clean up tests for cobertura 2015-06-20 14:23:34 -04:00
jamesagnew 4ab8871a41 POM cleanup 2015-06-09 08:22:46 -04:00
James Agnew 9b97fb0e97 Enable validation ($validate) operation in DSTU2 style 2015-06-04 10:56:13 -04:00
jamesagnew 8f27462db7 Add support for _revinclude in web tester UI 2015-05-31 17:31:04 -04:00
jamesagnew 4a5e13b301 Work on synchronizing the HL7.org structures 2015-05-31 16:52:31 -04:00
James Agnew 0f9d4b8059 Add interceptor for syntax highlighting 2015-05-15 18:59:54 -04:00
jamesagnew 0f2976358f Version bump to 1.1-SNAPSHOT with more loggging 2015-05-08 08:54:40 -04:00
jamesagnew a731557516 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:28:31 -04:00
jamesagnew dfbe2415d1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:24:34 -04:00
jamesagnew 924ebf062e Preparing for 1.0 release 2015-05-07 20:51:37 -04:00
James Agnew 05cccdb6e5 More work on structs 2015-05-05 13:16:10 -04:00
James Agnew aa2f2cee96 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 13:52:24 -07:00
James Agnew 9755ae8d35 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 10:24:15 -04:00
James Agnew 5cf5bb0473 Fix #167 - Rename "myEntityManagerFactory" to just
"entityManagerFactory" as this is the default expected in some spots in
Spring
2015-04-30 09:36:14 -04:00
James Agnew 84c17f4676 Wrong FHIR version for Furore server 2015-04-28 10:51:58 -04:00
jamesagnew f8dee1f47a Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-24 09:05:34 -04:00
James Agnew 8072ca1bc1 Do HTTP post for tester UI create/updates 2015-04-23 16:57:50 -04:00
jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew 4f1d2a3c75 Merging cleanup from local branch with commit from #153 2015-04-20 15:28:20 -04:00
mochaholic 3003b5e17b Update to the latest upstream. 2015-04-09 07:25:09 -06:00
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
James Agnew 823bb4ed82 Add support for profiles and tags in meta for DSTU2 2015-03-16 17:02:44 -04:00
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
James Agnew adfbfcb96b Site and dist updates for 0.9 release 2015-03-13 17:59:55 -04:00
jamesagnew 3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
James Agnew 16857404c5 Just work on examples of new functionality 2015-03-11 16:17:27 -04:00
James Agnew db65d5db59 Work on support for new bundle format in DSTU2 2015-02-27 18:09:24 -05:00
mochaholic f7a8c8d5f5 Fixed issue #115. 2015-02-23 17:39:23 -07:00
mochaholic a5be8a10f4 Merge remote-tracking branch 'upstream/master' 2015-02-19 11:37:01 -07:00
jamesagnew 4f93ab9313 Work on JPA Transaction for DSTU2 2015-02-18 22:23:46 -05:00
mochaholic e6405c99fb Added (commented-out) mysql configs to hapi-fhir-server-database-config.xml and the corresponding class to facilitate mysql-based deployment. 2015-02-18 17:00:40 -07:00
jamesagnew 54be2634cd Work on #105 - Should have it working 2015-02-16 22:37:47 -05:00
esteban-aliverti 9377315c8d Misc:
- hapi-fhir-testpage-overlay now uses dstu2 classes.
	- hapi-fhir-jpaserver-examples now use dstu2 classes.
	- Removed non-existing dependency hapi-fhir-jpaserver-test:0.9-SNAPSHOT from hapi-fhir-testpage-overlay and hapi-fhir-jpaserver-uhnfhirtest
2015-02-09 12:00:49 +01:00
James Agnew f4805f83d1 Create DSTU2 project 2015-02-06 15:50:29 -05:00
James Agnew 1348b9f1b4 Add HTTPS support to public server 2015-01-27 11:14:30 -05:00
James Agnew c786b00950 Add status to bundle entries 2015-01-05 17:57:35 -05:00
James Agnew 0e06e322c3 Fix compile issue 2014-12-29 10:11:07 -05:00
jamesagnew c73e867736 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
2014-12-29 09:35:34 -05:00
jamesagnew fd8ba68e62 Implementing ETag support 2014-12-29 09:33:36 -05:00
James Agnew b856c2386b Better logging for public server 2014-12-23 15:44:54 -05:00
James Agnew 81851f4808 Fix #65 - Correctly parse and encode extensions on non-repeatable
primitive fields
2014-12-23 14:10:53 -05:00
James Agnew c8adab5452 Better logging in JPA 2014-12-23 09:42:16 -05:00
jamesagnew 31d61100db Fix #67 - Correctly parse local IDs in IdDt even if they look like real IDs 2014-12-22 22:37:24 -05:00
James Agnew 6ab400142f Adjust logging 2014-12-22 13:58:21 -05:00
James Agnew 5a0ef91337 Get public server working with DSTU2 2014-12-22 12:03:02 -05:00
jamesagnew dde1d0495c Get server working 2014-12-21 22:22:07 -05:00
jamesagnew 994e49057d Lots of work on DSTU2 server 2014-12-21 18:13:37 -05:00
jamesagnew 4ca405a8fc Unit tests all pass again, elements in baseresouerce reordered 2014-12-19 09:14:40 -05:00
James Agnew 34d3695c6c Branch now builds successfully 2014-12-18 13:40:31 -05:00
jamesagnew 1f3991caf9 Bump version to 0.9-SNAPSHOT 2014-12-17 17:04:10 -05:00
jamesagnew 3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-17 16:08:59 -05:00
jamesagnew 7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
jamesagnew a46183ddb8 Add some documentation for #59 2014-12-17 12:40:22 -05:00
b.debeaubien d0db838f45 #59 - More sorting out profile vs id problem 2014-12-16 09:25:12 -05:00
jamesagnew ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -05:00
jamesagnew c294e1c064 Begin multi version work 2014-12-01 08:13:32 -05:00
jamesagnew 66bb291e04 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	examples/pom.xml.orig
	hapi-deployable-pom/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	hapi-fhir-structures-dev/.gitignore
	hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java
	hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
	pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component.orig
	src/changes/changes.xml
	src/site/resources/svg/restful-server-interceptors.svg
	src/site/site.xml
2014-11-08 10:58:35 -05:00
jamesagnew d1fb878c55 Merging 2014-11-08 10:36:27 -05:00
James Agnew 094a617644 Merge branch 'versions'
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
2014-10-29 15:34:59 -04:00
James Agnew 8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00
James Agnew c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -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
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
jamesagnew 1fecb8ad76 Parameter type cleanup from connectathon 2014-09-17 08:32:15 -04: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 7f2d656342 Basic project 2014-09-08 14:55:33 -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 46fbfeb66e Fix encoding issue on narrative blocks 2014-08-28 09:44:04 -04:00
James Agnew f5823a8e2f Server logging interceptor enhancements 2014-08-26 16:10:27 -04:00
jamesagnew 9413bfa47b Correctly parse List resource 2014-08-26 08:10:15 -04:00
James Agnew 2cad32aa08 Detect invalid read method 2014-08-25 17:07:02 -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 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
jamesagnew 8078452f78 Lots more documentation and let users interact with link self/search 2014-08-16 17:46:30 -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
James Agnew 2ede952342 Fix up CORS support 2014-08-08 17:40:43 -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 fa3bd7f25d Start adding OpenID support 2014-07-31 18:06:04 -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
jamesagnew af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -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
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 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 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
jamesagnew cb2b54cb09 Move searches with required parameters to unnamed queries 2014-07-07 09:23:23 -04:00
James 0d13dc886b Allow server to specify its own base 2014-07-04 17:19:33 -04:00
James 02357bce4d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 16:18:10 -04:00
James ec2326b1f2 Narrative fixes 2014-07-04 16:17:53 -04:00
jamesagnew 93a7c3e5b5 Deprocate confusing get/setId methods 2014-07-04 09:27:36 -04:00
jamesagnew ee53c40ff8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html
2014-07-03 18:35:37 -04:00
jamesagnew 65dc4cbf2e Welcome mesage change 2014-07-03 18:03:06 -04:00
James ca0929df07 Work on narrative generator 2014-07-03 18:02:14 -04:00
James c811c164b5 Fix unit test 2014-07-03 10:34:55 -04:00
jamesagnew ab9e681ed2 Start adding transaction to tester 2014-07-03 08:51:42 -04:00
jamesagnew cf4b612ae6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-02 18:10:57 -04:00
jamesagnew ad344f700d Config changes 2014-07-02 18:10:50 -04:00
James ca83de38b8 Fix tester breakage 2014-07-02 18:10:20 -04:00
James 0ece666c88 FIx a bunch more unit tests 2014-07-02 18:01:29 -04:00
jamesagnew 14befcd091 Lots of tester enhancements 2014-07-02 08:57:07 -04:00
jamesagnew f87c50b4b4 Lots of tester work 2014-06-27 18:28:27 -04:00
jamesagnew 411644c4ff More tester work 2014-06-25 09:49:13 -04:00
jamesagnew 4d90955e75 Make resource detection kind of case insensitive (to deal with some healthintersections responses) 2014-06-20 16:54:09 -04:00
jamesagnew 96986f8829 Lots of cleanup and try to speed up transacitons in JPA 2014-06-12 11:42:28 -04:00
jamesagnew 04fc0827ef Clean up transactions in JPA 2014-06-06 17:10:31 -04:00
jamesagnew dfa88a442c Get history and tags working properly on JPA 2014-06-02 09:07:10 -04:00
jamesagnew be44a2bca2 More work on JPA 2014-05-29 19:00:16 -04:00
jamesagnew 2720e7d273 Lots more JPA improvementsa 2014-05-28 16:07:53 -04:00
jamesagnew 0ad18c0b77 JPA server is almost working 2014-05-27 18:52:46 -04:00