pgsphere_1.1.4.916

Author: Markus Nullmeier

Makefile

@@ -8,23 +8,44 @@ MODULE_big = pg_sphere
 OBJS       = sscan.o sparse.o sbuffer.o vector3d.o point.o \
              euler.o circle.o line.o ellipse.o polygon.o \
              path.o box.o output.o gq_cache.o gist.o key.o \
-             gnomo.o
+             gnomo.o healpix.o moc.o process_moc.o
 
 EXTENSION   = pg_sphere
-DATA_built  = pg_sphere--1.0.sql
+RELEASE_SQL = $(EXTENSION)--1.1.5beta4gavo.sql
+DATA_built  = $(RELEASE_SQL) \
+			  pg_sphere--unpackaged--1.1.5beta0gavo.sql \
+			  pg_sphere--1.0--1.0_gavo.sql \
+			  pg_sphere--1.0_gavo--1.1.5beta0gavo.sql \
+			  pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql \
+			  pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql
+
 DOCS        = README.pg_sphere COPYRIGHT.pg_sphere
 REGRESS     = init tables points euler circle line ellipse poly path box index \
-              contains_ops contains_ops_compat bounding_box_gist gnomo
+			  contains_ops contains_ops_compat bounding_box_gist gnomo healpix \
+			  moc
+
+REGRESS_9_5 = index_9.5 # experimental for spoint3
+
+TESTS       = init_test tables points euler circle line ellipse poly path box index \
+			  contains_ops contains_ops_compat bounding_box_gist gnomo healpix \
+			  moc
 
-EXTRA_CLEAN = pg_sphere--1.0.sql $(PGS_SQL) 
+SHLIB_LINK += -lchealpix
+# no support for CXXFLAGS in PGXS
+CXXFLAGS = -Wall -Wpointer-arith -Wendif-labels \
+		-Wmissing-format-attribute -Wformat-security -g -O0 -fpic
 
-CRUSH_TESTS  = init_extended circle_extended 
+EXTRA_CLEAN = $(PGS_SQL) pg_sphere.test.sql
+
+CRUSH_TESTS = init_extended circle_extended 
 
 # order of sql files is important
-PGS_SQL    =  pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
+PGS_SQL     = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
    pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
    pgs_box.sql pgs_contains_ops.sql pgs_contains_ops_compat.sql \
-   pgs_gist.sql gnomo.sql \
+   pgs_gist.sql gnomo.sql pgs_gist_pointkey.sql \
+   healpix.sql pgs_gist_spoint3.sql pgs_moc_type.sql pgs_moc_compat.sql
+PGS_SQL_9_5 = pgs_9.5.sql # experimental for spoint3
 
 ifdef USE_PGXS
   ifndef PG_CONFIG
@@ -40,11 +61,122 @@ else
   include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+# link a second time as PGXS does not allow to change the linker
+PGS_LINKER = g++ $(CXXFLAGS) $(filter-out $(CC) $(CFLAGS), $(LINK.shared))
+pgs_link:  $(shlib) $(OBJS) | $(SHLIB_PREREQS)
+	$(PGS_LINKER) -o $(shlib) $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)
+
+# experimental for spoint3
+pg_version := $(word 2,$(shell $(PG_CONFIG) --version))
+pg_version_9_5_plus = $(if $(filter-out 9.1% 9.2% 9.3% 9.4%,$(pg_version)),y,n)
+#
+
+## the use of spoint 3 is too experimental and preliminary:
+#ifeq ($(pg_version_9_5_plus),y)
+#	REGRESS += $(REGRESS_9_5)
+#	TESTS   += $(REGRESS_9_5)
+#	PGS_SQL += $(PGS_SQL_9_5)
+#endif
+
 crushtest: REGRESS += $(CRUSH_TESTS)
 crushtest: installcheck
 
-pg_sphere--1.0.sql: $(addsuffix .in, $(PGS_SQL))
-	cat $^ > $@
+
+ifeq ($(pg_version_9_5_plus),y)
+        PGS_TMP_DIR = --temp-instance=tmp_check
+else
+        PGS_TMP_DIR = --temp-install=tmp_check --top-builddir=test_top_build_dir
+endif
+
+test: pg_sphere.test.sql sql/init_test.sql
+	$(pg_regress_installcheck) $(PGS_TMP_DIR) $(REGRESS_OPTS) $(TESTS)
+
+pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
+	tail -n+3 $< | sed 's,MODULE_PATHNAME,$(realpath $(shlib)),g' >$@
+
+
+$(RELEASE_SQL): $(addsuffix .in, $(RELEASE_SQL) $(PGS_SQL)) pgs_link
+	cat $(filter-out pgs_link, $^) > $@
+
+# for "create extension from unpacked*":
+
+UPGRADE_UNP_COMMON =  pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
+	pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
+	pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql \
+	pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
+
+AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql \
+	gnomo.sql
+# for vanilla 1.1.1 users
+AUGMENT_UNP_111 = $(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql
+
+# for 1.1.2+ users: 'from unpacked_1.1.2plus'
+AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON)
+UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
+
+# for "alter extension":
+
+# TODO: add dynamic pl/pgsql to do perform an additional
+#    "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
+# if required.
+#
+# default 1.0 (after 2016-02-07) -> 1.1.5
+UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
+# '1.1.5_from_2015-08-31'
+AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
+UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
+						pgs_gist_contains_ops.sql
+
+# vanilla 'create from unpackaged' must assume 1.1.1
+# ...
+
+# create "create extension from unpacked*" files
+
+# create "alter extension" files
+
+
+ifeq ($(pg_version_9_5_plus),y)
+# 1.1.1.5 -> 1.1.5.1 for Postgres 9.5+ features
+else
+endif
+
+# local stuff follows here, next will be "beta2"
+
+AUGMENT_GAVO_111 = $(AUGMENT_UNP_111) healpix.sql # for vanilla 1.1.1 users
+UPGRADE_GAVO_111 = $(UPGRADE_UNP_COMMON)
+
+# add new Healpix functions and experimental spoint3
+AUGMENT_FROM_GAVO = healpix.sql pgs_gist_spoint3.sql
+
+AUGMENT_UNP_115B0G = $(AUGMENT_UNP_111) $(AUGMENT_FROM_GAVO)
+UPGRADE_UNP_115B0G = $(UPGRADE_UNP_COMMON)
+
+AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO)
+UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
+
+# test installation 0
+pg_sphere--unpackaged--1.1.5beta0gavo.sql: $(addsuffix .in, \
+		$(AUGMENT_GAVO_111) \
+		$(addprefix upgrade_scripts/, $(UPGRADE_GAVO_111)))
+	cat upgrade_scripts/$@.in $^ > $@
+
+# (The upgrade of test installation A has been completed.)
+
+# test installation B (generic)
+pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names
+	cat upgrade_scripts/$@.in > $@
+pg_sphere--1.0_gavo--1.1.5beta0gavo.sql: $(addsuffix .in, \
+		$(AUGMENT_1_0_115B0G) \
+		$(addprefix upgrade_scripts/, $(UPGRADE_1_0_115B0G)))
+	cat upgrade_scripts/$@.in $^ > $@
+
+pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql: pgs_moc_type.sql.in
+	cat upgrade_scripts/$@.in $^ > $@
+
+pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql: pgs_moc_compat.sql.in
+	cat upgrade_scripts/$@.in $^ > $@
+
+# end of local stuff
 
 sscan.o : sparse.c
 

README.GAVO

@@ -0,0 +1,21 @@
+******* NEW GAVO PGSPHERE BETA RELEASE, PLEASE READ CAREFULLY. *******
+
+You must apply one of the follwing upgrade commands to all of
+your PostgreSQL databases using PgSphere to make this release of
+PgSphere work properly! Let us assume your database is named
+'gavo', then:
+
+-- first, run the following shell command
+                psql gavo -c '\dx'|grep pg_sphere
+
+   -- if this outputs a line starting with ' pg_sphere',
+      then please run the command
+            psql gavo -c "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5beta4gavo';"
+      to upgrade your database to this latest version of PgSphere.
+
+   -- else, if nothing is output from the first command, then
+      you apparently have a somewhat older first-time installation of
+      PgSphere within your database. In this case, please run the command
+            psql gavo -c "CREATE EXTENSION pg_sphere FROM unpackaged;"
+      to upgrade your database to this latest version of PgSphere.
+

doc/Makefile

@@ -47,9 +47,9 @@ html  : pg_sphere.xml $(ALLSGML) pg_sphere.dsl
 	@rm -rf html
 	mkdir html
 	mkdir html/img
-	cp img/*.jpg html/img
+	cp img/*.jpg img/*.png html/img
 	cp pg_sphere.css html
-	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d pg_sphere.dsl -i html  -t sgml $(XMLDCL) $<
+	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -b UTF-8 -d pg_sphere.dsl -i html  -t sgml $(XMLDCL) $<
 	mv *.html html
 
 pg_sphere.tex : pg_sphere.xml $(ALLSGML) pg_sphere.dsl

doc/img/Makefile

@@ -11,5 +11,8 @@ eps : $(EPS)
 %.eps: %.jpg
 	$(CONVERT) $< eps:$@
 
+%.eps: %.png
+	$(CONVERT) $< eps:$@
+
 clean :
 	rm -f $(EPS)

doc/img/logo.jpg

@@ -161,6 +161,10 @@
                 queries using binary operators returning
                 <emphasis>true</emphasis> or <emphasis>false</emphasis>:
             </para>
+            <para>
+                <screen>
+                </screen>
+            </para>
             <table frame="all" rowsep="1" colsep="1">
               <title>Contain and overlap operators</title>
               <tgroup cols="2" colsep="1" rowsep="1">

doc/img/logo.png

@@ -194,6 +194,7 @@ Stylesheet//EN" CDATA DSSSL>
 (define %html-header-tags%
   (list 
     (list "META" '("NAME" "creation") (list "CONTENT" (time->string (time) #t)))
+    '("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=utf-8"))
   )
 )
 
@@ -258,7 +259,7 @@ Stylesheet//EN" CDATA DSSSL>
 
 (define %graphic-extensions%
   ;; graphic extensions allowed
-  '("jpg" "jpeg"))
+  '("jpg" "jpeg" "png"))
 
 (define %graphic-default-extension% 
   "jpg")

doc/img/logo.xcf

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
@@ -22,7 +22,7 @@
 <!ENTITY graph1006 "img/spath.jpg">
 <!ENTITY graph1007 "img/spoly.jpg">
 <!ENTITY graph1008 "img/sbox.jpg">
-<!ENTITY graph1009 "img/logo.jpg">
+<!ENTITY graph1009 "img/logo.png">
 
 ]>
 
@@ -39,7 +39,7 @@
             <para>
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="&graph1009;" width="225px" format="JPEG"/>
+                  <imagedata fileref="&graph1009;" width="168px" format="PNG"/>
                 </imageobject>
               </mediaobject>
             </para>