Merge pull request #219 from SuperDARN/cdf_fix

CDF fixes
SuperDARN · Sep 3, 2020 · ee78bf2 · ee78bf2
2 parents 6dd34e0 + 563bdbd
commit ee78bf2
Show file tree

Hide file tree

Showing 31 changed files with 336 additions and 287 deletions.
diff --git a/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c b/codebase/general/src.bin/dmap/dmapblkinx.1.6/dmapblkinx.c
@@ -58,6 +58,7 @@ int main(int argc,char *argv[]) {
 
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
   unsigned char zflg=0;
 
 
@@ -68,6 +69,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"z",'x',&zflg);
 
   arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
@@ -80,11 +82,17 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (arg !=argc) {
     if (zflg) {
       zfp=gzopen(argv[arg],"r");

diff --git a/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml b/codebase/general/src.bin/dmap/dmapblkinx.1.6/doc/dmapblkinx.doc.xml
@@ -4,22 +4,23 @@
 <name>dmapblkinx</name>
 <location>src.bin/dmap/dmapblkinx</location>
 <syntax>dmapblkinx --help</syntax>
+<syntax>dmapblkinx [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on><ar>name</ar></on><od>filename of the DataMap file, if this is omitted the document will be read from standard input.</od>
 </option>
 <synopsis><p>Dump the block index (file offsets for each block) of a DataMap file.</p></synopsis>
 <description><p>Dump the block index (file offsets for each block) of a DataMap file.</p>
 <p>The offsets are written to standard output. The block offsets can be used to quickly locate a specific block in the DataMap file.</p>
 </description>
 
-
 <example>
 <command>dmapblkinx inp.dmap &gt; out.binx</command>
-<description>Find the block offsets from the  file <code>inp.dmap</code> and store them in the file <code>out.binx</code>
+<description>Find the block offsets from the file <code>inp.dmap</code> and store them in the file <code>out.binx</code>
 </description>
 </example>
 
-
-
 </binary>
diff --git a/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c b/codebase/general/src.bin/dmap/dmapdump.1.12/dmapdump.c
@@ -61,6 +61,7 @@ int main(int argc,char *argv[]) {
   unsigned char zflg=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
 
   FILE *fp=NULL;
@@ -70,6 +71,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"z",'x',&zflg);
 
   OptionAdd(&opt,"d",'x',&dflg);
@@ -85,11 +87,17 @@ int main(int argc,char *argv[]) {
     OptionPrintInfo(stdout,hlpstr);
     exit(0);
   }
+
   if (option==1) {
     OptionDump(stdout,&opt);
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (arg !=argc) {
     if (zflg) {
       zfp=gzopen(argv[arg],"r");

diff --git a/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml b/codebase/general/src.bin/dmap/dmapdump.1.12/doc/dmapdump.doc.xml
@@ -5,8 +5,11 @@
 <location>src.bin/dmap/dmapdump</location>
 <syntax>dmapdump --help</syntax>
 <syntax>dmapdump [-d] [<ar>name</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-d</on><od>print the data values of the array variables.</od>
 </option>
 <option><on><ar>name</ar></on><od>filename of the DataMap file, if this is omitted the document will be read from standard input.</od>
@@ -21,5 +24,4 @@
 </description>
 </example>
 
-
 </binary>