[mapserver-commits] r13218 - branches/branch-6-0/docs/en/mapfile trunk/docs/en/mapfile

[svn at osgeo.org]

Author: havatv
Date: 2012-03-08 10:29:50 -0800 (Thu, 08 Mar 2012)
New Revision: 13218

Modified:
   branches/branch-6-0/docs/en/mapfile/join.txt
   trunk/docs/en/mapfile/join.txt
Log:
Updated the join document - csv example (#3843)

Modified: branches/branch-6-0/docs/en/mapfile/join.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/join.txt	2012-03-08 17:52:31 UTC (rev 13217)
+++ branches/branch-6-0/docs/en/mapfile/join.txt	2012-03-08 18:29:50 UTC (rev 13218)
@@ -287,7 +287,8 @@
           CONNECTIONTYPE CSV
           TABLE "../data/lookup.csv"
           FROM "ID"
-          TO "IDENT"
+          #TO "IDENT"  # see note below
+          TO "1"       # see note below
           TYPE ONE-TO-ONE
         END
       END # layer
@@ -316,7 +317,7 @@
    row. It just uses indexes (1, 2, ... n) to reference the
    columns. It's ok to leave column names as the first row since they
    likely won't match anything but they aren't used. Typically you'd
-   see something like "TO '1'" in the JOIN block. Then in the template
+   see something like TO "1" in the JOIN block. Then in the template
    you'd use [name_1], [name_2], etc...
 
 Ogrinfo
@@ -336,16 +337,26 @@
   IDENT: String (0.0)
   VAL: String (0.0)
 
-Template
---------
+Template (prov.html)
+--------------------
 
-::
+Ideally this the template should look like this::
 
+  <!-- MapServer Template -->
   <tr bgcolor="#EFEFEF">
     <td align="left">[NAME]</td>
     <td align="left">[test_VAL]</td>
   </tr>
 
+But since attribute names are not supported for CSV files (see note
+above), the following will have to be used::
+
+  <!-- MapServer Template -->
+  <tr bgcolor="#EFEFEF">
+    <td align="left">[NAME]</td>
+    <td align="left">[test_2]</td>
+  </tr>
+
 Example 4: Join from Shape dataset to MySQL
 ===========================================
 

Modified: trunk/docs/en/mapfile/join.txt
===================================================================
--- trunk/docs/en/mapfile/join.txt	2012-03-08 17:52:31 UTC (rev 13217)
+++ trunk/docs/en/mapfile/join.txt	2012-03-08 18:29:50 UTC (rev 13218)
@@ -287,7 +287,8 @@
           CONNECTIONTYPE CSV
           TABLE "../data/lookup.csv"
           FROM "ID"
-          TO "IDENT"
+          #TO "IDENT"  # see note below
+          TO "1"       # see note below
           TYPE ONE-TO-ONE
         END
       END # layer
@@ -316,7 +317,7 @@
    row. It just uses indexes (1, 2, ... n) to reference the
    columns. It's ok to leave column names as the first row since they
    likely won't match anything but they aren't used. Typically you'd
-   see something like "TO '1'" in the JOIN block. Then in the template
+   see something like TO "1" in the JOIN block. Then in the template
    you'd use [name_1], [name_2], etc...
 
 Ogrinfo
@@ -336,16 +337,26 @@
   IDENT: String (0.0)
   VAL: String (0.0)
 
-Template
---------
+Template (prov.html)
+--------------------
 
-::
+Ideally this the template should look like this::
 
+  <!-- MapServer Template -->
   <tr bgcolor="#EFEFEF">
     <td align="left">[NAME]</td>
     <td align="left">[test_VAL]</td>
   </tr>
 
+But since attribute names are not supported for CSV files (see note
+above), the following will have to be used::
+
+  <!-- MapServer Template -->
+  <tr bgcolor="#EFEFEF">
+    <td align="left">[NAME]</td>
+    <td align="left">[test_2]</td>
+  </tr>
+
 Example 4: Join from Shape dataset to MySQL
 ===========================================