ECC-239: Provide missing tools: gts_get

tests/CMakeLists.txt

@@ -51,6 +51,7 @@ list( APPEND tests2
     bufr_ls
     bufr_change_edition
     ecc-197
+    gts_get
     gts_ls
     gts_compare
     metar_ls

tests/gts_get.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+# Copyright 2005-2016 ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.sh
+
+#Enter data dir
+cd ${data_dir}/gts
+
+#Define a common label for all the tmp files
+label="gts_get_test"
+
+#Create log file
+fLog=${label}".log"
+rm -f $fLog
+touch $fLog
+
+#Define tmp file
+fTmp=${label}".tmp.txt"
+rm -f $fTmp
+
+#----------------------------------------------
+# Test "-p" switch
+#----------------------------------------------
+gts_file=EGRR20150317121020_00493212.DAT
+${tools_dir}/gts_get -p TT,AA,II,CCCC,YY,GG,gg,BBB $gts_file >/dev/null
+
+rm -f $fLog $res_ls 
+

tools/CMakeLists.txt

@@ -13,7 +13,7 @@ list( APPEND grib_tools_bins
              grib_compare codes_parser grib_index_build
              bufr_ls bufr_dump bufr_set bufr_get
              bufr_copy bufr_compare bufr_index_build
-             gts_compare gts_copy gts_dump gts_filter gts_ls
+             gts_get gts_compare gts_copy gts_dump gts_filter gts_ls
              metar_dump metar_ls metar_compare
              )
 

tools/gts_compare.c

@@ -17,18 +17,6 @@ GRIB_INLINE static int grib_inline_strcmp(const char* a,const char* b)
     return (*a==0 && *b==0) ? 0 : 1;
 }
 
-GRIB_INLINE static int grib_inline_rstrcmp(const char* a,const char* b)
-{
-    char* p=(char*)a;
-    char* q=(char*)b;
-    while (*p != 0) p++;
-    while (*q != 0) q++;
-    q--;p--;
-    if (*q != *p) return 1;
-    while((p!=a && q!=b) &&  *(p) == *(q) ) {p--;q--;}
-    return (q==b) ? 0 : 1;
-}
-
 typedef double (*compare_double_proc) (double*,double*,double*);
 
 typedef struct grib_error grib_error;

tools/gts_get.c

@@ -8,211 +8,98 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/*
- * C Implementation: grib_get
- *
- * Author: Enrico Fucile <enrico.fucile@ecmwf.int>
- *
- *
- */
-
 #include "grib_tools.h"
 
 grib_option grib_options[]={
-/*  {id, args, help}, on, command_line, value*/
+        /*  {id, args, help}, on, command_line, value*/
-    {"f",0,0,0,1,0},
+        {"f",0,0,0,1,0},
-    {"p:",0,0,0,1,0},
+        {"p:",0,0,0,1,0},
-    {"F:",0,0,1,1,"%g"},
+        {"F:",0,0,1,1,"%g"},
-    {"l:",0,0,0,1,0},
+        {"P:",0,0,0,1,0},
-    {"P:",0,0,0,1,0},
+        {"w:",0,0,0,1,0},
-    {"w:",0,0,0,1,0},
+        {"n:",0,0,1,1,0},
-    {"n:",0,0,1,1,0},
+        {"s:",0,0,0,1,0},
-    {"s:",0,0,0,1,0},
+        {"V",0,0,0,1,0},
-    {"V",0,0,0,1,0},
+        {"W:",0,0,1,1,"8"},
-    {"W:",0,0,1,1,"8"},
+        {"S",0,0,1,0,0},
-    {"m",0,0,0,1,0},
+        {"g",0,0,0,1,0},
-    {"M",0,0,0,1,0},
+        {"T:",0,0,1,0,"T"},/* GTS */
-    {"S",0,0,1,0,0},
+        {"7",0,0,0,1,0},
-    {"g",0,0,0,1,0},
+        {"v",0,0,1,0,0}
-    {"G",0,0,0,1,0},
-    {"T:",0,0,1,0,"T"},
-    {"7",0,0,0,1,0},
-    {"v",0,0,1,0,0},
-    {"i:",0,0,0,1,0}
 };
 
-char* grib_tool_description="Get values of some keys from a grib file."
+char* grib_tool_description="Get values of some keys from a GTS file."
-                 "\n\tIt is similar to grib_ls, but fails returning an error code "
+        "\n\tIt is similar to gts_ls, but fails returning an error code "
-         "\n\twhen an error occurs (e.g. key not found).";
+        "\n\twhen an error occurs (e.g. key not found).";
 char* grib_tool_name="gts_get";
 char* grib_tool_usage="[options] file file ...";
 
 int grib_options_count=sizeof(grib_options)/sizeof(grib_option);
-double lat=0;
-double lon=0;
 int mode=0;
-grib_nearest* n=NULL;
 
-int main(int argc, char *argv[]) { return grib_tool(argc,argv);}
+int main(int argc, char *argv[])
-
+{
-int grib_tool_before_getopt(grib_runtime_options* options) {
+    return grib_tool(argc,argv);
-  options->print_keys_count=-1;
-  return 0;
 }
 
-int grib_tool_init(grib_runtime_options* options) {
+int grib_tool_before_getopt(grib_runtime_options* options)
-  char  *end = NULL, *end1=NULL;
+{
-  size_t size=4;
+    options->print_keys_count=-1;
-  int ret=0;
+    return 0;
-  double min=0,max=0;
+}
-  int i=0,idx=0;
-  char* p=NULL;
-  
-  options->print_header=0;
-  options->print_statistics=0;
-  options->default_print_width=-1;
 
-  if (options->latlon) {
+int grib_tool_init(grib_runtime_options* options)
+{
+    options->print_header=0;
+    options->print_statistics=0;
+    options->default_print_width=-1;
 
-    lat = strtod(options->latlon,&end);
+    return 0;
-    if (*end != ',') {
+}
-      printf("ERROR: wrong latitude value\n");
-      exit(1);
-    }
-    lon= strtod(++end,&end1);
-    
-    mode=GRIB_NEAREST_SAME_POINT | GRIB_NEAREST_SAME_GRID;
 
-    if (end1 && *end1 == ',') {
+int grib_tool_new_filename_action(grib_runtime_options* options,const char* file)
-      end1++;
+{
-      if (*end1 != '0') {
+    return 0;
-        p=end1;
+}
-        while (*p != ',' && *p !='\0') p++;
+
-        if (*end1 == '4') {
+int grib_tool_new_file_action(grib_runtime_options* options,grib_tools_file* file)
-          options->latlon_mode=4;
+{
-        } else if (*end1 == '1') {
+    return 0;
-          options->latlon_mode=1;
+}
-        } else {
+
-          printf("ERROR %s: wrong mode given in option -l\n",grib_tool_name);
+int grib_tool_new_handle_action(grib_runtime_options* options,grib_handle* h)
-          exit(1);
+{
+    int err = 0;
+
+    if (!options->skip) {
+        if (options->set_values_count != 0) {
+            err=grib_set_values(h,options->set_values,options->set_values_count);
         }
-      }
+
-      if (*p == ',') {
+        if (err != GRIB_SUCCESS && options->fail) exit(err);
-        p++;
-        options->latlon_mask=strdup(p);
-      }
     }
 
-
+    return 0;
-  }
-
-  if (options->latlon && options->latlon_mask) {
-    FILE* f=NULL;
-    grib_handle* hh;
-    f=fopen(options->latlon_mask,"r");
-    if(!f) {
-      perror(options->latlon_mask);
-      exit(1);
-    }
-    hh=grib_handle_new_from_file(0,f,&ret);
-    fclose(f);
-    GRIB_CHECK_NOLINE(ret,0);
-    n=grib_nearest_new(hh,&ret);
-    GRIB_CHECK_NOLINE(ret,0);
-    GRIB_CHECK_NOLINE(grib_nearest_find(n,hh,lat,lon,mode,
-               options->lats,options->lons,options->mask_values,options->distances,options->indexes,&size),0);
-    grib_nearest_delete(n);
-    n=NULL;
-    grib_handle_delete( hh);
-
-    options->latlon_idx=-1;
-    max=options->distances[0];
-    for (i=0;i<4;i++)
-      if (max<options->distances[i]) {max=options->distances[i];idx=i;}
-    min=max;
-    for (i=0;i<4;i++) {
-      if ((min >= options->distances[i]) && (options->mask_values[i] >= 0.5)) {
-        options->latlon_idx=i;
-        min = options->distances[i];
-      }
-    }
-
-    if (options->latlon_idx<0){
-      min=0;
-      options->latlon_idx=0;
-      for (i=1;i<4;i++)
-        if (min>options->distances[i]) {
-        min = options->distances[i];
-        options->latlon_idx=i;
-        }
-    }
-  }
-  
-  return 0;
-}
-int grib_tool_new_filename_action(grib_runtime_options* options,const char* file) {
-   return 0;
-   }
-
-
-int grib_tool_new_file_action(grib_runtime_options* options,grib_tools_file* file) {
-   return 0;
 }
 
-int grib_tool_new_handle_action(grib_runtime_options* options,grib_handle* h) {
+int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h)
-  size_t size=4;
+{
-  int err = 0;
+    grib_handle_delete(h);
-
+    return 0;
-  if (!options->skip) {
-	  if (options->set_values_count != 0) {
-		  err=grib_set_values(h,options->set_values,options->set_values_count);
-    }
-
-	  if (err != GRIB_SUCCESS && options->fail) exit(err);
-  }
-
-  if (options->latlon) {
-	  int err=0;
-	  double min;
-	  int i;
-    if (!n) n=grib_nearest_new(h,&err);
-    GRIB_CHECK_NOLINE(err,0);
-    GRIB_CHECK_NOLINE(grib_nearest_find(n,h,lat,lon,mode,
-               options->lats,options->lons,options->values,
-               options->distances,options->indexes,&size),0);
-	min=options->distances[0];
-	options->latlon_idx=0;
-	i=0;
-	for (i=1;i<4;i++) {
-		if (min>options->distances[i]) {
-			min=options->distances[i];
-			options->latlon_idx=i;
-		}
-	}
-
-  }
-  
-  return 0;
 }
 
-int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) {
+void grib_tool_print_key_values(grib_runtime_options* options,grib_handle* h)
-  grib_handle_delete(h);
+{
-  return 0;
+    grib_print_key_values(options,h);
 }
 
-void grib_tool_print_key_values(grib_runtime_options* options,grib_handle* h) {
+int grib_tool_finalise_action(grib_runtime_options* options)
-  grib_print_key_values(options,h);
+{
+    return 0;
 }
 
-int grib_tool_finalise_action(grib_runtime_options* options) {
+int grib_no_handle_action(int err)
-
+{
-  if (n) grib_nearest_delete(n);
+    fprintf(dump_file,"\t\t\"ERROR: unreadable message\"\n");
-  
+    return 0;
-  return 0;
 }
-
-int grib_no_handle_action(int err) {
-  fprintf(dump_file,"\t\t\"ERROR: unreadable message\"\n");
-  return 0;
-}
-