Merge pull request #14 from wtollett-usgs/master

Added channel count to export header lines
usgs · May 18, 2018 · c85a37d · c85a37d
2 parents 1f41d3e + 4faedbb
commit c85a37d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>