X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Dicts%2FCMakeLists.txt;h=d6dce9319bba4dff6061e95280fbc62496a725fe;hb=130d6aa572c77dfe6ea8cd493d627a3535f2d0f1;hp=9df8fb6e160021e0dace1a8870e2da1d99fca1b8;hpb=f5a0fef3aab1f9a58f013d4a5c4a0d61daa56841;p=gdcm.git

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index 9df8fb6e..d6dce931 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(DICOM_DATA_DICTIONARY "")
 
 FOREACH(line ${ENT})
   STRING(REGEX REPLACE
-    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([A-Z?]+) ([A-Za-z0-9()'/, ?.&-]*).*$"
+    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([1-9n-]+) ([A-Za-z0-9()'/, ?.&-]*).*$"
     "   {0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\"}, " nline "${line}")
   SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
@@ -59,7 +59,7 @@ SET(DICOM_DIR_DICTIONARY "")
 
 FOREACH(line ${ENT_DIR})
   STRING(REGEX REPLACE
-    "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"]([A-Za-z'/ ].*)$"
+    "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"]([A-Za-z0-9()?._'/ !=:-]*).*$"
     "  {\"\\1\" , 0x\\2 , 0x\\3 , \"\\4\"}, \\5" nline "${line}")
   SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY}\n${nline}")
 ENDFOREACH(line)