search for: xpath_helpers

To allow other pieces of code to process XML files easily, move the xml.ml* and xpath_helpers.ml* from v2v to mllib. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 9 +++++++-- {v2v => mllib}/xml-c.c | 0 {v2v => mllib}/xml.ml | 0 {v2v => mllib}/xml.mli | 0 {v2v => mllib}/xpath_helpers.ml | 0 {v2v => m...

On Thursday, 23 March 2017 10:02:47 CEST Cédric Bosdonnat wrote: > This function will allow more OCAML-ish processing of xpath queries > with multiple results. s/OCAML/OCaml/ s/xpath/XPath/ > --- > mllib/xpath_helpers.ml | 9 +++++++++ > mllib/xpath_helpers.mli | 4 ++++ > 2 files changed, 13 insertions(+) > > diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml > index 8648596a4..f12156f45 100644 > --- a/mllib/xpath_helpers.ml > +++ b/mllib/xpath_helpers.ml > @@ -53,3 +53,12 @@...

To allow other pieces of code to process XML files easily, move the xml.ml* and xpath_helpers.ml* from v2v to mllib. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 9 ++++++-- {v2v => mllib}/xml-c.c | 47 +++++++++++++++++++------------------- {v2v => mllib}/xml.ml | 49 ++++++++++++++++++++++------------------ {v2v => mllib}...

...g ‘xpath_(string|int|int64)_default’ we can write the equivalent code using ‘Option.default’. This is not quite so concise, but may be easier to understand. eg: xpath_int_default xctx "xpath_expr" 10 -> Option.default 10 (xpath_int xctx "xpath_expr") --- common/mltools/xpath_helpers.ml | 12 ------------ common/mltools/xpath_helpers.mli | 6 ------ v2v/copy_to_local.ml | 6 +++--- v2v/parse_libvirt_xml.ml | 9 ++++----- v2v/parse_ovf_from_ova.ml | 16 ++++++++-------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/common/mltools...

This function will allow more OCAML-ish processing of xpath queries with multiple results. --- mllib/xpath_helpers.ml | 9 +++++++++ mllib/xpath_helpers.mli | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml index 8648596a4..f12156f45 100644 --- a/mllib/xpath_helpers.ml +++ b/mllib/xpath_helpers.ml @@ -53,3 +53,12 @@ let xpath_eval_default parsefn xpath ex...

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- mllib/xpath_helpers.ml | 9 +++++++++ mllib/xpath_helpers.mli | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml index e6185bf3d..eb655e1fe 100644 --- a/mllib/xpath_helpers.ml +++ b/mllib/xpath_helpers.ml @@ -52,3 +52,12 @@ let xpath_eval_default parsefn xpath ex...

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- mllib/xpath_helpers.ml | 9 +++++++++ mllib/xpath_helpers.mli | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml index e6185bf3d..eb655e1fe 100644 --- a/mllib/xpath_helpers.ml +++ b/mllib/xpath_helpers.ml @@ -52,3 +52,12 @@ let xpath_eval_default parsefn xpath ex...

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- mllib/xpath_helpers.ml | 9 +++++++++ mllib/xpath_helpers.mli | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml index e6185bf3d..eb655e1fe 100644 --- a/mllib/xpath_helpers.ml +++ b/mllib/xpath_helpers.ml @@ -52,3 +52,12 @@ let xpath_eval_default parsefn xpath ex...

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- common/mltools/xpath_helpers.ml | 9 +++++++++ common/mltools/xpath_helpers.mli | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/common/mltools/xpath_helpers.ml b/common/mltools/xpath_helpers.ml index 05fad89a4..a79733486 100644 --- a/common/mltools/xpath_helpers.ml +++ b/common/mltools/xpath_helpers.ml @@ -52,3 +52,...

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- common/mltools/xpath_helpers.ml | 9 +++++++ common/mltools/xpath_helpers.mli | 4 +++ v2v/output_libvirt.ml | 11 ++------ v2v/test-harness/v2v_test_harness.ml | 51 +++++++++++------------------------- 4 files changed, 30 insertions(+), 45 deletions(-) diff --git a/common/mltools/xpath_helpers.ml b...

--- mllib/common_utils.ml | 2 ++ mllib/common_utils.mli | 2 ++ mllib/xpath_helpers.ml | 2 -- v2v/input_vmx.ml | 2 -- v2v/v2v_unit_tests.ml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 63d8dd92e..6a9b08973 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -282,6 +282,8 @@ let ( /...

...ted the Yajl helpers with the yajl OCAML wrapper code, moved the libxml2 wrapper into mllib and written some OCAML osinfo db reading code in mllib. C?dric Bosdonnat (5): builder: extract Yajl helper functions to yajl.ml mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: add libosinfo DB reading helpers Add a virt-builder-repository tool .gitignore | 3 + builder/Makefile.am | 91 ++++++- builder/builder_repository.ml | 493 ++++++++++++++++++++++++++++++++++++ builder/simplestreams_...

...yajl OCAML wrapper code, moved the libxml2 wrapper into mllib and written > some OCAML osinfo db reading code in mllib. > > Cédric Bosdonnat (5): > builder: extract Yajl helper functions to yajl.ml > mllib: factorize code to add Checksum.get_checksum function > Move xml and xpath_helpers OCAML code to mllib > mllib: add libosinfo DB reading helpers > Add a virt-builder-repository tool > > .gitignore | 3 + > builder/Makefile.am | 91 ++++++- > builder/builder_repository.ml | 493 +++++++++++++++++++++++++++++++...

See: http://caml.inria.fr/pub/docs/manual-ocaml/comp.html#s:comp-warnings --- builder/index_parser.ml | 8 ++++---- generator/tests_c_api.ml | 4 ++-- mllib/common_utils.ml | 2 +- v2v/inspect_source.ml | 2 +- v2v/linux.ml | 2 +- v2v/xpath_helpers.ml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builder/index_parser.ml b/builder/index_parser.ml index e5e4c6c..a3cae7d 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -113,7 +113,7 @@ let get_index ~downloader ~sigchecker try Rev_...

Hi all, Here is a new version of the virt-builder-repository series taking care of Pino's comments. It has also been rebased on recent master. Cédric Bosdonnat (7): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: expose libosinfo DB reading functions in mllib builder: rename docs test script builder: add Index.write_entry function builder: add a template parameter to get_index Add a virt-builder-repository tool .gitignore | 3 +...

...| 2 + builder/test-virt-builder-repository.sh | 98 ++++++ builder/utils.ml | 10 + builder/utils.mli | 7 + builder/virt-builder-repository.pod | 213 +++++++++++ builder/virt-builder.pod | 4 + common/mltools/xpath_helpers.ml | 9 + common/mltools/xpath_helpers.mli | 4 + fish/guestfish.pod | 1 + installcheck.sh.in | 1 + lib/guestfs.pod | 1 + v2v/output_libvirt.ml | 11 +- v2v/test-harness/v2v_test_harness...

..._utils.ml | 11 + mllib/common_utils.mli | 6 + mllib/osinfo-c.c | 102 +++++ mllib/osinfo.ml | 26 ++ mllib/osinfo.mli | 31 ++ mllib/xpath_helpers.ml | 9 + mllib/xpath_helpers.mli | 4 + 23 files changed, 1727 insertions(+), 459 deletions(-) create mode 100644 builder/index_parser_tests.ml create mode 100644 builder/repository_main.ml rename builder/{test-virt-builder-docs.sh =&gt...

Hi guys, Here is a v3 of the series, including changes to answer Richard's comments. Cédric Bosdonnat (10): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: add Xml.parse_file helper lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo builder: rename docs test script builder: add Index.write_entry function builder: add a template paramete...

...| 80 +++ builder/osinfo.mli | 22 + builder/repository_main.ml | 597 +++++++++++++++++++++ .../{test-virt-builder-docs.sh => test-docs.sh} | 2 + builder/virt-builder-repository.pod | 213 ++++++++ mllib/xpath_helpers.ml | 9 + mllib/xpath_helpers.mli | 4 + 14 files changed, 1268 insertions(+), 15 deletions(-) create mode 100644 builder/index_parser_tests.ml create mode 100644 builder/osinfo.ml create mode 100644 builder/osinfo.mli create mode 10064...

...| 80 +++ builder/osinfo.mli | 22 + builder/repository_main.ml | 589 +++++++++++++++++++++ .../{test-virt-builder-docs.sh => test-docs.sh} | 2 + builder/virt-builder-repository.pod | 213 ++++++++ mllib/xpath_helpers.ml | 9 + mllib/xpath_helpers.mli | 4 + 14 files changed, 1261 insertions(+), 17 deletions(-) create mode 100644 builder/index_parser_tests.ml create mode 100644 builder/osinfo.ml create mode 100644 builder/osinfo.mli create mode 10064...