Commit 34b809da authored by Ian Boyd's avatar Ian Boyd
Browse files

Replace idlcr8hdf.pro

parent eee4c40e
;Main Program Version: idlcr8hdf.pro v4.0b53, 20191205 ;Main Program Version: idlcr8hdf.pro v4.0b54, 20201103
; Written by Ian Boyd for the AVDC - iboyd@astro.umass.edu ; Written by Ian Boyd for the AVDC - iboyd@astro.umass.edu
; ;
;Sub-versions (refer to idlcr8hdf-v4.0_Readme.pdf for full history) ;Sub-versions (refer to idlcr8hdf-v4.0_Readme.pdf for full history)
...@@ -113,7 +113,7 @@ PRO intro, intype ...@@ -113,7 +113,7 @@ PRO intro, intype
COMMON WIDGET_WIN COMMON WIDGET_WIN
nhdr=44 & errtxt=STRARR(nhdr) nhdr=44 & errtxt=STRARR(nhdr)
vertxt=['idlcr8hdf-v4.0_Readme.pdf','v4.0b53 December 2019'] vertxt=['idlcr8hdf-v4.0_Readme.pdf','v4.0b54 March 2020']
errtxt[1]='Welcome to IDLcr8HDF. This program creates GEOMS compliant HDF4, HDF5 and netCDF files' errtxt[1]='Welcome to IDLcr8HDF. This program creates GEOMS compliant HDF4, HDF5 and netCDF files'
errtxt[2]='(also refer to '+vertxt[0]+').' errtxt[2]='(also refer to '+vertxt[0]+').'
errtxt[4]='Inputs to the program (IDL Virtual Machine (VM) and IDL Licensed (LIC) Versions):' errtxt[4]='Inputs to the program (IDL Virtual Machine (VM) and IDL Licensed (LIC) Versions):'
...@@ -2119,7 +2119,9 @@ PRO read_metadata, metafile, inf ...@@ -2119,7 +2119,9 @@ PRO read_metadata, metafile, inf
; 20191205: Do checks for sub-value separators (. or ; or _) being at the start or end of attribute ; 20191205: Do checks for sub-value separators (. or ; or _) being at the start or end of attribute
; values, and for consecutive sub-value separators (e.g. ;;). This can occur as the STRSPLIT ; values, and for consecutive sub-value separators (e.g. ;;). This can occur as the STRSPLIT
; command can remove these while testing sub-values, so they are not detected as part of ; command can remove these while testing sub-values, so they are not detected as part of
; any tests - Version 4.0b53 ; any tests - Version 4.0b53
; 20200311: Do not include '.' separator when doing checks for sub-value separators at the start or end of
; the attribute values e.g. allow DO_NAME=Boyd;Ian S. - Version 4.0b54
; ;
; Inputs: metafile - Either, the filename of the input file containing the Metadata or, if program ; Inputs: metafile - Either, the filename of the input file containing the Metadata or, if program
; input is via string array and Structure, a string array containing the Global ; input is via string array and Structure, a string array containing the Global
...@@ -2336,8 +2338,10 @@ FOR i=0L,nrline-1L DO BEGIN ...@@ -2336,8 +2338,10 @@ FOR i=0L,nrline-1L DO BEGIN
ELSE infotxt='3 Consecutive sub-value separators are not permitted' ELSE infotxt='3 Consecutive sub-value separators are not permitted'
FOR j=0,N_ELEMENTS(sv_sep)-1 DO BEGIN FOR j=0,N_ELEMENTS(sv_sep)-1 DO BEGIN
spchk=sv_sep[j]+sv_sep[j] spchk=sv_sep[j]+sv_sep[j]
IF k EQ 0 THEN test=(mv1start EQ sv_sep[j]) OR (mv1end EQ sv_sep[j]) $ ;Note: in some cases a '.' may be present at the end of a sub-value e.g. DO_NAME=Boyd;Ian S.
ELSE test=STRPOS(m_v1[i],spchk) NE -1 IF (k EQ 0) AND (sv_sep[j] NE '.') THEN test=(mv1start EQ sv_sep[j]) OR (mv1end EQ sv_sep[j]) $
ELSE IF k EQ 1 THEN test=STRPOS(m_v1[i],spchk) NE -1 $
ELSE test=0B
IF (test) AND (writeonce) THEN BEGIN IF (test) AND (writeonce) THEN BEGIN
IF mv1len GT 50 THEN infotxt=infotxt+' in '+m_v0[i]+' attribute' $ IF mv1len GT 50 THEN infotxt=infotxt+' in '+m_v0[i]+' attribute' $
ELSE infotxt=infotxt+': '+m_v0[i]+'='+m_v1[i] ELSE infotxt=infotxt+': '+m_v0[i]+'='+m_v1[i]
...@@ -5859,7 +5863,7 @@ PRO idlcr8hdf, ga, sds, tav, odir, reterr, H5=o1, AVK=o2, LOG=o4, POPUP=o5, QA=o ...@@ -5859,7 +5863,7 @@ PRO idlcr8hdf, ga, sds, tav, odir, reterr, H5=o1, AVK=o2, LOG=o4, POPUP=o5, QA=o
; ;
;Program documentation, idlcr8hdf-v4.0_Readme.pdf, available from http://avdc.gsfc.nasa.gov. ;Program documentation, idlcr8hdf-v4.0_Readme.pdf, available from http://avdc.gsfc.nasa.gov.
; ;
;Program sub-version 4.0b53 (20191205) ;Program sub-version 4.0b54 (20201103)
; ---------- ; ----------
;Written by Ian Boyd for the AVDC - iboyd@astro.umass.edu ;Written by Ian Boyd for the AVDC - iboyd@astro.umass.edu
; ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment