s

ats/analysis/ATS_AIM_customer_data_analysis.js

@@ -457,11 +457,17 @@ try {
             var layer_name = layer
             var drill_type = tool.type
             var finish_size = tool.finish_size - 0
-            if(matrix[layer].type == "laser_drill"){ 
+            if(matrix[layer].type == "laser_drill" && /^[^\d]+(\d+)-(\d+)[^\d]?$/.test(layer_name)){ 
                 drill_type = "laser"
-                var info_drilll = /[^\d]+(\d+)-(\d+)/.exec(layer_name);
+                var info_drilll = /^[^\d]+(\d+)-(\d+)[^\d]?$/.exec(layer_name);
                 layer_name = "l" + info_drilll[1] + "-" + info_drilll[2];
+            } else if(layer_name === "ftdrill"){
+                layer_name = "drill"
+            } else if(/^[^\d]+(\d+)-(\d+)[^\d]?$/.test(layer_name)) {
+                var info_drilll = /^[^\d]+(\d+)-(\d+)[^\d]?$/.exec(layer_name);
+                layer_name = "d" + info_drilll[1] + "-" + info_drilll[2];
             }
+
             if(matrix[layer].type == "bury_drill"){
                 drill_type = "via"
             }

ats/rename/ATS_AIM_data_format.js

@@ -62,7 +62,7 @@ try {
     var mode = "use" // develop
     var par = PAR;
 	if(!par.hasOwnProperty("config_path") || par.config_path==""){
-		console.log("======== ======cfg");
+		console.log("==============cfg");
 		par.config_path = "cam/input_data"
 	};
 	var db_customer = db.query("",function(q){