Commit graph

507 commits

Author SHA1 Message Date
Paul Ramsey 29e2d6a299 Change @rm to rm for visibility
git-svn-id: http://svn.osgeo.org/postgis/trunk@9523 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-21 21:36:59 +00:00
Paul Ramsey cf8753bd36 Make distclean should remove all the Makefile's generated by ./configure
git-svn-id: http://svn.osgeo.org/postgis/trunk@9522 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-21 20:32:29 +00:00
Sandro Santilli e3be619046 Drop .cvsignore files
git-svn-id: http://svn.osgeo.org/postgis/trunk@9429 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-08 10:36:15 +00:00
Paul Ramsey cb9d0d586a I'm not sure this "fix" was actually a fix so I'm removing it.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9410 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-06 16:19:25 +00:00
Paul Ramsey 13946af983 Rename LOADER_OBJS to the more direct SHPLIB_OBJS
git-svn-id: http://svn.osgeo.org/postgis/trunk@9403 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-05 23:09:24 +00:00
Paul Ramsey 5fc8d7ffc4 Add static link directive to libtool (#1644) allows build on Debian Wheezy
git-svn-id: http://svn.osgeo.org/postgis/trunk@9401 b70326c6-7e19-0410-871a-916f4a2858ee
2012-03-05 22:51:52 +00:00
Paul Ramsey 72f0ad5143 Minor update to comments.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9302 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-25 20:35:26 +00:00
Paul Ramsey 914623e6b1 Simplify table/schema copying, hopefully fix windows.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9301 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-25 20:30:42 +00:00
Paul Ramsey 9f5a1a94d0 Fix up the revision info in the usage lines
git-svn-id: http://svn.osgeo.org/postgis/trunk@9291 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-24 22:41:09 +00:00
Sandro Santilli d1057b7c09 Print SRID in decimal form, not hex (#1593)
git-svn-id: http://svn.osgeo.org/postgis/trunk@9245 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-21 11:07:44 +00:00
Paul Ramsey 64b48284cb shp2pgsql: a switch to drop M from 4d imports (#900)
git-svn-id: http://svn.osgeo.org/postgis/trunk@9204 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-15 21:37:41 +00:00
Mark Cave-Ayland bb161f08e2 Fix a couple of compiler warnings in shp2pgsql-gui caused by uninitialised variables.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9064 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-07 13:12:31 +00:00
Mark Cave-Ayland 3e3a9833d2 Change encoding reference URL to that used for libiconv rather than PostgreSQL since that's what we are using to do the encoding conversion (as per #1303).
git-svn-id: http://svn.osgeo.org/postgis/trunk@9033 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-05 00:30:36 +00:00
Mark Cave-Ayland 3059b1a9e8 Fix for #1540: Fix segfault in shp2pgsql-gui when no port is specified. Prevent dereferencing a NULL pointer if the string is empty.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9032 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-05 00:30:28 +00:00
Mark Cave-Ayland 3fa2e70ebe Fix an issue in the shapefile GUI caused by saving the original shapefile name before processing.
This was a bug caused by having two separate passes during export; we were saving the original
export shapefile name during the first loop, and so when we came to free() the temporary name
at the end of export it would only free the shapefile name from the last iteration, and do it
multiple times causing random crashes.

git-svn-id: http://svn.osgeo.org/postgis/trunk@9030 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-04 02:36:44 +00:00
Mark Cave-Ayland 9200acf3f2 Alter the shapefile GUI so that multiple shapefiles can be selected in the import file chooser.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9028 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-04 01:17:33 +00:00
Mark Cave-Ayland b193b38c7a Add GUI support for the shp2pgsql -S (simple geometries) switch. This closes #660.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9027 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-04 00:39:38 +00:00
Mark Cave-Ayland 92e6ba3da9 Update shapefile GUI "About" text and window title to reflect that it now handles export as well as import.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9026 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-04 00:39:31 +00:00
Mark Cave-Ayland 80f9c1e00c Add shapefile dumper (table export) to the shp2pgsql GUI. This closes ticket #1480.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9025 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-04 00:39:24 +00:00
Mark Cave-Ayland 4d4cd0ce7b Fix pgsql2shp crash when dumping a table without a geo column.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9021 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-03 21:04:08 +00:00
Mark Cave-Ayland f2fff943f5 Fix construction of pgsql2shp's main retrieval query in ShpDumperOpenTable().
This fixes a regression which caused pgsql2shp to generate an incorrect SQL query
for tables without any geo columns.

git-svn-id: http://svn.osgeo.org/postgis/trunk@9020 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-03 21:04:01 +00:00
Mark Cave-Ayland f4262f4d48 Move initialisation of pgsql2shp state endian flag to the same location all the other initialisers.
git-svn-id: http://svn.osgeo.org/postgis/trunk@9019 b70326c6-7e19-0410-871a-916f4a2858ee
2012-02-03 21:03:54 +00:00
Paul Ramsey 402f405698 Remove some compile warnings.
git-svn-id: http://svn.osgeo.org/postgis/trunk@8984 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-31 20:46:18 +00:00
Paul Ramsey 4b4fb19341 Pgsql2shp: Dumping: XWKB structure does not match expected size! (#1479)
git-svn-id: http://svn.osgeo.org/postgis/trunk@8972 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-31 05:50:08 +00:00
Paul Ramsey 9dd9cd1b73 (#393) shp2pgsql returns "fseek(-xxx) failed on DBF file." for large (>2GB) DBF files
git-svn-id: http://svn.osgeo.org/postgis/trunk@8967 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-30 02:47:34 +00:00
Paul Ramsey 8de1fffcf0 Revert accidental inclusion of shape file size patch in curve patch
git-svn-id: http://svn.osgeo.org/postgis/trunk@8946 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-27 18:57:42 +00:00
Paul Ramsey 723625e4ab #920 (ST_LineToCurve generating invalid CURVEPOLYGON)
git-svn-id: http://svn.osgeo.org/postgis/trunk@8945 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-27 18:54:37 +00:00
Paul Ramsey ba3f5a08d2 Clean up and exit when shp file missing
git-svn-id: http://svn.osgeo.org/postgis/trunk@8936 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-26 17:23:31 +00:00
Paul Ramsey 3bc1641fb3 Update shplib to the latest release (1.3.0b3) and stitch in our special date and logical handling. (#393)
git-svn-id: http://svn.osgeo.org/postgis/trunk@8919 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-24 21:57:06 +00:00
Sandro Santilli 3fdb12b758 The official unknown SRID is 0, not -1
git-svn-id: http://svn.osgeo.org/postgis/trunk@8843 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-16 14:33:28 +00:00
Mark Cave-Ayland 7dfdea09b5 Display "Creating Index..." text within the progress dialog rather than within the shp2pgsql-gui log window.
This should make it more obvious to users that something is still happening in the case that
they are building on a index on larger shapefiles which can often take quite some time.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8814 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-14 13:10:27 +00:00
Mark Cave-Ayland 2ca77b8a4a Switch NLS build to use the in-built ENABLE_NLS define rather than USE_NLS.
The key concept here is that we eliminate all logic from the Makefile and put
it in the build system (e.g. configure). By having the logic at this higher
layer, we make it much easier to transition to another build system in future
such as CMake.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8808 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-14 00:49:14 +00:00
Mark Cave-Ayland 021bdc94b9 Rename geometry column header in shp2pgsql-gui to "geo column" to reduce its visible width based upon feedback from Regina.
git-svn-id: http://svn.osgeo.org/postgis/trunk@8800 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-13 15:54:15 +00:00
Mark Cave-Ayland 580aa5071b If the database settings are incorrect when attempting an import, display the connection settings
dialog.

Also a minor bugfix: if the dialog is cancelled by closing the window, ensure that any unset
fields are reset back to blank.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8746 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-10 12:28:46 +00:00
Mark Cave-Ayland cb79aa5219 Switch shp2pgsql-gui to COPY mode by default for increased speed; the user doesn't really care
what form the output takes when it's being loaded into the database directly rather than via
a file.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8745 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-10 12:28:36 +00:00
Mark Cave-Ayland f92b2eed98 Raise an error within shp2pgsql-gui if the user clicks "Import" without having added any files to the list.
git-svn-id: http://svn.osgeo.org/postgis/trunk@8744 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-10 12:28:30 +00:00
Mark Cave-Ayland 24752a4a2c Alter shp2pgsql-gui so that we use one connection per file; this makes tracking error state
on the server considerably easier, since upon abort we just disconnect from the server rather
than trying to figure out what state we are in and handle it appropriately.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8743 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-10 12:28:23 +00:00
Mark Cave-Ayland cc6d355f15 Allow manual resizing of the filename column within shp2pgsql-gui if required, as per request from Regina.
git-svn-id: http://svn.osgeo.org/postgis/trunk@8724 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-09 17:55:12 +00:00
Sandro Santilli b7104b77c1 Fix memory leak in shapefile loader (#1436)
git-svn-id: http://svn.osgeo.org/postgis/trunk@8709 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-09 10:34:34 +00:00
Mark Cave-Ayland 4daaecbc8e Commit reworked version of shp2pgsql-gui to the repository.
As per my email to postgis-devel, this commit contains a major reworking
of the inner core, with many bugfixes. The primary changes are:

- Elimination of FILENODE, since we can just use pointers to
  SHPLOADERCONFIG

- Abstract the configuration structures from the GUI interface

- Restrict entry to either drag/drop or file chooser

- Instead of constantly destroying/creating new dialogs, create
  them once and then just show/hide them (in particular this
  enables the file chooser to open at its previous directory)

- Add separate connection details and progress bar dialogs

- Rework both internals and GUI in preparation for adding dumper
  support

Note that the dumper integration changes are being worked on separately
and will be included in a later commit.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8706 b70326c6-7e19-0410-871a-916f4a2858ee
2012-01-08 23:32:05 +00:00
Sandro Santilli 47bbf5f955 Drop -r switch, allow requesting reprojection with -s [#994]
git-svn-id: http://svn.osgeo.org/postgis/trunk@8472 b70326c6-7e19-0410-871a-916f4a2858ee
2011-12-19 19:06:31 +00:00
Sandro Santilli 72fb032864 Fix 'clean' rule under loader to drop stuff under .libs
git-svn-id: http://svn.osgeo.org/postgis/trunk@8191 b70326c6-7e19-0410-871a-916f4a2858ee
2011-11-20 20:51:27 +00:00
Paul Ramsey 07f2341e38 Ensure calls to lwgeom->type use type of uint8_t
git-svn-id: http://svn.osgeo.org/postgis/trunk@8027 b70326c6-7e19-0410-871a-916f4a2858ee
2011-10-28 17:01:02 +00:00
Sandro Santilli 39d7914c30 Define SHELL (used by LIBTOOL and INSTALL) hopefully helps bug #1218
git-svn-id: http://svn.osgeo.org/postgis/trunk@7921 b70326c6-7e19-0410-871a-916f4a2858ee
2011-09-29 19:43:00 +00:00
Sandro Santilli 809ae790e4 Move LWDEBUG macros in a new lwgeom_log.h header file (see #1220)
Update all implementation files accordingly.
Fix some misuses out of liblwgeom.
Add missing copyright notices in a few files.

git-svn-id: http://svn.osgeo.org/postgis/trunk@7907 b70326c6-7e19-0410-871a-916f4a2858ee
2011-09-28 10:05:36 +00:00
Paul Ramsey 54484e1f7a shp2pgsql gui wrong use of create spatial index (#1091)
git-svn-id: http://svn.osgeo.org/postgis/trunk@7862 b70326c6-7e19-0410-871a-916f4a2858ee
2011-09-17 19:59:41 +00:00
Sandro Santilli d7bf7ec260 Dynamically link loader and dumper to liblwgeom [RT-SIGTA]
This reduces each of the 3 installed executable sizes by 547 Kb.

git-svn-id: http://svn.osgeo.org/postgis/trunk@7793 b70326c6-7e19-0410-871a-916f4a2858ee
2011-08-29 15:23:35 +00:00
Sandro Santilli b131652f6c Drop (u)int32 and uchar in favor of C99 standard int types [RT-SIGTA]
This commit drops PostgreSQL references in liblwgeom.h (C_H define)
and hopefully reduces the noise generated by custom symbols.

git-svn-id: http://svn.osgeo.org/postgis/trunk@7761 b70326c6-7e19-0410-871a-916f4a2858ee
2011-08-19 09:34:58 +00:00
Sandro Santilli 3713c150e0 Don't use problematic int types for no reason...
git-svn-id: http://svn.osgeo.org/postgis/trunk@7760 b70326c6-7e19-0410-871a-916f4a2858ee
2011-08-19 09:30:21 +00:00
Sandro Santilli f3db965181 Second attempt at libtool usage. Seems better to me now.
PostGIS clients still all use the static version of the library.
Libraries are not installed by default.
[RT-SIGTA]

git-svn-id: http://svn.osgeo.org/postgis/trunk@7744 b70326c6-7e19-0410-871a-916f4a2858ee
2011-08-13 10:06:07 +00:00