Added support for N25 dictionary.

CHANGELOG.md

@@ -1,8 +1,9 @@
 ## NAACCR XML Version History
 
-**Version 10.3 (not released yet)**
+**Version 11.0 (not released yet)**
 
-- Added support for new dateTime type.
+- Added support for NAACCR 25.
+- Added support for new specification version 1.7 (added support for new dateTime type).
 
 **Version 10.2**
 
@@ -18,7 +19,7 @@
 **Version 10.0**
 
 - Added support for NAACCR 24.
-- Added support for new specification version 1.7 (removed trim attribute and some padding options); only NAACCR 24 dictionary will use that version for now.
+- Added support for new specification version 1.7 (removed trim attribute and some padding options); only NAACCR 24 dictionary will use that version for now).
 - Removed standalone program (the removal was announced a year ago when support for NAACCR 23 was added).
 - Re-wrote the SAS macro to use a temp fixed-column file instead of a temp CSV file to resolve a maxed-out line length issue.
 

VERSION

@@ -1 +1 @@
-10.3-SNAPSHOT
+11.0-SNAPSHOT

docs/naaccr-25/New data item V25.csv

@@ -0,0 +1,28 @@
+Data Item Number,Data Item Name,Length,Record Type,XML NAACCR ID,Parent XML Element,Data Type
+1132,Pediatric ID,5,"A,C,I,M",pediatricId,Tumor,mixed
+1133,Pediatric ID Version Current,5,"A,C,I,M",pediatricIdVersionCurrent,Tumor,digits
+1134,Pediatric ID Version Original,5,"A,C,I,M",pediatricIdVersionOriginal,Tumor,digits
+1135,Toronto Version Number,1,"A,C,I,M",torontoVersionNumber,Tumor,numeric
+1136,Pediatric Primary Tumor,3,"A,C,I,M",pediatricPrimaryTumor,Tumor,numeric
+1137,Pediatric Regional Nodes,3,"A,C,I,M",pediatricRegionalNodes,Tumor,numeric
+1138,Pediatric Mets,2,"A,C,I,M",pediatricMets,Tumor,numeric
+1142,Derived Pediatric T,3,"A,C,I,M",derivedPediatricT,Tumor,
+1143,Derived Pediatric N,3,"A,C,I,M",derivedPediatricTN,Tumor,
+1144,Derived Pediatric M,3,"A,C,I,M",derivedPediatricM,Tumor,
+1145,Derived Pediatric Stage Group,3,"A,C,I,M",derivedPediatricStageGroup,Tumor,
+1146,Toronto T,3,"A,C,I,M",torontoT,Tumor,
+1147,Toronto N,3,"A,C,I,M",torontoN,Tumor,
+1148,Toronto M,3,"A,C,I,M",torontoM,Tumor,
+1149,Toronto Stage Group,3,"A,C,I,M",torontoStageGroup,Tumor,
+1172,Post Transplant Lymphoproliferative Disorder-PTLD,1,"A,C,I,M",ptld,Tumor,numeric
+1174,PD-L1,1,"A,C,I,M",pdl1,Tumor,numeric
+1184,White Blood Cell Count,7,"A,C,I,M",whiteBloodCellCount,Tumor,digits
+1185,Intl Neuroblastoma Risk Grp Stag Sys (INRGSS),1,"A,C,I,M",inrgss,Tumor,numeric
+1186,n-MYC Amplification,1,"A,C,I,M",nMycAmplification,Tumor,numeric
+1187,Intl Neuroblastoma Path Prog Class (INPC),1,"A,C,I,M",inpc,Tumor,digits
+1188,IRSS Stage for Eye-2,1,"A,C,I,M",irssStageForEye2,Tumor,numeric
+1189,Chromosome 16q: Loss of Heterozygosity,1,"A,C,I,M",chromosome16qLossHeterozygosity,Tumor,numeric
+1190,Chromosome 1q Status,3,"A,C,I,M",chromosome1qStatus,Tumor,numeric
+1191,EWSR1-FLI1 fusion,1,"A,C,I,M",ewsr1Fli1Fusion,Tumor,numeric
+1192,Pretext Clinical Staging,1,"A,C,I,M",pretextClinicalStaging,Tumor,numeric
+1193,FOXO1 Gene Rearrangements,1,"A,C,I,M",foxo1GeneRearrangements,Tumor,numeric

docs/naaccr-25/Retired Data Items in V25.csv

@@ -0,0 +1,83 @@
+Data Item Number,Data Item Name,Length,Source of Standard,Record Type,Section Name,XML NAACCR ID,Parent XML Element,Year Implemented,Version Implemented,Year Retired,Version Retired,NPCR Collect,CoC Collect,SEER Collect,CCCR Collect,Description,Rationale,Clarification,General Notes,Instructions for Coding,Allowable Values,Format,Data Type,Code Notes,Record Layout Table Note,Required Status Table Note,Data Descriptor Table Note,Record Layout Note,Required Status Note,Data Descriptor Note,Data Dictionary Description Note,Data Dictionary Rationale Note,Data Dictionary Code Note
+170,Race Coding Sys--Current,,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+180,Race Coding Sys--Original,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+270,Census Occ Code 1970-2000,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+280,Census Ind Code 1970-2000,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+330,Census Occ/Ind Sys 70-00,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+605,Inpatient Status,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+1520,Rad--No of Treatment Vol,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+1540,Rad--Treatment Volume,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+1741,Subsq RX--Reconstruct Del,1,,"A,C,I,M",,,,1997,5.1,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+1780,Quality of Survival,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+2200,Diagnostic Proc 73-87,2,,"A,C,I,M",,,,1995,5,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,text,,Revised,Revised,,Retired,Retired,Retired,Retired,Retired,Retired
+2310,Military Record No Suffix,1,,"A,C,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3200,Rad--Boost RX Modality,1,,"A,C,I,M",,,,2003,10,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3210,Rad--Boost Dose cGy,1,,"A,C,I,M",,,,2003,10,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3440,Derived PreRx-7 T,3,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3442,Derived PreRx-7 T Descrip,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3450,Derived PreRx-7 N,3,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3452,Derived PreRx-7 N Descrip,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3462,Derived PreRx-7 M Descrip,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3470,Derived PreRx-7 Stage Grp,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3480,Derived PostRx-7 T,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3482,Derived PostRx-7 N,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3490,Derived PostRx-7 M,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3492,Derived PostRx-7 Stge Grp,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3600,Derived Neoadjuv Rx Flag,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3650,NPCR Derived Clin Stg Grp,1,,"A,C,I,M",,,,2016,16,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3655,NPCR Derived Path Stg Grp,1,,"A,C,I,M",,,,2016,16,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+2155,RQRS NCDB Submission Flag,1,,"A,C,I,M",,,,2018,18,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+3460,Derived PreRx-7 M,1,,"A,C,I,M",,,,2010,12,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+1510,Rad--Regional Dose: cGy,1,,"A,C,I,M",,,,,,2025,25,,,,,"The NAACCR UDSC retired this data item in Version 25, as of January 1, 2025.",,,,,,,,,Revised,Revised,Revised,Retired,Retired,Retired,Retired,Retired,Retired
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

docs/naaccr-25/dictionary-differences-v240-and-v250.txt

@@ -0,0 +1,83 @@
+Comparison summary of base 240 and 250 dictionaries.
+
+The following item(s) were added to version 250:
+ - chromosome16qLossHeterozygosity (#1189) - Chromosome 16q: Loss of Heterozygosity
+ - chromosome1qStatus (#1190) - Chromosome 1q Status
+ - derivedPediatricM (#1144) - Derived Pediatric M
+ - derivedPediatricStageGroup (#1145) - Derived Pediatric Stage Group
+ - derivedPediatricT (#1142) - Derived Pediatric T
+ - derivedPediatricTN (#1143) - Derived Pediatric N
+ - ewsr1Fli1Fusion (#1191) - EWSR1-FLI1 fusion
+ - foxo1GeneRearrangements (#1193) - FOXO1 Gene Rearrangements
+ - inpc (#1187) - Intl Neuroblastoma Path Prog Class (INPC)
+ - inrgss (#1185) - Intl Neuroblastoma Risk Grp Stag Sys (INRGSS)
+ - irssStageForEye2 (#1188) - IRSS Stage for Eye-2
+ - nMycAmplification (#1186) - n-MYC Amplification
+ - pdl1 (#1174) - PD-L1
+ - pediatricId (#1132) - Pediatric ID
+ - pediatricIdVersionCurrent (#1133) - Pediatric ID Version Current
+ - pediatricIdVersionOriginal (#1134) - Pediatric ID Version Original
+ - pediatricMets (#1138) - Pediatric Mets
+ - pediatricPrimaryTumor (#1136) - Pediatric Primary Tumor
+ - pediatricRegionalNodes (#1137) - Pediatric Regional Nodes
+ - pretextClinicalStaging (#1192) - Pretext Clinical Staging
+ - ptld (#1172) - Post Transplant Lymphoproliferative Disorder-PTLD
+ - torontoM (#1148) - Toronto M
+ - torontoN (#1147) - Toronto N
+ - torontoStageGroup (#1149) - Toronto Stage Group
+ - torontoT (#1146) - Toronto T
+ - torontoVersionNumber (#1135) - Toronto Version Number
+ - whiteBloodCellCount (#1184) - White Blood Cell Count
+
+The following item(s) were removed from version 240:
+ - censusIndCode19702000 (#280) - Census Ind Code 1970-2000
+ - censusOccCode19702000 (#270) - Census Occ Code 1970-2000
+ - censusOccIndSys7000 (#330) - Census Occ/Ind Sys 70-00
+ - derivedNeoadjuvRxFlag (#3600) - Derived Neoadjuv Rx Flag
+ - derivedPostrx7M (#3490) - Derived PostRx-7 M
+ - derivedPostrx7N (#3482) - Derived PostRx-7 N
+ - derivedPostrx7StgeGrp (#3492) - Derived PostRx-7 Stge Grp
+ - derivedPostrx7T (#3480) - Derived PostRx-7 T
+ - derivedPrerx7M (#3460) - Derived PreRx-7 M
+ - derivedPrerx7MDescrip (#3462) - Derived PreRx-7 M Descrip
+ - derivedPrerx7N (#3450) - Derived PreRx-7 N
+ - derivedPrerx7NDescrip (#3452) - Derived PreRx-7 N Descrip
+ - derivedPrerx7StageGrp (#3470) - Derived PreRx-7 Stage Grp
+ - derivedPrerx7T (#3440) - Derived PreRx-7 T
+ - derivedPrerx7TDescrip (#3442) - Derived PreRx-7 T Descrip
+ - diagnosticProc7387 (#2200) - Diagnostic Proc 73-87
+ - inpatientStatus (#605) - Inpatient Status
+ - militaryRecordNoSuffix (#2310) - Military Record No Suffix
+ - npcrDerivedClinStgGrp (#3650) - NPCR Derived Clin Stg Grp
+ - npcrDerivedPathStgGrp (#3655) - NPCR Derived Path Stg Grp
+ - qualityOfSurvival (#1780) - Quality of Survival
+ - raceCodingSysCurrent (#170) - Race Coding Sys--Current
+ - raceCodingSysOriginal (#180) - Race Coding Sys--Original
+ - radBoostDoseCgy (#3210) - Rad--Boost Dose cGy
+ - radBoostRxModality (#3200) - Rad--Boost RX Modality
+ - radNoOfTreatmentVol (#1520) - Rad--No of Treatment Vol
+ - radRegionalDoseCgy (#1510) - Rad--Regional Dose: cGy
+ - radTreatmentVolume (#1540) - Rad--Treatment Volume
+ - rqrsNcdbSubmissionFlag (#2155) - RQRS NCDB Submission Flag
+ - subsqRxReconstructDel (#1741) - Subsq RX--Reconstruct Del
+
+The following item(s) got their name changed in version 250:
+ - censusIndCode2010 (#272) - from "Census Ind Code 2010 CDC" to "Census Ind Code CDC"
+ - censusOccCode2010 (#282) - from "Census Occ Code 2010 CDC" to "Census Occ Code CDC"
+
+The following item(s) got their length changed in version 250:
+ - pathDateSpecCollect1 (#7320) - from "14" to "25"
+ - pathDateSpecCollect2 (#7321) - from "14" to "25"
+ - pathDateSpecCollect3 (#7322) - from "14" to "25"
+ - pathDateSpecCollect4 (#7323) - from "14" to "25"
+ - pathDateSpecCollect5 (#7324) - from "14" to "25"
+
+The following item(s) got their data type changed in version 250:
+ - geocodingQualityCodeDetail (#87) - from "alpha" to "mixed"
+ - pathDateSpecCollect1 (#7320) - from "date" to "dateTime"
+ - pathDateSpecCollect2 (#7321) - from "date" to "dateTime"
+ - pathDateSpecCollect3 (#7322) - from "date" to "dateTime"
+ - pathDateSpecCollect4 (#7323) - from "date" to "dateTime"
+ - pathDateSpecCollect5 (#7324) - from "date" to "dateTime"
+ - schemaIdVersionCurrent (#2117) - from "text" to "numeric"
+ - schemaIdVersionOriginal (#2118) - from "text" to "numeric"