TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing conflict erros in DateFilter

Browse Source
This commit is contained in:
Jonathan Preddy
2014-07-22 11:47:02 -04:00
parent f803a9ec30
commit 6942b3cb6b
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
TimberWinR/Configuration.cs
View File

@@ -477,7 +477,7 @@ namespace TimberWinR
switch (e.Name.ToString())
{
case "Grok":
TimberWinR.Filters.GrokFilter.Params_Grok args = parseParams_Grok(e.Elements());
TimberWinR.Filters.GrokFilter.Params_GrokFilter args = parseParams_GrokFilter(e.Elements());
GrokFilter grok = new GrokFilter(args);
_filters.Add(grok);
break;
@@ -868,9 +868,9 @@ namespace TimberWinR
return p.Build();
}
static TimberWinR.Filters.GrokFilter.Params_Grok parseParams_Grok(IEnumerable<XElement> elements)
static TimberWinR.Filters.GrokFilter.Params_GrokFilter parseParams_GrokFilter(IEnumerable<XElement> elements)
{
TimberWinR.Filters.GrokFilter.Params_Grok.Builder p = new TimberWinR.Filters.GrokFilter.Params_Grok.Builder();
TimberWinR.Filters.GrokFilter.Params_GrokFilter.Builder p = new TimberWinR.Filters.GrokFilter.Params_GrokFilter.Builder();
foreach (XElement e in elements)
{

19
TimberWinR/Filters/DateFilter.cs
View File

@@ -15,13 +15,12 @@ namespace TimberWinR.Filters
public bool ConvertToUTC { get; private set; }
public List<string> Patterns { get; private set; }
<<<<<<< HEAD
public DateFilter(Params_DateFilter args)
{
Field = args.Field;
Target = args.Target;
ConvertToUTC = args.ConvertToUTC;
Pattern = args.Pattern;
Patterns = args.Patterns;
}
public override string ToString()
@@ -39,14 +38,6 @@ namespace TimberWinR.Filters
return sb.ToString();
}
public override void Apply(Newtonsoft.Json.Linq.JObject json)
=======
public DateFilter()
>>>>>>> ec8c41eb8339a04a975b5813cfedc74a9b787e56
{
Patterns = new List<string>();
}
public override void Apply(JObject json)
{
JToken token = null;
@@ -92,14 +83,14 @@ namespace TimberWinR.Filters
public string Field { get; private set; }
public string Target { get; private set; }
public bool ConvertToUTC { get; private set; }
public List<string> Pattern { get; private set; }
public List<string> Patterns { get; private set; }
public class Builder
{
private string field;
private string target;
private bool convertToUTC = false;
private List<string> pattern;
private List<string> patterns;
public Builder WithField(string value)
{
@@ -121,7 +112,7 @@ namespace TimberWinR.Filters
public Builder WithPattern(string value)
{
pattern.Add(value);
patterns.Add(value);
return this;
}
@@ -132,7 +123,7 @@ namespace TimberWinR.Filters
Field = field,
Target = target,
ConvertToUTC = convertToUTC,
Pattern = pattern
Patterns = patterns
};
}