mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-27 08:49:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
9c33cfc62c
netcdf-c/libdap2/dapincludes.h

113 lines
3.3 KiB
C
Raw Normal View History

2011-04-18 02:56:10 +08:00
/*********************************************************************
Updated COPYRIGHT stanza in libdap2
2018-12-07 05:21:03 +08:00
* Copyright 2018, UCAR/Unidata
2011-04-18 02:56:10 +08:00
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/
Primary change: add dap4 support Specific changes: 1. Add dap4 code: libdap4 and dap4_test. Note that until the d4ts server problem is solved, dap4 is turned off. 2. Modify various files to support dap4 flags: configure.ac, Makefile.am, CMakeLists.txt, etc. 3. Add nc_test/test_common.sh. This centralizes the handling of the locations of various things in the build tree: e.g. where is ncgen.exe located. See nc_test/test_common.sh for details. 4. Modify .sh files to use test_common.sh 5. Obsolete separate oc2 by moving it to be part of netcdf-c. This means replacing code with netcdf-c equivalents. 5. Add --with-testserver to configure.ac to allow override of the servers to be used for --enable-dap-remote-tests. 6. There were multiple versions of nctypealignment code. Try to centralize in libdispatch/doffset.c and include/ncoffsets.h 7. Add a unit test for the ncuri code because of its complexity. 8. Move the findserver code out of libdispatch and into a separate, self contained program in ncdap_test and dap4_test. 9. Move the dispatch header files (nc{3,4}dispatch.h) to .../include because they are now shared by modules. 10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts. 11. Make use of MREMAP if available 12. Misc. minor changes e.g. - #include <config.h> -> #include "config.h" - Add some no-install headers to /include - extern -> EXTERNL and vice versa as needed - misc header cleanup - clean up checking for misc. unix vs microsoft functions 13. Change copyright decls in some files to point to LICENSE file. 14. Add notes to RELEASENOTES.md
2017-03-09 08:01:10 +08:00
#ifndef DAPINCLUDES_H
#define DAPINCLUDES_H 1
2011-04-18 02:56:10 +08:00
#include "config.h"
#include <stdlib.h>
Corrected MSVC-related issues with DAP. Renamed variables to avoid collision with reserved words, enclosed includes with appropriate ifdefs, other minor changes.
2012-09-21 00:31:31 +08:00
#ifdef HAVE_UNISTD_H
2011-04-18 02:56:10 +08:00
#include <unistd.h>
Corrected MSVC-related issues with DAP. Renamed variables to avoid collision with reserved words, enclosed includes with appropriate ifdefs, other minor changes.
2012-09-21 00:31:31 +08:00
#endif
2011-04-18 02:56:10 +08:00
#include <string.h>
#include <stdio.h>
Primary change: add dap4 support Specific changes: 1. Add dap4 code: libdap4 and dap4_test. Note that until the d4ts server problem is solved, dap4 is turned off. 2. Modify various files to support dap4 flags: configure.ac, Makefile.am, CMakeLists.txt, etc. 3. Add nc_test/test_common.sh. This centralizes the handling of the locations of various things in the build tree: e.g. where is ncgen.exe located. See nc_test/test_common.sh for details. 4. Modify .sh files to use test_common.sh 5. Obsolete separate oc2 by moving it to be part of netcdf-c. This means replacing code with netcdf-c equivalents. 5. Add --with-testserver to configure.ac to allow override of the servers to be used for --enable-dap-remote-tests. 6. There were multiple versions of nctypealignment code. Try to centralize in libdispatch/doffset.c and include/ncoffsets.h 7. Add a unit test for the ncuri code because of its complexity. 8. Move the findserver code out of libdispatch and into a separate, self contained program in ncdap_test and dap4_test. 9. Move the dispatch header files (nc{3,4}dispatch.h) to .../include because they are now shared by modules. 10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts. 11. Make use of MREMAP if available 12. Misc. minor changes e.g. - #include <config.h> -> #include "config.h" - Add some no-install headers to /include - extern -> EXTERNL and vice versa as needed - misc header cleanup - clean up checking for misc. unix vs microsoft functions 13. Change copyright decls in some files to point to LICENSE file. 14. Add notes to RELEASENOTES.md
2017-03-09 08:01:10 +08:00
#include "netcdf.h"
2011-04-18 02:56:10 +08:00
#include "ncbytes.h"
#include "nclist.h"
#include "nclog.h"
complete update of utilities: ncbyte, nclist, ncuri, nclog
2012-08-09 07:15:18 +08:00
#include "ncuri.h"
move from oc1.0 to oc2.0; create new dir oc2
2012-08-01 04:34:13 +08:00
- Implemented diskless files for both netcdf classic and extended. The in-memory files can be made persistent if nc_create is called with NC_DISKLESS|NC_WRITE flags set. Initial test case also included. - Modified ncio mechanism to support multiple ncio packages; this is so we can have posixio and memio operating at the same time. - cleanup up a bunch of lint issues (unused variables, etc).
2012-03-26 09:34:32 +08:00
#include "fbits.h"
2011-04-18 02:56:10 +08:00
#include "dceconstraints.h"
#include "ncdispatch.h"
The effect of this change is to make the struct NC structure contain as little file-type specific info as possible. It modifies especially libsrc so that all of the netcdf-3 data that used to be in struct NC is now kept in a separate chunk of data pointed to by the struct NC. This makes all of current protocols consistent: netcdf-3, netcdf-4, and dap.
2012-09-07 03:44:03 +08:00
#include "nc.h"
#include "nc3internal.h"
2011-04-18 02:56:10 +08:00
/* netcdf overrides*/
#include "dapnc.h"
jira: NCF-232: bad conversion of grids
2013-02-26 12:31:06 +08:00
#include "oc.h"
Primary change: add dap4 support Specific changes: 1. Add dap4 code: libdap4 and dap4_test. Note that until the d4ts server problem is solved, dap4 is turned off. 2. Modify various files to support dap4 flags: configure.ac, Makefile.am, CMakeLists.txt, etc. 3. Add nc_test/test_common.sh. This centralizes the handling of the locations of various things in the build tree: e.g. where is ncgen.exe located. See nc_test/test_common.sh for details. 4. Modify .sh files to use test_common.sh 5. Obsolete separate oc2 by moving it to be part of netcdf-c. This means replacing code with netcdf-c equivalents. 5. Add --with-testserver to configure.ac to allow override of the servers to be used for --enable-dap-remote-tests. 6. There were multiple versions of nctypealignment code. Try to centralize in libdispatch/doffset.c and include/ncoffsets.h 7. Add a unit test for the ncuri code because of its complexity. 8. Move the findserver code out of libdispatch and into a separate, self contained program in ncdap_test and dap4_test. 9. Move the dispatch header files (nc{3,4}dispatch.h) to .../include because they are now shared by modules. 10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts. 11. Make use of MREMAP if available 12. Misc. minor changes e.g. - #include <config.h> -> #include "config.h" - Add some no-install headers to /include - extern -> EXTERNL and vice versa as needed - misc header cleanup - clean up checking for misc. unix vs microsoft functions 13. Change copyright decls in some files to point to LICENSE file. 14. Add notes to RELEASENOTES.md
2017-03-09 08:01:10 +08:00
#include "ncdap.h"
Unify definition of NC_DISPATCH_VERSION re: Issue The netcdf dispatch table version was defined in several places. Modify to only require defining it in CMakeLists.txt and configure.ac. Fix entailed the following changes: * Up the NC_DISPATCH_VERSION from 2 to 3 in configure.ac and CMakeLists.txt * Create include/netcdf_dispatch.h.in and use it to configure include/netcdf_dispatch.h * For CMAKE, make it search CMAKE_CURRENT_BINARY_DIR so code can locate the configured netcdf_dispatch.h * Add entry to config.h.cmake.in for NC_DISPATCH_VERSION * Move NCerror from include/ncdispatch.h to libdap2/nccomon.h * Fix an API problem re nchttp.h * Fix a conversion warning in libdispatch/dinfermodel.c
2021-02-01 12:40:08 +08:00
#include "nccommon.h"
2011-04-18 02:56:10 +08:00
#include "dapdebug.h"
#include "daputil.h"
/**************************************************/
/* sigh, do the forwards */
struct NCprojection;
struct NCselection;
struct Getvara;
struct NCcachenode;
struct NCcache;
struct NCslice;
struct NCsegment;
/**************************************************/
#include "getvara.h"
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
#include "constraints.h"
2011-04-18 02:56:10 +08:00
/**************************************************/
extern struct NCTMODEL nctmodels[];
/**************************************************/
/* Import some internal procedures from libsrc*/
cleanup and remove unused code
2012-04-02 04:15:06 +08:00
/* Internal, but non-static procedures */
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern NCerror computecdfvarnames(NCDAPCOMMON*,CDFnode*,NClist*);
extern NCerror computecdfnodesets(NCDAPCOMMON* nccomm, CDFtree* tree);
extern NCerror computevarnodes(NCDAPCOMMON*, NClist*, NClist*);
2011-04-18 02:56:10 +08:00
extern NCerror collectvardefdims(NCDAPCOMMON* drno, CDFnode* var, NClist* dimset);
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern NCerror fixgrids(NCDAPCOMMON* drno);
extern NCerror dapmerge(NCDAPCOMMON* drno, CDFnode* node, OCobject dasroot);
extern NCerror sequencecheck(NCDAPCOMMON* drno);
extern NCerror computecdfdimnames(NCDAPCOMMON*);
extern NCerror attachdatadds(struct NCDAPCOMMON*);
extern NCerror detachdatadds(struct NCDAPCOMMON*);
2011-04-18 02:56:10 +08:00
extern void dapdispatch3init(void);
/*
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern void dereference(NCconstraint* constraint);
extern NCerror rereference(NCconstraint*, NClist*);
2011-04-18 02:56:10 +08:00
*/
Sync with oc project. This supports better authorization handling for DAP requests, especially redirection based authorization. I also added a new test case ncdap_tests/testauth.sh. Specifically, suppose I have a netrc file /tmp/netrc containing this. machine uat.urs.earthdata.nasa.gov login xxxxxx password yyyyyy Also suppose I have a .ocrc file containing these lines HTTP.COOKIEJAR=/tmp/cookies HTTP.NETRC=/tmp/netrc Assume that .ocrc is in the local directory or HOME. Then this command should work (assuming a valid login and password). ncdump -h "https://54.86.135.31/opendap/data/nc/fnoc1.nc"
2014-12-25 01:22:47 +08:00
extern NCerror dapbuildvaraprojection(CDFnode*,
2011-04-18 02:56:10 +08:00
const size_t* startp, const size_t* countp, const ptrdiff_t* stridep,
struct DCEprojection** projectionlist);
extern NCerror nc3d_getvarx(int ncid, int varid,
const size_t *startp,
const size_t *countp,
const ptrdiff_t *stridep,
void *data,
nc_type dsttype0);
/**************************************************/
extern NCerror nc3d_open(const char* path, int mode, int* ncidp);
extern int nc3d_close(int ncid);
1. synch with oc 2. replace all occurrences of 'template' with 'pattern' since template is reserved in windows.
2015-01-16 05:19:51 +08:00
extern NCerror restruct(NCDAPCOMMON*, CDFnode* ddsroot, CDFnode* pattern, NClist*);
fix NCF-120
2011-09-16 00:57:16 +08:00
extern void setvisible(CDFnode* root, int visible);
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern NCerror mapnodes(CDFnode* dstroot, CDFnode* srcroot);
extern void unmap(CDFnode* root);
#if 0
1. synch with oc 2. replace all occurrences of 'template' with 'pattern' since template is reserved in windows.
2015-01-16 05:19:51 +08:00
extern NCerror fetchpatternmetadata(NCDAPCOMMON* nccomm);
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern NCerror fetchconstrainedmetadata(NCDAPCOMMON* nccomm);
extern void applyclientparamcontrols(NCDAPCOMMON*);
extern NCerror suppressunusablevars(NCDAPCOMMON*);
extern void estimatevarsizes(NCDAPCOMMON*);
extern NCerror showprojection(NCDAPCOMMON*, CDFnode* var);
#endif
2011-04-18 02:56:10 +08:00
/* From: dapcvt.c*/
In preparation for adding dap4 support, I have cleaned up the libdap2 code to make it dap2 protocol + netcdf classic only.
2014-03-25 04:02:52 +08:00
extern NCerror dapconvert(nc_type, nc_type, char*, char*, size_t);
Modify DAP2 and DAP4 to optionally allow Fillvalue/Variable mismatch re: issue https://github.com/Unidata/netcdf-c/issues/1151 Modify DAP2 and DAP4 code to handle case when _FillValue type is not same as the parent variable type. Specifically: 1. Define a parameter [fillmismatch] to allow this mismatch; default is to disallow. 2. If allowed, forcibly change the type of the _FillValue to match the parent variable. 3. If allowed Convert the values to match new type 4. Generate a log message 5. if not allowed, then fail Implementing this required some changes to ncdap_test/dapcvt.c Also added test cases. Minor Unrelated Changes: 1. There were a number of warnings about e.g. assigning a const char* to a char*. Fix these 2. In nccopy.1, replace .NP with .IP "n" (re PR https://github.com/Unidata/netcdf-c/pull/1144) 3. fix minor error in ncdump/ocprint
2018-10-02 05:51:43 +08:00
extern int dapcvtattrval(nc_type, void*, NClist*, NCattribute*);
2011-04-18 02:56:10 +08:00
Primary change: add dap4 support Specific changes: 1. Add dap4 code: libdap4 and dap4_test. Note that until the d4ts server problem is solved, dap4 is turned off. 2. Modify various files to support dap4 flags: configure.ac, Makefile.am, CMakeLists.txt, etc. 3. Add nc_test/test_common.sh. This centralizes the handling of the locations of various things in the build tree: e.g. where is ncgen.exe located. See nc_test/test_common.sh for details. 4. Modify .sh files to use test_common.sh 5. Obsolete separate oc2 by moving it to be part of netcdf-c. This means replacing code with netcdf-c equivalents. 5. Add --with-testserver to configure.ac to allow override of the servers to be used for --enable-dap-remote-tests. 6. There were multiple versions of nctypealignment code. Try to centralize in libdispatch/doffset.c and include/ncoffsets.h 7. Add a unit test for the ncuri code because of its complexity. 8. Move the findserver code out of libdispatch and into a separate, self contained program in ncdap_test and dap4_test. 9. Move the dispatch header files (nc{3,4}dispatch.h) to .../include because they are now shared by modules. 10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts. 11. Make use of MREMAP if available 12. Misc. minor changes e.g. - #include <config.h> -> #include "config.h" - Add some no-install headers to /include - extern -> EXTERNL and vice versa as needed - misc header cleanup - clean up checking for misc. unix vs microsoft functions 13. Change copyright decls in some files to point to LICENSE file. 14. Add notes to RELEASENOTES.md
2017-03-09 08:01:10 +08:00
#endif /*DAPINCLUDES_H*/
Reference in New Issue Copy Permalink