@@ -26,7 +26,7 @@ import sys
2626
2727from pyard .constants import VALID_REDUCTION_TYPES
2828import pyard .misc
29- from pyard .exceptions import InvalidAlleleError
29+ from pyard .exceptions import InvalidAlleleError , InvalidTypingError
3030from pyard .misc import get_data_dir , get_imgt_version
3131
3232if __name__ == "__main__" :
@@ -63,6 +63,13 @@ if __name__ == "__main__":
6363 help = "Reduction Method" ,
6464 )
6565 parser .add_argument ("--splits" , dest = "splits" , help = "Find Broad and Splits" )
66+ parser .add_argument (
67+ "--validate" ,
68+ dest = "validate" ,
69+ action = "store_true" ,
70+ help = "Validate the provided GL String" ,
71+ )
72+ parser .add_argument ("--cwd" , dest = "cwd" , help = "Perform CWD redux" )
6673
6774 args = parser .parse_args ()
6875
@@ -83,6 +90,15 @@ if __name__ == "__main__":
8390 sys .exit (0 )
8491
8592 try :
93+ if args .validate :
94+ ard .validate (args .cwd )
95+ if args .cwd :
96+ if args .validate :
97+ ard .validate (args .cwd )
98+ cwd_redux = ard .cwd_redux (args .cwd )
99+ print (cwd_redux )
100+ sys .exit (0 )
101+
86102 if args .redux_type :
87103 print (ard .redux (args .gl_string , args .redux_type ))
88104 else :
@@ -93,7 +109,12 @@ if __name__ == "__main__":
93109 print (ard .redux (args .gl_string , redux_type ))
94110 print ()
95111 except InvalidAlleleError as e :
96- print ("Error:" , e )
97-
98- # Remove ard and close db connection
99- del ard
112+ print ("Allele Error:" , e .message , file = sys .stderr )
113+ sys .exit (1 )
114+ except InvalidTypingError as e :
115+ print ("Typing Error:" , e .message , file = sys .stderr )
116+ sys .exit (2 )
117+ else :
118+ # Remove ard and close db connection
119+ print ("Removing" )
120+ del ard
0 commit comments