From 3755a602127bdfabaf20d58b5acfce000287a86b Mon Sep 17 00:00:00 2001
From: zimoch <zimoch>
Date: Wed, 4 Feb 2015 16:49:28 +0000
Subject: [PATCH] Using new Microsoft database instead of Oracle

---
 showtags | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/showtags b/showtags
index e5ec95a..da7f7b2 100755
--- a/showtags
+++ b/showtags
@@ -1,7 +1,7 @@
 #!  /bin/bash
 #
 #  $Source: /cvs/G/EPICS/App/scripts/showtags,v $
-#  $Revision: 1.14 $   $Date: 2012/01/04 15:48:28 $
+#  $Revision: 1.15 $   $Date: 2015/02/04 16:49:28 $
 #----------------------------------------------------
 #         Check the command line
 #
@@ -26,8 +26,8 @@
         ;;
       -v | --version)
         echo 'Original Author: Dirk Zimoch'
-        echo 'Last Change by $Author: lutz_h $'
-        echo '$Revision: 1.14 $   $Date: 2012/01/04 15:48:28 $'
+        echo 'Last Change by $Author: zimoch $'
+        echo '$Revision: 1.15 $   $Date: 2015/02/04 16:49:28 $'
         echo '$Source: /cvs/G/EPICS/App/scripts/showtags,v $'
         exit 0
         ;;
@@ -71,39 +71,13 @@ function jointags()
 TAGLIST=$(jointags $TAGS)
 
 function selectNumericMonth () {
-
-  sqlplus -s gfa_public/pub01@gfaprd <<- EOF
-	SET PAGESIZE 10000;
-	SET LINESIZE 1000;
-	SET SPACE 2;
-	SET FEEDBACK OFF;
-	SELECT TAG_NAME AS "Tag",
-	   TAG_DATE AS "Date",
-	   TAG_TIME AS "Time"
-	   FROM CITY.CVS_TAGS_VIEW
-	   WHERE TAG_NAME IN ($TAGLIST)
-	   ORDER BY TO_DATE(TAG_DATE||' '||TAG_TIME,'DD-MM-YYYY HH24:MI');
-	EXIT
-	EOF
+  ivsql  --separator " " "SELECT DISTINCT TagName AS 'Tag', TagDate AS 'Date' FROM CvsTags WHERE TagName IN ($TAGLIST) ORDER BY Date" \
+    | awk '{printf "%-40s  %s  %s\n", $1, $2, $3}'
 }
 
 function selectAsciiMonth () {
+  ivsql  --separator " " "SELECT DISTINCT FORMAT(TagDate, 'dd-MMM-yyyy  HH:MM ') AS 'Date' , TagName AS 'Tag' FROM CvsTags WHERE TagName IN ($TAGLIST) ORDER BY Date" \
 
-  sqlplus -s gfa_public/pub01@gfaprd <<- EOF
-	SET PAGESIZE 10000;
-	SET LINESIZE 1000;
-	SET SPACE 2;
-	SET FEEDBACK OFF;
-	COLUMN Date FORMAT A11
-	SELECT
-	   TO_CHAR (TO_DATE (TAG_DATE, 'DD-MM-YYYY'),'DD-Mon-YYYY') AS "Date",
-	   TAG_TIME AS "Time",
-           TAG_NAME AS "Tag"
-	   FROM HOSTS.CVS_TAGS_VIEW
-	   WHERE TAG_NAME IN ($TAGLIST)
-	   ORDER BY TO_DATE(TAG_DATE||' '||TAG_TIME,'DD-MM-YYYY HH24:MI');
-	EXIT
-	EOF
 }
 
 if [ $asciiMonth = 0 ]; then