| | @@ -117,50 +116,8 @@ |
| 117 | 116 | #endregion
|
| 118 | 117 |
|
| 119 | 118 | #region フィルター用意
|
| 120 | | - try
|
| 121 | | - {
|
| 122 | | - doc_filter.Load(filter_xmlpath);
|
| 123 | | - }
|
| 124 | | - catch (Exception e)
|
| 125 | | - {
|
| 126 | | - Console.WriteLine(e.Message);
|
| 127 | | - return 1;
|
| 128 | | - }
|
| 129 | | -
|
| 130 | | - if (doc_filter.ChildNodes.Count == 0)
|
| 131 | | - {
|
| 132 | | - Console.WriteLine("not found filter.");
|
| 133 | | - return 1;
|
| 134 | | - }
|
| 135 | | - List<string> filter_xpaths = XmlToXPathList.Convert(doc_filter.SelectSingleNode("//CCCC_Project"));
|
| 136 | | - if (filter_xpaths.Count == 0)
|
| 137 | | - {
|
| 138 | | - Console.WriteLine("not found CCCC_Project node");
|
| 139 | | - return 1;
|
| 140 | | - }
|
| 141 | | - List<Filter> filter_list = new List<Filter>();
|
| 142 | | - foreach (string xpath in filter_xpaths)
|
| 143 | | - {
|
| 144 | | - Filter f = new Filter();
|
| 145 | | - XmlNode filter_node = doc_filter.SelectSingleNode(xpath);
|
| 146 | | - f.TestName = filter_node.ParentNode.Name + "/" + filter_node.Name + " : ";
|
| 147 | | - f.strXPath = xpath;
|
| 148 | | - f.list = new List<FilterAttribute>();
|
| 149 | | - foreach (XmlAttribute attr in filter_node.Attributes)
|
| 150 | | - {
|
| 151 | | - FilterAttribute a = new FilterAttribute();
|
| 152 | | - a.Name = attr.Name;
|
| 153 | | - a.Value = attr.Value;
|
| 154 | | - a.Eval = new CSharpEval();
|
| 155 | | - if (!a.Eval.Init(attr.Value))
|
| 156 | | - {
|
| 157 | | - Console.WriteLine("Evaluation of the filter expression is invalid xml.");
|
| 158 | | - return 1;
|
| 159 | | - }
|
| 160 | | - f.list.Add(a);
|
| 161 | | - }
|
| 162 | | - filter_list.Add(f);
|
| 163 | | - }
|
| 119 | + List<Filter> filter_list = FilterBuilder.Build(filter_xmlpath);
|
| 120 | + if (filter_list == null) return 1;
|
| 164 | 121 | #endregion
|
| 165 | 122 |
|
| 166 | 123 | #region 標準入力からのファイルパス取得
|
| | @@ -341,40 +298,3 @@ |
| 341 | 298 | }
|
| 342 | 299 | }
|
| 343 | 300 |
|
| 344 | | -#region XmlToXPathList
|
| 345 | | -class XmlToXPathList
|
| 346 | | -{
|
| 347 | | - public static List<string> Convert(XmlNode node)
|
| 348 | | - {
|
| 349 | | - List<string> list = new List<string>();
|
| 350 | | - if (node.ChildNodes.Count == 0)
|
| 351 | | - {
|
| 352 | | - string path = node.Name;
|
| 353 | | - XmlNode p = node.ParentNode;
|
| 354 | | - while (p != null && p.ParentNode != null)
|
| 355 | | - {
|
| 356 | | - path = p.Name + "/" + path;
|
| 357 | | - p = p.ParentNode;
|
| 358 | | - }
|
| 359 | | - path = "//" + path;
|
| 360 | | - list.Add(path);
|
| 361 | | - }
|
| 362 | | - foreach (XmlNode n in node.ChildNodes)
|
| 363 | | - {
|
| 364 | | - list.AddRange(Convert(n));
|
| 365 | | - }
|
| 366 | | - return list;
|
| 367 | | - }
|
| 368 | | - public static List<string> Convert(XmlDocument doc)
|
| 369 | | - {
|
| 370 | | - List<string> list = new List<string>();
|
| 371 | | -
|
| 372 | | - foreach (XmlNode n in doc.ChildNodes)
|
| 373 | | - {
|
| 374 | | - list.AddRange(Convert(n));
|
| 375 | | - }
|
| 376 | | - return list;
|
| 377 | | - }
|
| 378 | | -}
|
| 379 | | -
|
| 380 | | -#endregion
|
srz_zumix
trunk/src/c4ju.csproj
trunk/bin/c4ju.exe