Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor common code between DAP2(oc2) and DAP4 #477

Merged
merged 11 commits into from
Nov 6, 2017
Merged

Refactor common code between DAP2(oc2) and DAP4 #477

merged 11 commits into from
Nov 6, 2017

Conversation

DennisHeimbigner
Copy link
Collaborator

This pr should probably be delayed until after Version 4.5.

Primary change is to cleanup code and remove duplicated code
across the DAP protocol implementations.

  1. Unify the rc file reading into libdispatch/drc.c. Eventually extend
    if we need rc file for netcdf itself as opposed to the dap code.
  2. Unify the extraction from the rc file of DAP authorization info.
  3. Misc. other small unifications: make temp file, read file.
  4. Avoid use of libcurl when reading file:// because
    there is some kind of problem with the Visual Studio version.
    Might be related to the winpath problem.
    In any case, do direct read instead.
  5. Add new error code NC_ERCFILE for errors in reading RC file.
  6. Complete documentation cleanup as indicated in this comment
    Fix bug in ocrc.c#combinecredentials #472 (comment)
  7. Convert some occurrences of #ifdef _WIN32 to #ifdef _MSC_VER

   if we need rc file for netcdf itself as opposed to the dap code.
Primary change is to cleanup code and remove duplicated code.

1. Unify the rc file reading into libdispatch/drc.c. Eventually extend
   if we need rc file for netcdf itself as opposed to the dap code.
2. Unify the extraction from the rc file of DAP authorization info.
3. Misc. other small unifications: make temp file, read file.
4. Avoid use of libcurl when reading file:// because
   there is some kind of problem with the Visual Studio version.
   Might be related to the winpath problem.
   In any case, do direct read instead.
5. Add new error code NC_ERCFILE for errors in reading RC file.
6. Complete documentation cleanup as indicated in this comment
   #472 (comment)
7. Convert some occurrences of #ifdef _WIN32 to #ifdef _MSC_VER
@WardF WardF added this to the 4.5.1 milestone Sep 25, 2017
@WardF
Copy link
Member

WardF commented Nov 3, 2017

This is failing for me because there's no occlientparams.c or occlientparams.h as part of the branch. I can remove occlientparams.c from the CMakeLists.txt file, but oc.c still has an include for occlientparams.h which I don't know if it should just be removed. @DennisHeimbigner

@DennisHeimbigner
Copy link
Collaborator Author

If you merge urlparams.dmh first, this problem should go away.

@DennisHeimbigner
Copy link
Collaborator Author

wai, it looks like you already did that. This is probably a delete/keep conflict.
In any case, occlientparams.[ch] should be removed ifyou have already merged
urlparams.dmh

@WardF
Copy link
Member

WardF commented Nov 3, 2017

Ok sounds good, thanks for clarification!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants