ADX3 Changes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-02-28 refactoring away from OM: assay.xsd - Assay parent changed from om:Measurement to gml:AbstractFeature, substitutionGroup="gml:_Feature" - AssayType bulked up with properties from former parents: all properties copied verbatim unless noted below - added from om:Event responsible - added from om:AbstractObservationType procedure countParameter measureParameter termParameter observedProperty (NOTE made optional, was mandatory) quality featureOfInterest - added from om:MeasurementType result -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-01 assay.xsd - featureOfInterest renamed 'of' & changed to IDREF rather than instance -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-06 ADDING RUNS adxSpecimen.xsd - SpecimenAnalysisRunType added - SpecimenAnalysisRun added - SpecimenAnalysisRunPropertyType added assay.xsd - IDREF 'of' removed - IDREF 'run' added adxReport.xsd ReportType - run attribute added of type SpecimenAnalysisRunPropertyType -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-07 - 08 FINALISING SPECIMEN-ASSAY-PREP RELATIONSHIPS adxSpecimen.xsd AssaySpecimen - receiptEvent renamed transferEvent SpecimenAnalysisRunType removed SpecimenAnalysisRun removed SpecimenAnalysisRunPropertyType removed assay.xsd AssayType - IDREF 'of' documentation changed to refer to specimen - IDREF 'via' added - purpose removed as should use observedProperty instead (see also purpose in InstrumentRun) InstrumentRun added InstrumentRunType added InstrumentRunPropertyType added Assay - no longer subs group of _Feature adxReport.xsd ReportType - run attribute added of type SpecimenAnalysisRunPropertyType adxPrepProcedure.xsd SpecimenReceiptEvent renamed SpecimenTransferEvent SpecimenReceiptEventType renamed SpecimenTransferEventType SpecimenReceiptEventPropertyType renamed SpecimenTransferEventPropertyType -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-08 INCLUDE INSTRUMENT SETUPS assay.xsd InstrumentRunType - specimen removed - procedure rename as device & change to gml:ReferenceType instead of IDREF - setup added -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-09 FIX EVENT REFERENCES adxSpecimen.xsd - added import of adxPrepProcedure.xsd AssaySpecimen - transferEvent changed from IDREF to SpecimenTransferEventPropertyType to allow inline copy -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-09 - 13 NEW "OPTIMAL HISTORY" MODEL adxReport.xsd - don't import adxSpecimen.xsd - add import of adxProcessing.xsd Report - run removed - history added - event removed SpecimenEventPropertyType - unionSemantics removed - sequence removed - must have just one of the choices - choice changed - SpecimenTransferEvent renamed SampleReceiptEvent - PulpReuseEvent added - ultimately commented out as don't think will record events adxProcessing.xsd - added new file, containing ProcessingHistory, ProcessingHistoryType adxProcessingLeaves - added new file, containing PulPrepEventParams PulpPrepProtoEvent* PulpPrepProtoParam* RejectStoreEventParams RejectStoreProtoEvent* RjectStoreProtoParam* InstrumentPrepProtoEvent* InstrumentPrepProtoParam* SampleReceiptEventParams SampleReceiptProtoEvent* SampleReceiptProtoParam* PulpReuseEventParams PulpReuseProtoEvent* PulpReuseProtoParam* RepeatEventParams RepeatProtoEvent* RepeatProtoParam* TrayEventParam* TrayProtoEvent* TrayProtoParam* MeasureEventParams MeasureProtoEvent* MeasureProtoParam* adxPrepProcedure - moved all Events to adxEvents.xsd - add include of adxEvents.xsd adxEvents.xsd SpecimenTransferEvent* renamed SampleReceiptEvent* PulpReuseEvent added SpecimenPreparationEvent* renamed PulpPrepEvent* SpecimenCompositingEvent* removed InstrumentPrepEvent* added *Property removed (we don't need them given removal of SpecimenEventPropertyType) RejectStoreEvent* added TrayEvent* added assay.xsd InstrumentRun removed InstrumentRunType removed InstrumentRunPropertyType removed AssayMeasurementType - removed property 'via' -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-16 CORRECT LINKING IN OPTIMAL HISTORY adxProcessing.xsd ProtoParamType - 'ord' replaced with 'fills' gml ref type adxSpecimen.xsd - deleted unused file -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-17 ENABLE PULP REUSE TO HAVE PROCEDURE adxProcessingLeaves.xsd PulpReuseEventParams - add procedureUsed optional element -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-26 FIX RepeatEvent TO MATCH ProtoRepeatEvent adxEvents.xsd RepeatEvent - add originalSampleID and mass -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- 2006-03-30 FIX FAILURE TO VALIDATE WITH INLINE EVENT/PROTOEVENT MIXTURE adxProcessing.xsd ProtoHistoryType - add maxOccurs="unbounded" to choice element