From 03acdb1ab8db620eabe1b0bae06db8d86e4f4aa7 Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Wed, 14 Dec 2011 10:44:58 +0000
Subject: [PATCH] fix errors in documentation and comment scripts preveningt
 comments install from installing cleanly

git-svn-id: http://svn.osgeo.org/postgis/trunk@8403 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/reference_raster.xml        | 82 +++++++++++++++++++--------------
 doc/xsl/raster_comments.sql.xsl |  4 +-
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 3b8ae2b75..8600dcae6 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -249,7 +249,7 @@ VALUES (1,
 	  <refsynopsisdiv>
 		<funcsynopsis>
 		  <funcprototype>
-			<funcdef>boolean <function>AddRasterContraints</function></funcdef>
+			<funcdef>boolean <function>AddRasterConstraints</function></funcdef>
 			
 			<paramdef><type>name </type>
 			<parameter>rasttable</parameter></paramdef>
@@ -277,10 +277,20 @@ VALUES (1,
 			
 			<paramdef><type>boolean </type>
 			<parameter>regular_blocking</parameter></paramdef>
+			
+				<paramdef><type>boolean </type>
+			<parameter choice='opt'>num_bands=true</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>pixel_types=true</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>nodata_values=true</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>extent=true</parameter></paramdef>
 		  </funcprototype>
 
 		  <funcprototype>
-			<funcdef>boolean <function>AddRasterContraints</function></funcdef>
+			<funcdef>boolean <function>AddRasterConstraints</function></funcdef>
 			<paramdef><type>name </type>
 			<parameter>rastschema</parameter></paramdef>
 
@@ -292,7 +302,7 @@ VALUES (1,
 		  </funcprototype>
 		  
 		  <funcprototype>
-			<funcdef>boolean <function>AddRasterContraints</function></funcdef>
+			<funcdef>boolean <function>AddRasterConstraints</function></funcdef>
 			
 			<paramdef><type>name </type>
 			<parameter>rastschema</parameter></paramdef>
@@ -399,42 +409,45 @@ SELECT srid, scale_x, scale_y, blocksize_x, blocksize_y, num_bands, pixel_types,
 		<funcsynopsis>
 		  <funcprototype>
 			<funcdef>boolean <function>DropRasterConstraints</function></funcdef>
+			<paramdef><type>name </type>
+			<parameter>rasttable</parameter></paramdef>
 
-			<paramdef><type>varchar </type>
-			<parameter>table_name</parameter></paramdef>
-
-			<paramdef><type>varchar </type>
-			<parameter>column_name</parameter></paramdef>
-		  </funcprototype>
-
-		  <funcprototype>
-			<funcdef>text <function>DropRasterColumn</function></funcdef>
+			<paramdef><type>name </type>
+			<parameter>rastcolumn</parameter></paramdef>
 
-			<paramdef><type>varchar </type>
-			<parameter>schema_name</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter>srid</parameter></paramdef>
 
-			<paramdef><type>varchar </type>
-			<parameter>table_name</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter>scale_x</parameter></paramdef>
 
-			<paramdef><type>varchar </type>
-			<parameter>column_name</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter>scale_y</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter>blocksize_x</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter>blocksize_y</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter>same_alignment</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter>regular_blocking</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>num_bands=true</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>pixel_types=true</parameter></paramdef>
+			
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>nodata_values=true</parameter></paramdef>
+			<paramdef><type>boolean </type>
+			<parameter choice='opt'>extent=true</parameter></paramdef>
 		  </funcprototype>
 
-		  <funcprototype>
-			<funcdef>text <function>DropRasterColumn</function></funcdef>
-
-			<paramdef><type>varchar </type>
-			<parameter>catalog_name</parameter></paramdef>
-
-			<paramdef><type>varchar </type>
-			<parameter>schema_name</parameter></paramdef>
-
-			<paramdef><type>varchar </type>
-			<parameter>table_name</parameter></paramdef>
-
-			<paramdef><type>varchar </type>
-			<parameter>column_name</parameter></paramdef>
-		  </funcprototype>
+		
 		</funcsynopsis>
 	  </refsynopsisdiv>
 
@@ -6265,8 +6278,9 @@ UPDATE wind
 				  <funcprototype>
 					<funcdef>geometry <function>ST_Union</function></funcdef>
 					<paramdef><type>raster set</type> <parameter>rast</parameter></paramdef>
-					<paramdef><type>text</type> <parameter>p_expression</parameter></paramdef>
 					<paramdef><type>integer</type> <parameter>band_num</parameter></paramdef>
+					<paramdef><type>text</type> <parameter>p_expression</parameter></paramdef>
+					
 				  </funcprototype>
 				</funcsynopsis>
 			</refsynopsisdiv>
diff --git a/doc/xsl/raster_comments.sql.xsl b/doc/xsl/raster_comments.sql.xsl
index 264833c88..3e50c63f7 100644
--- a/doc/xsl/raster_comments.sql.xsl
+++ b/doc/xsl/raster_comments.sql.xsl
@@ -35,8 +35,8 @@
 	If its input is a geometry set - we know it is an aggregate function rather than a regular function.
 	Do not output OUT params since they define output rather than act as input and do not put a comma after argument just before an OUT parameter -->
 		<xsl:for-each select="refsynopsisdiv/funcsynopsis/funcprototype">
-COMMENT ON <xsl:choose><xsl:when test="contains(paramdef/type,'geometry set')">AGGREGATE</xsl:when><xsl:otherwise>FUNCTION</xsl:otherwise></xsl:choose><xsl:text> </xsl:text> <xsl:value-of select="funcdef/function" />(<xsl:for-each select="paramdef"><xsl:choose><xsl:when test="count(parameter) &gt; 0"> 
-<xsl:choose><xsl:when test="contains(parameter,'OUT')"></xsl:when><xsl:when test="contains(type,'geometry set')">geometry</xsl:when><xsl:otherwise><xsl:value-of select="type" /></xsl:otherwise></xsl:choose><xsl:if test="position()&lt;last() and not(contains(parameter,'OUT')) and not(contains(following-sibling::paramdef[1],'OUT'))"><xsl:text>, </xsl:text></xsl:if></xsl:when>
+COMMENT ON <xsl:choose><xsl:when test="contains(paramdef/type,'geometry set') or contains(paramdef/type,'raster set')">AGGREGATE</xsl:when><xsl:otherwise>FUNCTION</xsl:otherwise></xsl:choose><xsl:text> </xsl:text> <xsl:value-of select="funcdef/function" />(<xsl:for-each select="paramdef"><xsl:choose><xsl:when test="count(parameter) &gt; 0"> 
+<xsl:choose><xsl:when test="contains(parameter,'OUT')"></xsl:when><xsl:when test="contains(type,'geometry set')">geometry</xsl:when><xsl:when test="contains(type,'raster set')">raster</xsl:when><xsl:otherwise><xsl:value-of select="type" /></xsl:otherwise></xsl:choose><xsl:if test="position()&lt;last() and not(contains(parameter,'OUT')) and not(contains(following-sibling::paramdef[1],'OUT'))"><xsl:text>, </xsl:text></xsl:if></xsl:when>
 </xsl:choose></xsl:for-each>) IS '<xsl:call-template name="listparams"><xsl:with-param name="func" select="." /></xsl:call-template> <xsl:value-of select='$comment' />';
 			</xsl:for-each>
 		</xsl:for-each>
-- 
2.40.0