封装正则匹配

utils/functions.py

 #!/usr/bin/env python
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 # -*- coding:utf-8 -*-
 import re
 import re
-from config import unit_map, cast_map, unit_regex, special_tuple, encap_list, temp_map, special_str
+from config import unit_map, cast_map, unit_regex, special_tuple, encap_list, temp_map, special_str, encap_regex
 
 
 unit_pattern = re.compile('(\d+|\d+[\\\./?]\d+)(' + unit_regex + ')([.a-zA-Z\\-]?)')
 unit_pattern = re.compile('(\d+|\d+[\\\./?]\d+)(' + unit_regex + ')([.a-zA-Z\\-]?)')
+encap_pattern = re.compile('.*('+encap_regex+').*')
 
 
 
 
 def is_float(s):
 def is_float(s):
@@ -183,8 +184,9 @@ def check_encap(kw):
     :param kw:
     :param kw:
     :return:
     :return:
     """
     """
-    if kw in encap_list:
-        return True
+    encap_res = encap_pattern.findall(kw)
+    if encap_res:
+        return encap_res
     return False
     return False
 
 
 
 

valid_server.py

@@ -132,11 +132,10 @@ class UCHandler(tornado.web.RequestHandler):
                     if check_temp(kw_info):
                     if check_temp(kw_info):
                         attrs_list.append(kw_info)
                         attrs_list.append(kw_info)
                     else:
                     else:
-                        encap_res = self.encap_par.findall(kw_info)
+                        encap_res = check_encap(kw)
                         if encap_res:
                         if encap_res:
-                            if check_encap(encap_res[0]):
-                                encap_list.append(encap_res[0])
-                                continue
+                            encap_list.append(encap_res[0])
+                            continue
                         if kw_info and check_symbol(kw_info):
                         if kw_info and check_symbol(kw_info):
                             words_list.append(kw_info)
                             words_list.append(kw_info)