From 84426ea33448e6c0f93ed09fa293a734952915f2 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 18 Feb 2014 18:32:29 -0600
Subject: [PATCH] templates: Unify PV name prefixes, remove "Host"

The difference between host IOCs and embedded ones does not
justify having a different prefix.
---
 src/template/base/Makefile                           |  1 -
 src/template/base/top/exampleApp/Db/Makefile         |  1 -
 .../base/top/exampleApp/Db/userHost.substitutions    | 12 ------------
 src/template/base/top/exampleBoot/ioc/st.cmd@Common  |  6 +++---
 src/template/base/top/iocBoot/ioc/st.cmd@Common      |  4 ++--
 5 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 src/template/base/top/exampleApp/Db/userHost.substitutions

diff --git a/src/template/base/Makefile b/src/template/base/Makefile
index 8873d258c..3cb048b0f 100644
--- a/src/template/base/Makefile
+++ b/src/template/base/Makefile
@@ -30,7 +30,6 @@ TEMPLATES += top/exampleApp/Db/dbExample1.db
 TEMPLATES += top/exampleApp/Db/dbExample2.db
 TEMPLATES += top/exampleApp/Db/dbSubExample.db
 TEMPLATES += top/exampleApp/Db/user.substitutions
-TEMPLATES += top/exampleApp/Db/userHost.substitutions
 TEMPLATES += top/exampleApp/src/Makefile
 TEMPLATES += top/exampleApp/src/xxxRecord.dbd
 TEMPLATES += top/exampleApp/src/xxxRecord.c
diff --git a/src/template/base/top/exampleApp/Db/Makefile b/src/template/base/top/exampleApp/Db/Makefile
index c285af85a..3adbf09a5 100644
--- a/src/template/base/top/exampleApp/Db/Makefile
+++ b/src/template/base/top/exampleApp/Db/Makefile
@@ -14,7 +14,6 @@ DB += dbExample1.db
 DB += dbExample2.db
 DB += dbSubExample.db
 DB += user.substitutions
-DB += userHost.substitutions
 
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
diff --git a/src/template/base/top/exampleApp/Db/userHost.substitutions b/src/template/base/top/exampleApp/Db/userHost.substitutions
deleted file mode 100644
index 5139275c4..000000000
--- a/src/template/base/top/exampleApp/Db/userHost.substitutions
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example substitutions file
-
-file "db/dbExample1.db" {
-    { user = "_USER_Host" }
-}
-
-file db/dbExample2.db {
-    pattern { user, no, scan }
-        { "_USER_Host", 1, "1 second" }
-        { "_USER_Host", 2, "2 second" }
-        { "_USER_Host", 3, "5 second" }
-}
diff --git a/src/template/base/top/exampleBoot/ioc/st.cmd@Common b/src/template/base/top/exampleBoot/ioc/st.cmd@Common
index b3269ff97..76360dd08 100644
--- a/src/template/base/top/exampleBoot/ioc/st.cmd@Common
+++ b/src/template/base/top/exampleBoot/ioc/st.cmd@Common
@@ -12,8 +12,8 @@ dbLoadDatabase "dbd/_APPNAME_.dbd"
 _CSAFEAPPNAME__registerRecordDeviceDriver pdbbase
 
 ## Load record instances
-dbLoadTemplate "db/userHost.substitutions"
-dbLoadRecords "db/dbSubExample.db", "user=_USER_Host"
+dbLoadTemplate "db/user.substitutions"
+dbLoadRecords "db/dbSubExample.db", "user=_USER_"
 
 ## Set this to see messages from mySub
 #var mySubDebug 1
@@ -25,4 +25,4 @@ cd "${TOP}/iocBoot/${IOC}"
 iocInit
 
 ## Start any sequence programs
-#seq sncExample, "user=_USER_Host"
+#seq sncExample, "user=_USER_"
diff --git a/src/template/base/top/iocBoot/ioc/st.cmd@Common b/src/template/base/top/iocBoot/ioc/st.cmd@Common
index 521a1007e..ba71fbf81 100644
--- a/src/template/base/top/iocBoot/ioc/st.cmd@Common
+++ b/src/template/base/top/iocBoot/ioc/st.cmd@Common
@@ -12,10 +12,10 @@ dbLoadDatabase "dbd/_APPNAME_.dbd"
 _CSAFEAPPNAME__registerRecordDeviceDriver pdbbase
 
 ## Load record instances
-#dbLoadRecords("db/xxx.db","user=_USER_Host")
+#dbLoadRecords("db/xxx.db","user=_USER_")
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit
 
 ## Start any sequence programs
-#seq sncxxx,"user=_USER_Host"
+#seq sncxxx,"user=_USER_"