Changeset 8

Timestamp:

11/27/07 12:16:16 (16 years ago)

Author:

kolasinski

Message:

Simplify macro_read.pro with get_macro_def - Add def_macro_base_fld.pro and get_macro_def.pro on the server - Bugfix for def_grid.pro also

Location:

trunk/procs

Files:

• def_macro_base_fld.pro (added)
• get_macro_def.pro (added)
• macro_read.pro (modified) (2 diffs)

trunk/procs/macro_read.pro

@@ -6 +6 @@
 @com_eg
 
-   IF debug_w THEN print, 'keyword_set(ALL_DATA) : ', keyword_set(ALL_DATA)
+   IF debug_w THEN print, '   ENTER macro_read...'
+
+   IF debug_w THEN print, '    keyword_set(ALL_DATA) : ', keyword_set(ALL_DATA)
 ;
 ; 1) read macro definition of field
 ;
-; name of macro file
+   @get_macro_def
 
-   file_mac = hom_def+'fld_macros.def'
-   IF debug_w THEN print,  'var_name in macro_read: ', var_name 
-; 
-; special case for stddev monthly 
-   stddev_mth =  '00'
-   pos_underscore =  strpos(var_name,'_')
-   IF pos_underscore GE 0 THEN BEGIN
-      stddev_mth = STRMID(var_name, pos_underscore + 1, 2)
-      var_name = STRMID(var_name, 0, pos_underscore)
-   ENDIF
-
-; find definition of macro
-   spawn, 'grep -i " '+STRMID(var_name, 2, 16)+' " '+file_mac, line
-   line = strcompress(strtrim(line[0], 2))
-   length = strlen(line)
-
-   IF length EQ 0 THEN BEGIN
-      print, ' *** WARNING : No macro definition for field ', var_name, $
-       ' in file ', file_mac
-      return, -1
-   ENDIF
-
-
-; Separate macro def and legend+unit
-;
-   leg_pos = strpos(line,'<')
-   line_def = STRMID(line,0,leg_pos)
-   line_def = strcompress(strtrim(line_def[0], 2))
-   macro_def = str_sep(line_def, ' ')
-   nfields = n_elements(macro_def)
    print, '    Computing macro : ', macro_def
-;
-; extract legend and unit
-;
-   legend = extract_str(line, '<', '>')
-   unit = extract_str(line, '[', ']')
 
 ; 2) loop to decode definition and build field
@@ -126 +93 @@
 
 
+   IF debug_w THEN print, '   ...EXIT macro_read'
+
 
    return, fieldo