From 4faedbb7cee7e6cd28c5af32525b5cfcd4d058c2 Mon Sep 17 00:00:00 2001
From: Bill Tollett <wtollett-usgs@users.noreply.github.com>
Date: Fri, 18 May 2018 10:56:10 -1000
Subject: [PATCH] Added channel count to export header lines

---
 Valve3/pom.xml                                                | 2 +-
 .../main/java/gov/usgs/volcanoes/valve3/RawDataHandler.java   | 1 +
 .../gov/usgs/volcanoes/valve3/plotter/RawDataPlotter.java     | 3 ++-
 Valve3Web/pom.xml                                             | 4 ++--
 pom.xml                                                       | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Valve3/pom.xml b/Valve3/pom.xml
index f18e678..c689486 100644
--- a/Valve3/pom.xml
+++ b/Valve3/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>gov.usgs.volcanoes</groupId>
     <artifactId>valve</artifactId>
-    <version>3.6.1</version>
+    <version>3.6.2</version>
   </parent>
   <artifactId>valve3</artifactId>
   <packaging>jar</packaging>
diff --git a/Valve3/src/main/java/gov/usgs/volcanoes/valve3/RawDataHandler.java b/Valve3/src/main/java/gov/usgs/volcanoes/valve3/RawDataHandler.java
index 0f6deb1..11a6467 100644
--- a/Valve3/src/main/java/gov/usgs/volcanoes/valve3/RawDataHandler.java
+++ b/Valve3/src/main/java/gov/usgs/volcanoes/valve3/RawDataHandler.java
@@ -280,6 +280,7 @@ else if ( !fn_source.equals(source) )
 				cmtBits.put( "st", String.format( "%14.3f", component.getStartTime(endtime) ) );
 				cmtBits.put( "et", String.format( "%14.3f", endtime ) );
 				cmtBits.put( "source", fn_source );
+				cmtBits.put( "chCnt", StringUtils.stringToString(request.getParameter("chCnt.0"), "None"));
 				String outputType = component.get( "o" );
 				fn = df.format(now) + "_" 
 					+ fn_source.replaceAll( "-", "_") + "_"
diff --git a/Valve3/src/main/java/gov/usgs/volcanoes/valve3/plotter/RawDataPlotter.java b/Valve3/src/main/java/gov/usgs/volcanoes/valve3/plotter/RawDataPlotter.java
index 965fe14..04907c9 100644
--- a/Valve3/src/main/java/gov/usgs/volcanoes/valve3/plotter/RawDataPlotter.java
+++ b/Valve3/src/main/java/gov/usgs/volcanoes/valve3/plotter/RawDataPlotter.java
@@ -924,7 +924,8 @@ public String toExport(PlotComponent comp, Map<String, String> cmtBits, OutputSt
       cmtLines.add("reqtime=" + cmtBits.get("reqtime"));
       cmtLines.add("URL=" + cmtBits.get("URL"));
       cmtLines.add("source=" + cmtBits.get("source"));
-      cmtLines.add("st=" + cmtBits.get("st") + ", et=" + cmtBits.get("et"));
+      cmtLines.add("st=" + cmtBits.get("st") + ", et="
+                   + cmtBits.get("et") + ", chCnt=" + cmtBits.get("chCnt"));
       rank = cmtBits.get("rank");
       rowTimeZone = cmtBits.get("timezone");
     }
diff --git a/Valve3Web/pom.xml b/Valve3Web/pom.xml
index c211aff..a057d87 100644
--- a/Valve3Web/pom.xml
+++ b/Valve3Web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>gov.usgs.volcanoes</groupId>
     <artifactId>valve</artifactId>
-    <version>3.6.1</version>
+    <version>3.6.2</version>
   </parent>
   <artifactId>valve3web</artifactId>
   <packaging>war</packaging>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>gov.usgs.volcanoes</groupId>
       <artifactId>valve3</artifactId>
-      <version>3.6.1</version>
+      <version>3.6.2</version>
       <exclusions>
         <exclusion>
           <groupId>gov.usgs.volcanoes</groupId>
diff --git a/pom.xml b/pom.xml
index bf5e780..5ce5032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>gov.usgs.volcanoes</groupId>
   <artifactId>valve</artifactId>
-  <version>3.6.1</version>
+  <version>3.6.2</version>
   <packaging>pom</packaging>
 
   <name>valve</name>