Add new release v0.1.1

Author: devfabiosilva

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Changelog
 WITSML 2.1 to BSON parser changelogs
 
+## [0.1.1] - 2023-09-23
+- Add Python 3 module (>= 3.8) 🐍✔️
+- Add Node JS (>= v16.20.2) addon ✔️
+- Add PGP public key for signature verification ✔️
+- Add C tests (in progress) ⏰🧪👀
+
 ## [0.1.0] - 2023-09-03
-- Inicial release of WITSML 2.1 to BSON parser
+- Inicial release of WITSML 2.1 to BSON parser ✔️
 
 ## [master] - current
 
+[0.1.1]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.1
 [0.1.0]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.0
 [master]: https://github.com/devfabiosilva/witsml21parser/tree/master
 

NodeJS/app.js

@@ -1,17 +1,81 @@
-// Begin add sample application Node WITSML 2.1 parser
-//import { BSON, EJSON, ObjectId } from 'bson';
-const { BSON, EJSON } = require('bson');
-a = require('./jswitsml21bson')
+const witml21bson = require('./jswitsml21bson')
+const { BSON } = require('bson')
 
-b = a.create()
+parser = witml21bson.create()
 
-bytes = b.parseFromFile('../examples/xmls/OpsReport.xml')
+O_LIST = [
+ 'BhaRun', 'CementJob', 'DepthRegImage', 'DownholeComponent', 'DrillReport', 'FluidsReport', 'Log', 'MudLogReport', 'OpsReport', 'Rig',
+ 'Risk', 'StimJob', 'SurveyProgram', 'Target', 'ToolErrorModel', 'Trajectory', 'Tubular', 'Well', 'Wellbore', 'WellboreCompletion',
+ 'WellboreGeology', 'WellCMLedger', 'WellCompletion', "INVALID_Log", "INVALID_OpsReport"
+]
 
-const doc = BSON.deserialize(bytes);
-//console.log(doc["website"])
-//console.log(doc["dependencies"]["gSoap"])
-console.log(doc)
-console.log(EJSON.stringify(doc, { relaxed: false }));
+console.log("\n" + parser.getInstanceName() + "\n")
 
-b=null
+const DEFAULT_PATH = "../examples/"
+const DEFAULT_PATH_XML = DEFAULT_PATH + "xmls/"
+
+function save_to_file(caller, file_path) {
+  var ret = false
+  try {
+    caller(file_path)
+  } catch (e) {
+    ret = true
+    console.log("Error " + e.toString())
+    console.log("Maybe file " + file_path + " exists")
+  }
+
+  return ret
+}
+
+function print_parser_error(parser) {
+  console.log("Error number: " + parser.getError().toString())
+  var faultString = parser.getFaultString()
+  var XMLfaultdetail = parser.getXMLfaultdetail()
+  if (faultString != null)
+    console.log(faultString)
+  if (XMLfaultdetail != null)
+    console.log(XMLfaultdetail)
+}
+
+function readWitsml21Objects(parser) {
+  for (o of O_LIST) {
+    var fp = DEFAULT_PATH_XML + o + ".xml"
+    var bsonByte
+    console.log("\nOpening " + fp)
+    console.log(o)
+    try {
+      bsonByte = parser.parseFromFile(fp)
+    } catch (e) {
+      console.log(e.toString())
+      print_parser_error(parser)
+      continue
+    }
+
+    try {
+      console.log("WITSML 2.1 XML statistics:")
+      console.log(parser.getStatistics())
+      var jsonFile = DEFAULT_PATH + o + ".json"
+      console.log("Saving JSON to file " + jsonFile)
+
+      if (save_to_file(parser.saveToFileJSON, jsonFile))
+        continue
+
+      bsonFile = DEFAULT_PATH + o + ".bson"
+      console.log("Saving BSON to file " + bsonFile)
+
+      if (save_to_file(parser.saveToFile, bsonFile))
+        continue
+
+      console.log(bsonByte)
+      console.log("BSON to NodeJS object")
+      console.log(BSON.deserialize(bsonByte))
+      console.log("JSON string")
+      console.log(parser.getJson())
+    } catch (e) {
+      console.log("Error " + e.toString())
+    }
+  }
+}
+
+readWitsml21Objects(parser)
 

Python/witsml21parser.py

@@ -21,7 +21,6 @@ def save_to_file(caller, file_path) -> bool:
   except Exception as e:
     ret = True
     print("File saving error: " + str(e))
-  finally:
     print("Maybe file " + file_path + " exists")
 
   return ret

README.md

@@ -257,6 +257,13 @@ Answer is simple.
 - Only two library dependency ([gSoap](https://www.genivia.com/products.html) and [libbson](https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson))
 - No garbage collector on parsing objects
 
+# SIGNING KEY
+
+_Keys for signature_:
+
+**[fabioegel@gmail.com](mailto:fabioegel@gmail.com)**
+**fingerprint**: 6E21 A6B6 E1A4 6580 CA00 FA54 1077 26E9 14B9 16A2
+
 # LICENSES
 
 This project is fully open source and MIT license.

binding.gyp

@@ -8,7 +8,7 @@
       "libraries": [
               "-Wl,--start-group ../lib/libcws_js.a ../lib/libbson-shared-1.0.a ../soapC_shared.o -Wl,--end-group"
           ],
-      "defines": ["CWS_LITTLE_ENDIAN", "WITH_STATISTICS", "JS_SOAP_DEBUG"],
+      "defines": ["CWS_LITTLE_ENDIAN", "WITH_STATISTICS"],
       "cflags": ["-Wno-stringop-truncation", "-Wno-format-truncation"],
     }
   ]

setup.py

@@ -14,7 +14,7 @@ def main():
             libraries=['cws_py', 'bson-shared-1.0'],
             extra_objects=["soapC_shared.o"],
             include_dirs=['include'],
-            define_macros=[('CWS_LITTLE_ENDIAN', None), ('WITH_STATISTICS', None), ('PY_SOAP_DEBUG', None)]
+            define_macros=[('CWS_LITTLE_ENDIAN', None), ('WITH_STATISTICS', None)]
         )])
 
 if __name__ == "__main__":