/[ascend]/trunk/models/johnpye/datareader/dr.c
ViewVC logotype

Diff of /trunk/models/johnpye/datareader/dr.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1772 by jpye, Sat Jun 30 23:21:49 2007 UTC revision 1773 by jpye, Mon May 19 02:52:08 2008 UTC
# Line 21  Line 21 
21    
22  #include "dr.h"  #include "dr.h"
23  #include "tmy.h"  #include "tmy.h"
24    #include "acdb.h"
25    
26  #include <utilities/config.h>  #include <utilities/config.h>
27  #include <general/ospath.h>  #include <general/ospath.h>
# Line 38  Line 39 
39      DATA instance of the external relation      DATA instance of the external relation
40  */  */
41    
42  #define FMTS(D,X) D(TMY2) X D(CSV) X D(TDV)  #define FMTS(D,X) D(TMY2) X D(ACDB) X D(CSV) X D(TDV)
43    
44  #define ENUM(F_) DATAREADER_FORMAT_##F_  #define ENUM(F_) DATAREADER_FORMAT_##F_
45  #define COMMA ,  #define COMMA ,
# Line 109  int datareader_set_format(DataReader *d, Line 110  int datareader_set_format(DataReader *d,
110              d->indepfn=&datareader_tmy2_time;              d->indepfn=&datareader_tmy2_time;
111              d->valfn=&datareader_tmy2_vals;              d->valfn=&datareader_tmy2_vals;
112              break;              break;
113            case DATAREADER_FORMAT_ACDB:
114                d->headerfn=&datareader_acdb_header;
115                d->datafn=&datareader_acdb_data;
116                d->eoffn=&datareader_acdb_eof;
117                d->indepfn=&datareader_acdb_time;
118                d->valfn=&datareader_acdb_vals;
119                break;
120          case DATAREADER_FORMAT_TDV:          case DATAREADER_FORMAT_TDV:
121              ERROR_REPORTER_HERE(ASC_USER_ERROR,"Tab delimited values (TDV) format not yet implemenented.");              ERROR_REPORTER_HERE(ASC_USER_ERROR,"Tab delimited values (TDV) format not yet implemenented.");
122              return 1;              return 1;

Legend:
Removed from v.1772  
changed lines
  Added in v.1773

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22