Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1136: Trending: Redirect "new" to the index.html
[csit.git]
/
resources
/
tools
/
presentation
/
pal.py
diff --git
a/resources/tools/presentation/pal.py
b/resources/tools/presentation/pal.py
index
98642c8
..
013c921
100644
(file)
--- a/
resources/tools/presentation/pal.py
+++ b/
resources/tools/presentation/pal.py
@@
-21,7
+21,6
@@
import logging
from errors import PresentationError
from environment import Environment, clean_environment
from specification_parser import Specification
from errors import PresentationError
from environment import Environment, clean_environment
from specification_parser import Specification
-from input_data_files import download_data_files, unzip_files
from input_data_parser import InputData
from generator_tables import generate_tables
from generator_plots import generate_plots
from input_data_parser import InputData
from generator_tables import generate_tables
from generator_plots import generate_plots
@@
-30,8
+29,6
@@
from static_content import prepare_static_content
from generator_report import generate_report
from generator_CPTA import generate_cpta
from generator_report import generate_report
from generator_CPTA import generate_cpta
-from pprint import pprint
-
def parse_args():
"""Parse arguments from cmd line.
def parse_args():
"""Parse arguments from cmd line.
@@
-86,21
+83,20
@@
def main():
logging.critical("Finished with error.")
return 1
logging.critical("Finished with error.")
return 1
- ret_code = 0
+ if spec.output["output"] not in ("report", "CPTA"):
+ logging.critical("The output '{0}' is not supported.".
+ format(spec.output["output"]))
+ return 1
+
+ ret_code = 1
try:
env = Environment(spec.environment, args.force)
env.set_environment()
try:
env = Environment(spec.environment, args.force)
env.set_environment()
- if spec.is_debug:
- if spec.debug["input-format"] == "zip":
- unzip_files(spec)
- else:
- download_data_files(spec)
-
prepare_static_content(spec)
data = InputData(spec)
prepare_static_content(spec)
data = InputData(spec)
- data.
read_data(
)
+ data.
download_and_parse_data(repeat=2
)
generate_tables(spec, data)
generate_plots(spec, data)
generate_tables(spec, data)
generate_plots(spec, data)
@@
-112,21
+108,16
@@
def main():
elif spec.output["output"] == "CPTA":
sys.stdout.write(generate_cpta(spec, data))
logging.info("Successfully finished.")
elif spec.output["output"] == "CPTA":
sys.stdout.write(generate_cpta(spec, data))
logging.info("Successfully finished.")
- else:
- logging.critical("The output '{0}' is not supported.".
- format(spec.output["output"]))
- ret_code = 1
+ ret_code = 0
except (KeyError, ValueError, PresentationError) as err:
logging.info("Finished with an error.")
logging.critical(str(err))
except (KeyError, ValueError, PresentationError) as err:
logging.info("Finished with an error.")
logging.critical(str(err))
- ret_code = 1
except Exception as err:
logging.info("Finished with an unexpected error.")
logging.critical(str(err))
except Exception as err:
logging.info("Finished with an unexpected error.")
logging.critical(str(err))
- ret_code = 1
finally:
finally:
- if spec is not None
and not spec.is_debug
:
+ if spec is not None:
clean_environment(spec.environment)
return ret_code
clean_environment(spec.environment)
return ret_code