From 0641893c9bb4611ed00cec69a1ee01382a0e581f Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Wed, 20 Apr 2016 01:06:47 +0200
Subject: [PATCH] fixing scala integration
---
.../parser-cp2k/cp2kparser/scalainterface.py | 1 -
.../eu/nomad_lab/parsers/Cp2kParser.scala | 23 ++++++++-----------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/parser/parser-cp2k/cp2kparser/scalainterface.py b/parser/parser-cp2k/cp2kparser/scalainterface.py
index b5ede66..528e1c5 100644
--- a/parser/parser-cp2k/cp2kparser/scalainterface.py
+++ b/parser/parser-cp2k/cp2kparser/scalainterface.py
@@ -12,6 +12,5 @@ if __name__ == "__main__":
# Initialise the parser with the main filename and a JSON backend
main_file = sys.argv[1]
- print main_file
parser = CP2KParser(main_file, backend=JsonParseEventsWriterBackend)
parser.parse()
diff --git a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
index d94f6de..49086b4 100644
--- a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
@@ -30,27 +30,22 @@ object Cp2kParser extends SimpleExternalParserGenerator(
)?(?:\s*CP2K\| source code revision number:\s*(?<cp2kRevision>.*)
)?""".r,
cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/cp2k/parser/parser-cp2k/cp2kparser/scalainterface.py",
- "--uri", "${mainFileUri}", "${mainFilePath}"),
+ "${mainFilePath}"),
cmdCwd = "${mainFilePath}/..",
resList = Seq(
- "parser-cp2k/cp2kparser/utils/baseclasses.py",
- "parser-cp2k/cp2kparser/utils/testing.py",
+ "parser-cp2k/setup.py",
+ "parser-cp2k/cp2kparser/setup_paths.py",
+ "parser-cp2k/cp2kparser/__init__.py",
"parser-cp2k/cp2kparser/utils/__init__.py",
"parser-cp2k/cp2kparser/utils/logconfig.py",
- "parser-cp2k/cp2kparser/__init__.py",
- "parser-cp2k/cp2kparser/parsing/versions/__init__.py",
- "parser-cp2k/cp2kparser/parsing/versions/cp2k262/inputparsing.py",
+ "parser-cp2k/cp2kparser/utils/testing.py",
+ "parser-cp2k/cp2kparser/utils/baseclasses.py",
+ "parser-cp2k/cp2kparser/parsing/__init__.py",
"parser-cp2k/cp2kparser/parsing/versions/cp2k262/__init__.py",
- "parser-cp2k/cp2kparser/parsing/versions/cp2k262/implementation.py",
- "parser-cp2k/cp2kparser/parsing/versions/cp2k262/outputparser.py",
+ "parser-cp2k/cp2kparser/parsing/versions/cp2k262/mainparser.py",
+ "parser-cp2k/cp2kparser/parsing/versions/__init__.py",
"parser-cp2k/cp2kparser/parsing/versions/versionsetup.py",
- "parser-cp2k/cp2kparser/parsing/__init__.py",
- "parser-cp2k/cp2kparser/parsing/cp2kinputenginedata/xmlpreparser.py",
- "parser-cp2k/cp2kparser/parsing/cp2kinputenginedata/__init__.py",
- "parser-cp2k/cp2kparser/parsing/cp2kinputenginedata/input_tree.py",
"parser-cp2k/cp2kparser/parsing/parser.py",
- "parser-cp2k/cp2kparser/parsing/csvparsing.py",
- "parser-cp2k/cp2kparser/setup_paths.py",
"parser-cp2k/cp2kparser/scalainterface.py",
"nomad_meta_info/public.nomadmetainfo.json",
"nomad_meta_info/common.nomadmetainfo.json",
--
GitLab