show.sh has been replaced by rcynic-text.

svn path=/trunk/; revision=4531

6 files changed, 1 insertions, 191 deletions

diff --git a/configure b/configure
index 3bdd0b06..af9775c6 100755
--- a/configure
+++ b/configure
@@ -4016,12 +4016,6 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 
 
-if test "x$XSLTPROC" != "x" && test "x$AWK" != "x"
-then
-	ac_config_files="$ac_config_files rcynic/show.sh"
-
-fi
-
 # Figure out whether we need to build our own OpenSSL library or can
 # use the system libraries.  We're looking for two recent features:
 # CMS and RFC 3779 support.  We also have to check whether the user
@@ -5285,7 +5279,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "rcynic/show.sh") CONFIG_FILES="$CONFIG_FILES rcynic/show.sh" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;;
     "rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/static-rsync/Makefile" ;;
@@ -5721,11 +5714,6 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
 
   esac
 
-
-  case $ac_file$ac_mode in
-    "rcynic/show.sh":F) chmod +x rcynic/show.sh ;;
-
-  esac
 done # for ac_tag
 
 
diff --git a/configure.ac b/configure.ac
index fcdd0d97..dafa1154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,12 +115,6 @@ AC_PATH_PROG([SORT], [sort])
 AC_PATH_PROG([RRDTOOL], [rrdtool])
 AC_PROG_GREP
 
-if test "x$XSLTPROC" != "x" && test "x$AWK" != "x"
-then
-	AC_CONFIG_FILES([rcynic/show.sh],
-			[chmod +x rcynic/show.sh])
-fi
-
 # Figure out whether we need to build our own OpenSSL library or can
 # use the system libraries.  We're looking for two recent features:
 # CMS and RFC 3779 support.  We also have to check whether the user
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in
index a8994a2c..eba83f39 100644
--- a/rcynic/Makefile.in
+++ b/rcynic/Makefile.in
@@ -59,7 +59,7 @@ uninstall deinstall:
 
 distclean: clean
 	cd static-rsync; ${MAKE} $@
-	rm -f show.sh installation-scripts/linux/install.sh Makefile
+	rm -f installation-scripts/linux/install.sh Makefile
 
 COMPILE_PYTHON = \
 	AC_PYTHON_INTERPRETER='${PYTHON}' \
diff --git a/rcynic/show.awk b/rcynic/show.awk
deleted file mode 100644
index 84d33cda..00000000
--- a/rcynic/show.awk
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id$
-#
-# Copyright (C) 2010-2011  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# Prettyprint tab-delimited rcynic summary data.  This is intended as
-# a postprocessor for show.xsl.
-
-BEGIN {
-  FS = "\t";
-  label[++nlabels] = "hostname";
-  head["hostname", 1] = "Repository";
-  head["hostname", 2] = "Host";
-  width["hostname"] = length(head["hostname", 1]);
-}
-
-!NF {
-  got_labels = 1;
-  next;
-}
-
-!got_labels {
-  label[++nlabels] = $1;
-  nh = split($2, h, /[ \t]+/);
-  for (i = 1; i <= nh; i++) {
-    head[$1, i] = h[i];
-    if (length(h[i]) > width[$1])
-      width[$1] = length(h[i]);
-  }
-}
-
-got_labels && $3 ~ /^rsync:\/\/.+/ {
-  hostname = $3;
-  sub(/^rsync:\/\//, "", hostname);
-  sub(/\/.*$/, "", hostname);
-  if (!seen[hostname])
-    seen[hostname] = ++nhostnames;
-  data[hostname, $2]++;
-  total[$2]++;
-  if (length(hostname) > width["hostname"])
-    width["hostname"] = length(hostname);
-}
-
-END {
-
-  for (i = 1;; i++) {
-    blank = 1;
-    for (j = 1; j <= nlabels; j++)
-      if (head[label[j], i] && (j == 1 || total[label[j]] > 0))
-	blank = 0;
-    if (blank)
-      break;
-    for (j = 1; j <= nlabels; j++) {
-      if (j == 1)
-	printf "%-*s", width[label[j]], head[label[j], i];
-      else if (total[label[j]] > 0)
-	printf "   %*s", width[label[j]], head[label[j], i];
-    }
-    print "";
-  }
-
-  for (i in seen)
-    hostnames[seen[i]] = i;
-
-  for (i = 1; i <= nhostnames; i++) {
-    for (j = 1; j <= nlabels; j++) {
-      if (j == 1)
-	printf "%-*s", width[label[j]], hostnames[i];
-      else if (total[label[j]] > 0)
-	printf "   %*s", width[label[j]], data[hostnames[i], label[j]];
-    }
-    print "";
-  }
-
-  for (j = 1; j <= nlabels; j++) {
-    if (j == 1)
-      printf "%-*s", width[label[j]], "Total";
-    else if (total[label[j]] > 0)
-      printf "   %*s", width[label[j]], total[label[j]];
-  }
-  print "";
-}
diff --git a/rcynic/show.sh.in b/rcynic/show.sh.in
deleted file mode 100644
index c62a325b..00000000
--- a/rcynic/show.sh.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# Prettyprint rcynic summary data as flat text.
-
-@XSLTPROC@ @abs_builddir@/show.xsl ${1-rcynic.xml} | @AWK@ -f @abs_builddir@/show.awk
diff --git a/rcynic/show.xsl b/rcynic/show.xsl
deleted file mode 100644
index 06d69893..00000000
--- a/rcynic/show.xsl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
- - Copyright (C) 2010-2011  Internet Systems Consortium, Inc. ("ISC")
- -
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
- -->
-
-<!-- $Id$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:output method="text" encoding="US-ASCII"/>
-
-  <!-- Translate rcynic XML into tab-delimited flat text -->
-  <xsl:template match="/">
-
-    <!-- Write labels as two columns: <label> <tab> <text> -->
-    <xsl:for-each select="rcynic-summary/labels/*">
-      <xsl:value-of select="name()"/>
-      <xsl:text>&#9;</xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>&#10;</xsl:text>
-    </xsl:for-each>
-
-    <!-- Blank line between sections -->
-    <xsl:text>&#10;</xsl:text>
-
-    <!-- Write status as three colums: <timestamp> <tab> <status> <tab> <uri> -->
-    <xsl:for-each select="rcynic-summary/validation_status">
-      <xsl:sort order="ascending" data-type="text" select="."/>
-      <xsl:value-of select="@timestamp"/>
-      <xsl:text>&#9;</xsl:text>
-      <xsl:value-of select="@status"/>
-      <xsl:text>&#9;</xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>&#9;</xsl:text>
-      <xsl:value-of select="@generation"/>
-      <xsl:text>&#10;</xsl:text>
-    </xsl:for-each>
-
-  </xsl:template>
-
-</xsl:stylesheet>
-
-<!-- 
-  - Local variables:
-  - mode: sgml
-  - End:
- -->