From 3df6a5a8daac3c18005aff96f9c3e2a653c7c402 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Wed, 28 Mar 2007 11:55:39 +1000
Subject: [PATCH] Added release tag and revision number info for SICS and the
 nexus data files.

r1731 | ffr | 2007-03-28 11:55:39 +1000 (Wed, 28 Mar 2007) | 2 lines
---
 .../instrument/config/nexus/nexus_in_common_1.dic      |  6 +++++-
 .../instrument/config/nexus/nxscripts_common_1.tcl     |  8 ++++++--
 site_ansto/instrument/server_config.tcl                | 10 +++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/site_ansto/instrument/config/nexus/nexus_in_common_1.dic b/site_ansto/instrument/config/nexus/nexus_in_common_1.dic
index 53e03dab..efac555e 100644
--- a/site_ansto/instrument/config/nexus/nexus_in_common_1.dic
+++ b/site_ansto/instrument/config/nexus/nexus_in_common_1.dic
@@ -16,7 +16,11 @@ scan_variable=scanvar
 
 #---------- NXentry level
 etitle=/$(entryName),NXentry/SDS title -type NX_CHAR
-sics_release=/$(entryName),NXentry/SDS release_tag -type NX_CHAR
+sics_release=/version,NXentry/SDS sics_release_tag -type NX_CHAR
+sics_revision=/version,NXentry/SDS sics_revision_num -type NX_CHAR
+nx_content_release=/version,NXentry/SDS nx_content_release_tag -type NX_CHAR -attr {schema_release "$Name: not supported by cvs2svn $"}
+nx_content_revision=/version,NXentry/SDS nx_content_revision_num -type NX_CHAR -attr {schema_revision "$Revision: 1.2 $"}
+
 estart=/$(entryName),NXentry/SDS start_time -type NX_CHAR 
 eend=/$(entryName),NXentry/SDS end_time -type NX_CHAR
 
diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
index 9b98a5be..940c8ebb 100644
--- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
+++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
@@ -1,5 +1,7 @@
 # TODO Return filename from nxcreatefile and call nxreopen nxclose etc
 # with filename
+set nx_content_release_tag [lindex [string map {"$" ""} {$Name: not supported by cvs2svn $}] 1]
+set nx_content_revision_num [lindex [string map {"$" ""} {$Revision: 1.7 $}] 1]
 
 MakeNXScript
 sicsdatafactory new nxscript_data
@@ -21,15 +23,17 @@ proc newFileName {} {
 }
 
 proc nxcreatefile {nxdic {type nx.hdf}} {
-  global  nxFileOpen cfPath nexusdic;
+  global  nxFileOpen cfPath nexusdic nx_content_release_tag nx_content_revision_num;
   SicsDataPostFix .$type;
 
   set nexusdic $nxdic
   array set nxmode [list nx.hdf create5 h5 create5 nx5 create5 xml createxml];
   dataFileName [newFileName]
   nxscript $nxmode($type) [SplitReply [dataFileName]] $cfPath(nexus)/$nexusdic;
-  nxscript updatedictvar entryName sics_release
   nxscript puttext sics_release [SplitReply [sics_release]]
+  nxscript puttext sics_revision [SplitReply [sics_revision_num]]
+  nxscript puttext nx_content_release $nx_content_release_tag
+  nxscript puttext nx_content_revision $nx_content_revision_num
   set nxFileOpen true
 }
 
diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index 6ab902f6..c04886bc 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -1,7 +1,7 @@
 # SICS common configuration
 
-# $Revision: 1.19 $
-# $Date: 2007-03-11 21:29:55 $
+# $Revision: 1.20 $
+# $Date: 2007-03-28 01:55:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by $Author: ffr $
 
@@ -46,9 +46,13 @@ SicsDataPrefix [SplitReply [Instrument]]
 SicsDataPrefix lock
 
 VarMake sics_release Text Internal
-sics_release DEVELOPMENT
+sics_release [lindex [string map {"$" ""} {$Name: not supported by cvs2svn $}] 1]
 sics_release lock
 
+VarMake sics_revision_num Text Internal
+sics_revision_num [lindex [string map {"$" ""} {$Revision: 1.20 $}] 1]
+sics_revision_num lock
+
 VarMake SicsDataPath Text Internal 
 SicsDataPath $sicsroot/data/ 
 SicsDataPath lock