FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

handle check when using TINYOWS_MAPFILE by jmckenna · Pull Request #97 · MapServer/tinyows · GitHub

/ tinyows Public

handle check when using TINYOWS_MAPFILE #97

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.

Sign up for GitHub

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

Merged
jmckenna merged 6 commits into from
Jun 18, 2021
Conversation 6 Commits 6 Checks 0 Files changed
Merged

handle check when using TINYOWS_MAPFILE #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4667912
handle mapfile check
jmckenna Jun 12, 2021
857b4c0
don't regenerate mapfile.c
jmckenna Jun 12, 2021
51efe91
handle PostGIS 3.1
jmckenna Jun 12, 2021
c316742
fix indentation
jmckenna Jun 12, 2021
5c6458a
debian library order patch
jmckenna Jun 12, 2021
37aec1f
fix indentation, again
jmckenna Jun 12, 2021
File filter

Filter by extension

Filter by extension .c  (1) .in  (2) .l  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion Makefile.in
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GIT_FLAGS=@GIT_FLAGS@
SRC=src/fe/fe_comparison_ops.c src/fe/fe_error.c src/fe/fe_filter.c src/fe/fe_filter_capabilities.c src/fe/fe_function.c src/fe/fe_logical_ops.c src/fe/fe_spatial_ops.c src/mapfile/mapfile.c src/ows/ows_bbox.c src/ows/ows.c src/ows/ows_config.c src/ows/ows_error.c src/ows/ows_geobbox.c src/ows/ows_get_capabilities.c src/ows/ows_layer.c src/ows/ows_metadata.c src/ows/ows_psql.c src/ows/ows_request.c src/ows/ows_srs.c src/ows/ows_storage.c src/ows/ows_version.c src/struct/alist.c src/struct/array.c src/struct/buffer.c src/struct/cgi_request.c src/struct/list.c src/struct/mlist.c src/struct/regexp.c src/wfs/wfs_describe.c src/wfs/wfs_error.c src/wfs/wfs_get_capabilities.c src/wfs/wfs_get_feature.c src/wfs/wfs_request.c src/wfs/wfs_transaction.c src/ows/ows_libxml.c

all:
$(CC) -o tinyows $(SRC) $(XMLFLAGS) $(CFLAGS) $(PGFLAGS) $(FCGIFLAGS) $(GIT_FLAGS) -lfl
$(CC) $(CFLAGS) $(POSTGIS_INC) $(XML2_INC) $(FCGI_INC) $(SVN_FLAGS) $(SRC) -o tinyows -lfl $(POSTGIS_LIB) $(XML2_LIB) $(FCGI_LIB)

tigerfoot Jun 21, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

There's no reference in code to SVN_FLAGS and we loose GIT_FLAGS (obsolete Debian patch)
Also if PGFLAGS (which concat POSTGIS_INC an dPOSTGIS_LIBS) it should be removed everywhere.
same should be done for XMLFLAGS FCGIFLAGS ?

jmckenna Jun 24, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

@tigerfoot can you create a pull request with these changes?
@rm -rf tinyows.dSYM

flex:
Expand Down
4 changes: 3 additions & 1 deletion demo/install.sh.in
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ PGUSER=postgres
SHP2PGSQL=@SHP2PGSQL@
DB=tinyows_demo

if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
if [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
Expand Down
2 changes: 2 additions & 0 deletions src/mapfile/mapfile.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1588,12 +1588,14 @@ static void end_layer()
buffer_add_str(map_l->storage->schema, "public");
if (!map_is_dump) map_l->retrievable=map_l->writable = false;

map_l->name_prefix = buffer_init();
buffer_copy(map_l->name_prefix, map_l->name);
if (map_l->ns_prefix->use) {
buffer_add_head(map_l->name_prefix, ':');
buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
}

map_l->name_no_uri = buffer_init();
buffer_copy(map_l->name_no_uri, map_l->name);
if (map_l->ns_uri->use) {
buffer_add_head(map_l->name, ':');
Expand Down
4 changes: 3 additions & 1 deletion src/mapfile/mapfile.l
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,15 @@ static void end_layer()
if (!map_l->storage->schema->use)
buffer_add_str(map_l->storage->schema, "public");
if (!map_is_dump) map_l->retrievable=map_l->writable = false;


map_l->name_prefix = buffer_init();
buffer_copy(map_l->name_prefix, map_l->name);
if (map_l->ns_prefix->use) {
buffer_add_head(map_l->name_prefix, ':');
buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
}

map_l->name_no_uri = buffer_init();
buffer_copy(map_l->name_no_uri, map_l->name);
if (map_l->ns_uri->use) {
buffer_add_head(map_l->name, ':');
Expand Down
Back | FazBrowse Home | New Git URL