Skip to content

Commit

Permalink
ensure msOWSDispatch() always available
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/mapserver/trunk@5496 7532c77e-422f-0410-93f4-f0b67bdd69e2
  • Loading branch information
warmerdam committed Jun 6, 2006
1 parent 342d202 commit 32b8edf
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
3 changes: 3 additions & 0 deletions HISTORY.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ the CVS logs is updated daily at the following URL:
CVS HEAD (4.9-dev)
------------------

- mapows.c: ensure msOWSDispatch() is always available even if there are
no services to dispatch. This makes mapscript binding easier.

- FLTAddToLayerResultCache wasn't properly closing the layer after it
was done with it.

Expand Down
15 changes: 9 additions & 6 deletions mapows.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
******************************************************************************
*
* $Log$
* Revision 1.65 2006/06/06 14:21:01 frank
* ensure msOWSDispatch() always available
*
* Revision 1.64 2006/05/09 14:33:41 assefa
* WFS client/OWS : correct path concatenation logic for temporary gml file
* created (bug 1770).
Expand Down Expand Up @@ -251,12 +254,6 @@

MS_CVSID("$Id$")

#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR)

#if !defined(USE_PROJ)
#error "PROJ.4 is required for WMS, WFS and WCS Server Support."
#endif

/*
** msOWSDispatch() is the entry point for any OWS request (WMS, WFS, ...)
** - If this is a valid request then it is processed and MS_SUCCESS is returned
Expand Down Expand Up @@ -293,6 +290,12 @@ int msOWSDispatch(mapObj *map, cgiRequestObj *request)
return MS_DONE; /* Not a WMS/WFS request... let MapServer handle it */
}

#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)

#if !defined(USE_PROJ)
#error "PROJ.4 is required for WMS, WFS and WCS Server Support."
#endif

/*
** msRenameLayer()
*/
Expand Down
6 changes: 5 additions & 1 deletion mapows.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*
**********************************************************************
* $Log$
* Revision 1.72 2006/06/06 14:21:01 frank
* ensure msOWSDispatch() always available
*
* Revision 1.71 2006/04/17 19:06:49 dan
* Set User-Agent in HTTP headers of client WMS/WFS connections (bug 1749)
*
Expand Down Expand Up @@ -274,9 +277,10 @@ int msHTTPGetFile(const char *pszGetUrl, const char *pszOutputFile,
/*====================================================================
* mapows.c
*====================================================================*/
MS_DLL_EXPORT int msOWSDispatch(mapObj *map, cgiRequestObj *request);

#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR)

MS_DLL_EXPORT int msOWSDispatch(mapObj *map, cgiRequestObj *request);
MS_DLL_EXPORT int msOWSMakeAllLayersUnique(mapObj *map);
MS_DLL_EXPORT char *msOWSTerminateOnlineResource(const char *src_url);
MS_DLL_EXPORT char *msOWSGetOnlineResource(mapObj *map, const char *namespaces, const char *metadata_name, cgiRequestObj *req);
Expand Down

0 comments on commit 32b8edf

Please sign in to comment.