Fix: query to not return #id when JSONPath does not match

rzander · Feb 7, 2018 · 3ad33dc · 3ad33dc
1 parent ffc8df4
commit 3ad33dc
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/source/jaindb/jaindb.cs b/source/jaindb/jaindb.cs
@@ -1133,13 +1133,24 @@ public static JArray query(string paths, string select)
                     JObject oRes = new JObject();
                     foreach (string sAttrib in select.Split(','))
                     {
-                        oRes.Add(sAttrib.Trim(), jObj[sAttrib]);
+                        //var jVal = jObj[sAttrib];
+                        var jVal = jObj.SelectToken(sAttrib);
+
+                        if (jVal != null)
+                            oRes.Add(sAttrib.Trim(), jVal);
                     }
-                    foreach (string path in paths.Split(','))
+                    foreach (string path in paths.Split(';'))
                     {
                         try
                         {
                             var oToks = jObj.SelectTokens(path.Trim(), false);
+
+                            if (oToks.Count() == 0)
+                            {
+                                oRes = new JObject(); //remove selected attributes as we do not have any vresults from jsonpath
+                                continue;
+                            }
+
                             foreach (JToken oTok in oToks)
                             {
                                 try
@@ -1165,15 +1176,18 @@ public static JArray query(string paths, string select)
                                 }
                                 catch(Exception ex)
                                 {
-                                    ex.Message.ToString();
+                                    Debug.WriteLine("Error Query_5: " + ex.Message.ToString());
                                 }
 
                             }
 
                             /*if (oToks.Count() == 0)
-                                oRes = null; */
+                                oRes = new JObject(); */
+                        }
+                        catch(Exception ex)
+                        {
+                            Debug.WriteLine("Error Query_5: " + ex.Message.ToString());
                         }
-                        catch { }
                     }
                     if (oRes.HasValues)
                     {
@@ -1182,7 +1196,10 @@ public static JArray query(string paths, string select)
                         //i++;
                     }
                 }
-                catch { }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine("Error Query_5: " + ex.Message.ToString());
+                }
             }
 
             return aRes;