influxmigration fixes

naxan6 · Sep 28, 2024 · 2459e1e · 2459e1e
1 parent 417a135
commit 2459e1e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/FKala.Core/Migrations/Influx/InfluxLineParser.cs b/FKala.Core/Migrations/Influx/InfluxLineParser.cs
@@ -88,6 +88,15 @@ private void ReadTags(IEnumerator<char> ce)
                     sb.Clear();
                     continue;
                 }
+                if ('\\' == c) //read escaped char instantly
+                {
+                    //sb.Add(c);
+                    someleft = ce.MoveNext();
+                    c = ce.Current;
+                    sb.Add(c);
+                    someleft = ce.MoveNext();
+                    continue;
+                }
                 if (' ' == c)
                 {
                     var pair = new string(sb.ToArray()).Trim().Split("=");
@@ -96,13 +105,7 @@ private void ReadTags(IEnumerator<char> ce)
                     sb.Clear();
                     return;
                 }
-                if ('\\' == c) //read escaped char instantly
-                {
-                    sb.Add(c);
-                    someleft = ce.MoveNext();
-                    sb.Add(c);
-                    continue;
-                }
+
 
 
                 sb.Add(c);
@@ -141,6 +144,15 @@ private void ReadFields(IEnumerator<char> ce)
                     sb.Clear();
                     continue;
                 }
+                if ('\\' == c) //read escaped char instantly
+                {
+                    //sb.Add(c);
+                    someleft = ce.MoveNext();
+                    c = ce.Current;
+                    sb.Add(c);
+                    someleft = ce.MoveNext();
+                    continue;
+                }
                 if (' ' == c)
                 {
                     var pair = new string(sb.ToArray()).Trim().Split("=");
@@ -149,13 +161,7 @@ private void ReadFields(IEnumerator<char> ce)
                     sb.Clear();
                     return;
                 }
-                if ('\\' == c) //read escaped char instantly
-                {
-                    sb.Add(c);
-                    someleft = ce.MoveNext();
-                    sb.Add(c);
-                    continue;
-                }
+
 
 
                 sb.Add(c);

diff --git a/FKala.Core/Migrations/Influx/InfluxLineProtocolImporter.cs b/FKala.Core/Migrations/Influx/InfluxLineProtocolImporter.cs
@@ -106,7 +106,7 @@ public void ImportLine(string line)
                 } 
                 else if (tags.ContainsKey("sensorname"))
                 {
-                    newMeasurement = tags["sensorname"].Replace(" ", "_");
+                    newMeasurement = measurement + "/" + tags["sensorname"].Replace(" ", "_");
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ public void ImportLine(string line) @@
                     }
                     else if (tags.ContainsKey("sensorname"))
                     {
-                        newMeasurement = tags["sensorname"].Replace(" ", "_");
+                        newMeasurement = measurement + "/" + tags["sensorname"].Replace(" ", "_");
                     }
@@ Expand Down @@