@@ -32,8 +32,7 @@ def match(self, value: str) -> str | None:
3232
3333RULES : list [NameRule ] = [
3434 NameRule (
35- # XXXX J{HH}{MM}{SS.ssss}+{DD}{MM}{SS.ssss}
36- name = "CatalogJ" ,
35+ name = "CAT JHHMMSS.sss+DDMMSS.sss" ,
3736 pattern = re .compile (
3837 r"^([A-Za-z0-9]{2,5})J(\d{2})(\d{2})(\d{2}(?:\.\d+)?)([+-])(\d{2})(\d{2})(\d{2}(?:\.\d+)?)$" ,
3938 re .IGNORECASE ,
@@ -45,8 +44,7 @@ def match(self, value: str) -> str | None:
4544 ),
4645 ),
4746 NameRule (
48- # XXXX J{HHMMSSss}+{DDMMSSs}
49- name = "CatalogJ" ,
47+ name = "CAT JHHMMSSss+DDMMSSs" ,
5048 pattern = re .compile (
5149 r"^([A-Za-z0-9]{2,5})J(\d{8})([+-])(\d{7})$" ,
5250 re .IGNORECASE ,
@@ -55,8 +53,7 @@ def match(self, value: str) -> str | None:
5553 replacer = lambda m : f"{ m .group (1 ).upper ()} J{ m .group (2 )} { m .group (3 )} { m .group (4 )} " ,
5654 ),
5755 NameRule (
58- # XXXX J{HH}{MM}+{DD}{MM}
59- name = "CatalogJ" ,
56+ name = "CAT JHHMM+DDMM" ,
6057 pattern = re .compile (
6158 r"^([A-Za-z0-9]{2,5})J(\d{2})(\d{2})([+-])(\d{2})(\d{2})$" ,
6259 re .IGNORECASE ,
@@ -65,8 +62,7 @@ def match(self, value: str) -> str | None:
6562 replacer = lambda m : f"{ m .group (1 ).upper ()} J{ m .group (2 )} { m .group (3 )} { m .group (4 )} { m .group (5 )} { m .group (6 )} " ,
6663 ),
6764 NameRule (
68- # XXXX [J] HHMM+DD[a-z]?
69- name = "CatalogJ" ,
65+ name = "CAT J HHMM+DD" ,
7066 pattern = re .compile (
7167 r"^([A-Za-z0-9]{2,6})\s*(J?)\s*(\d{4})([+-])(\d{2,3})([a-z])?$" ,
7268 re .IGNORECASE ,
@@ -77,8 +73,7 @@ def match(self, value: str) -> str | None:
7773 ),
7874 ),
7975 NameRule (
80- # XXXX 7dig+6dig
81- name = "CatalogJ" ,
76+ name = "CAT HHMMSSs+DDMMSS" ,
8277 pattern = re .compile (
8378 r"^([A-Za-z0-9]{2,6})\s*(\d{7})([+-])(\d{6})$" ,
8479 re .IGNORECASE ,
@@ -87,8 +82,7 @@ def match(self, value: str) -> str | None:
8782 replacer = lambda m : f"{ m .group (1 ).upper ()} { m .group (2 )} { m .group (3 )} { m .group (4 )} " ,
8883 ),
8984 NameRule (
90- # XXXX {NNNNNN}[a-z]
91- name = "CatalogNum" ,
85+ name = "CAT NNNNNN" ,
9286 pattern = re .compile (
9387 r"^([A-Za-z]{2,7})\s*0*(\d{1,10})([a-zA-Z]{1,3})?$" ,
9488 re .IGNORECASE ,
@@ -97,8 +91,7 @@ def match(self, value: str) -> str | None:
9791 replacer = lambda m : f"{ m .group (1 ).upper ()} { int (m .group (2 ))} { m .group (3 ) or '' } " ,
9892 ),
9993 NameRule (
100- # XXXX ±NNNNNN
101- name = "CatalogSign" ,
94+ name = "CAT +HHMMSS" ,
10295 pattern = re .compile (
10396 r"^([A-Za-z]{2,5})\s*([+-])(\d{6})$" ,
10497 re .IGNORECASE ,
0 commit comments