OpenMRS

Timestamp:

05/22/08 18:58:37 (8 months ago)

Author:

dthomas

Message:

Fixed a couple of items in FormImportExport:

1) shuffle up the create order to prevent attempts at creating
concept answers and sets before the child concepts can be created.

2) put in a check to see if sync is/isn't running, and execute creation of concept answers accordingly

3) updated Xstream comparison of dateCreated/dateModified between parent and child to preserve timezones.

Files:

• openmrs-modules/formimportexport/.classpath (modified) (view diffs)
• openmrs-modules/formimportexport/build.xml (modified) (view diffs)
• openmrs-modules/formimportexport/lib-common/formimportexport-1.4.3.jar (added)
• openmrs-modules/formimportexport/lib/xstream-1.2.2.jar (deleted)
• openmrs-modules/formimportexport/lib/xstream-1.3.1.jar (added)
• openmrs-modules/formimportexport/metadata/config.xml (modified) (view diffs)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/FormImportExportService.java (modified) (view diffs)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/converter/CustomDateConverter.java (added)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/db/FormImportExportDAO.java (modified) (view diffs)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/db/hibernate/HibernateFormImportExportDAO.java (modified) (view diffs)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/impl/FormImportExportServiceImpl.java (modified) (view diffs)
• openmrs-modules/formimportexport/test/org/openmrs/module/formimportexport/test/ConceptSerializationTest.java (modified) (view diffs)
• openmrs-modules/formimportexport/test/org/openmrs/module/formimportexport/test/GetConceptModificationDatesTest.java (added)
• openmrs-modules/formimportexport/web/src/org/openmrs/module/formimportexport/web/controller/SyncConceptsWithParentController.java (modified) (view diffs)