diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-09 19:10:06 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-09 19:10:06 +0100 |
| commit | d49196b9fff1fc2de34d185967989c4d544364b2 (patch) | |
| tree | 738cfb5bd63ae549d6911969a56149d6999d3966 | |
| parent | 63fd28b70c169d9008ce303794d784659bdcf19f (diff) | |
| download | jenkins.debian.net-d49196b9fff1fc2de34d185967989c4d544364b2.tar.xz | |
reproducible: refactor: these variables are only needed by html_graphs.sh now
| -rwxr-xr-x | bin/reproducible_common.sh | 9 | ||||
| -rwxr-xr-x | bin/reproducible_html_graphs.sh | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index a54b2ee6..e46b7760 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -91,15 +91,6 @@ init_html() { SPOKENTARGET["suite_stats"]="suite: $SUITE" SPOKENTARGET["repo_stats"]="repositories overview" SPOKENTARGET["stats"]="reproducible stats" - # FIXME: this can probably all go into html_graph.sh now...: query some data we need everywhere - AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"") - COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"") - COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\" AND r.status=\"reproducible\"") - - PERCENT_TOTAL=$(echo "scale=1 ; ($COUNT_TOTAL*100/$AMOUNT)" | bc) - if [ -z "${PERCENT_TOTAL}" ]; then PERCENT_TOTAL=0; fi - PERCENT_GOOD=$(echo "scale=1 ; ($COUNT_GOOD*100/$COUNT_TOTAL)" | bc) - if [ -z "${PERCENT_GOOD}" ]; then PERCENT_GOOD=0; fi } write_page() { diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index b458c7c3..9ddb48ad 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -295,6 +295,14 @@ write_usertag_table() { fi } +AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"") +COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"") +COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\" AND r.status=\"reproducible\"") +PERCENT_TOTAL=$(echo "scale=1 ; ($COUNT_TOTAL*100/$AMOUNT)" | bc) +if [ -z "${PERCENT_TOTAL}" ]; then PERCENT_TOTAL=0; fi +PERCENT_GOOD=$(echo "scale=1 ; ($COUNT_GOOD*100/$COUNT_TOTAL)" | bc) +if [ -z "${PERCENT_GOOD}" ]; then PERCENT_GOOD=0; fi + VIEW=suite_stats PAGE=index_${VIEW}.html echo "$(date) - starting to write $PAGE page." |