Fixed bug and only check for first key char for ext Json

JohnAD · Dec 25, 2019 · 9d54157 · 9d54157
1 parent d3aa6b5
commit 9d54157
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 Introduction to bson
 ==============================================================================
-ver 1.1.1
+ver 1.1.2
 
 .. image:: https://raw.githubusercontent.com/yglukhov/nimble-tag/master/nimble.png
    :height: 34

diff --git a/bson.nimble b/bson.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version      = "1.1.1"
+version      = "1.1.2"
 author       = "John Dupuy"
 description  = "BSON (Binary Json) serialization"
 license      = "MIT"

diff --git a/docs/bson-ref.rst b/docs/bson-ref.rst
@@ -484,7 +484,7 @@ interpretExtendedJson
 
         proc interpretExtendedJson*(j: JsonNode): Bson =
 
-    source line: `1871 <../src/bson.nim#L1871>`__
+    source line: `1874 <../src/bson.nim#L1874>`__
 
     Convert a JsonNode object (from the ``json`` Nim library) to a
     Bson object.

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,6 +1,6 @@
 Introduction to bson
 ==============================================================================
-ver 1.1.1
+ver 1.1.2
 
 BSON
 

diff --git a/src/bson.nim b/src/bson.nim
@@ -1801,7 +1801,10 @@ proc interpExtJsonObject(j: JsonNode, foundKeyword: string): Bson =
         try:
           dt = parseTime(j[foundKeyword].str, "yyyy-MM-dd'T'HH:mm:sszzz", utc())
         except:
-          dt = parseTime(j[foundKeyword].str, "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz", utc())
+          try:
+            dt = parseTime(j[foundKeyword].str, "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz", utc())
+          except:
+            dt = parseTime(j[foundKeyword].str, "yyyy-MM-dd'T'HH:mm:ss", utc())
         result = toBson(dt)
       elif j[foundKeyword].kind == JObject:
         let dt = fromMilliseconds(parseInt(j[foundKeyword]["$numberLong"].str))
@@ -1853,7 +1856,7 @@ proc interpExtJsonRecurse(j: JsonNode): Bson =
   of JObject:
     var extendedKeyword = ""
     for key in j.keys():
-      if key.contains("$"):
+      if key.startsWith("$"):
         extendedKeyword = key
         break
     if len(extendedKeyword) > 0: