improve block number generation

Author: pas-by

gtTsRaw.java

@@ -56,8 +56,10 @@ public void extract(){
             //  loop for each occupied station
             for(int index=0; index<occupiedStations.size(); index++){
             	setupHeader occupiedStation = occupiedStations.get(index);
-                outputString += "41" + (gsi8_util.getPtIDWord(blockNum, "1")).substring(2);
-                outputString += (occupiedStation.toString()).substring(15) + System.lineSeparator();
+                occupiedStation.setBlockNumber(blockNum);
+
+                //  add an station header before each setup
+                outputString += occupiedStation + System.lineSeparator();
                 blockNum++;
 
                 pstmt.setInt(1, occupiedStation.getSetupIndex());

setupHeader.java

@@ -4,13 +4,20 @@ public class setupHeader implements Cloneable{
     protected int index;
     protected String StationName;
     protected double instrumentHeight;
+    protected int blockNum = 1;
 
+    //  constructor
     public setupHeader(int i, String name, double hi){
         index = i;
         StationName = new String(name);
         instrumentHeight =  hi;
     }
 
+    public void setBlockNumber(int b){
+        if(b<1000)
+            blockNum = b;
+    }
+
     public int getSetupIndex(){
         return index;
     }
@@ -25,7 +32,7 @@ public double getHI(){
 
     public String toString(){
         //  generate Station header in GSI8 format
-        String sResult = "410001+00000001 42....";
+        String sResult = "41" + (gsi8_util.getPtIDWord(blockNum, "1")).substring(2) + " 42....";
         sResult += (gsi8_util.getPtIDWord(1, StationName)).substring(6);
         sResult += " 43..1";
         sResult += (gsi8_util.getDataWord('0', instrumentHeight)).substring(5);