From e01111d21448ef1d351c238e478cc09234c8ae80 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 2 Feb 2011 10:43:00 +0000 Subject: [PATCH] use IOC instead of %T for ioc name because of possible long IOC names --- saveRestore.script_common | 6 ++++-- startup.script_iocmon | 3 ++- startup.script_part2 | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/saveRestore.script_common b/saveRestore.script_common index ac614bd..343bb4c 100644 --- a/saveRestore.script_common +++ b/saveRestore.script_common @@ -10,7 +10,9 @@ save_restoreSet_IncompleteSetsOk 1 save_restoreSet_DatedBackupFiles 1 save_restoreSet_NumSeqFiles 3 save_restoreSet_SeqPeriodInSeconds 600 -save_restoreSet_status_prefix bootInfo("%T:") +sprintf (STRINGBUFFER, "%s:", IOC) +save_restoreSet_status_prefix STRINGBUFFER # set_requestfile_path CFG -set_savefile_path bootInfo("/archiver-data/autoSR/%T") +sprintf (STRINGBUFFER, "/archiver-data/autoSR/%s", IOC) +set_savefile_path STRINGBUFFER diff --git a/startup.script_iocmon b/startup.script_iocmon index 93e48bb..55d22bc 100644 --- a/startup.script_iocmon +++ b/startup.script_iocmon @@ -1,3 +1,4 @@ # $Source: /cvs/A/CS/startup/startup.script_iocmon,v $ require "iocmon" -dbLoadDatabase("iocmon.template", TEMPLATES, bootInfo("IOC=%T,CRATE=%T")) +sprintf (STRINGBUFFER, "IOC=%s,CRATE=%s", IOC, IOC) +dbLoadDatabase ("iocmon.template", TEMPLATES, STRINGBUFFER) diff --git a/startup.script_part2 b/startup.script_part2 index 1b04780..47df56b 100644 --- a/startup.script_part2 +++ b/startup.script_part2 @@ -31,7 +31,8 @@ sprintf (STRINGBUFFER, "%s/sls/bin/loadAllSettings.sh", INSTBASE) rsh (bootHost(), STRINGBUFFER, IOC, "default") # insert record list into database -listRecords (bootInfo("/home/ioc/%T.dbl"), "RTYP DESC") +sprintf (STRINGBUFFER, "/home/ioc/%s.dbl", IOC) +listRecords (STRINGBUFFER, "RTYP DESC") sprintf (STRINGBUFFER, "%s/sls/bin/dbl2odb.sh", INSTBASE) rsh (bootHost(), STRINGBUFFER, IOC, bootInfo("%B"), getenv("EPICS_CA_SERVER_PORT"), "&")