From da579fae9675c0a9bd8974050cb1e2a3d333d2b7 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 25 Apr 2012 20:42:23 +0200
Subject: [PATCH] [#1357] a few suggested edits to the tutorial

---
 jOOQ-website/download.php |  3 ++-
 jOOQ-website/frame.php    |  1 +
 jOOQ-website/tutorial.php | 23 ++++++++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/jOOQ-website/download.php b/jOOQ-website/download.php
index 46f6d46557..3f0aa49f98 100644
--- a/jOOQ-website/download.php
+++ b/jOOQ-website/download.php
@@ -8,6 +8,7 @@ function getActiveMenu() {
 }
 function printContent() {
 	global $root;
+	global $version;
 ?>
 
 <h2>Download</h2>
@@ -42,7 +43,7 @@ The jOOQ roadmap plans for:
 Find release notes for currently maintained branches here:
 </p>
 <ul>
-  <li><a href="notes.php" title="Release notes for the latest jOOQ version">The latest version</a></li>
+  <li><a href="notes.php?version=<?=preg_replace('/(\\d+\\.\\d+)\\.\\d+/', '$1', $version)?>" title="Release notes for the latest jOOQ version">The latest version</a></li>
   <li><a href="notes.php?version=2.2" title="Release notes for the 2.2 jOOQ branch">The 2.2 branch</a></li>
   <li><a href="notes.php?version=2.1" title="Release notes for the 2.1 jOOQ branch">The 2.1 branch</a></li>
   <li><a href="notes.php?version=2.0" title="Release notes for the 2.0 jOOQ branch">The 2.0 branch</a></li>
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index 1642adf333..e27171415a 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -1,5 +1,6 @@
 <?php
   $root = "";
+  $version = "2.2.2";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
diff --git a/jOOQ-website/tutorial.php b/jOOQ-website/tutorial.php
index 99f370e690..1be01ce4e9 100644
--- a/jOOQ-website/tutorial.php
+++ b/jOOQ-website/tutorial.php
@@ -7,6 +7,8 @@ function getActiveMenu() {
     return "learn";
 }
 function printContent() {
+    global $root;
+    global $version;
 ?>
 <h2>Introduction</h2>
 <p>
@@ -36,7 +38,7 @@ Alternatively, you can create a Maven dependency:
   &lt;groupId&gt;org.jooq&lt;/groupId&gt;
   &lt;!-- artefacts are jooq, jooq-meta, jooq-codegen --&gt;
   &lt;artifactId&gt;jooq&lt;/artifactId&gt;
-  &lt;version&gt;2.0.0&lt;/version&gt;
+  &lt;version&gt;<?=$version?>&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 <p>
@@ -99,7 +101,8 @@ that looks like this:
            org.util.[database].[database]Database -->
       &lt;name>org.jooq.util.mysql.MySQLDatabase&lt;/name>
 
-      &lt;!-- The database schema (or owner, user, database name) to be generated -->
+      &lt;!-- The database schema (or in the absence of schema support, in your RDBMS this
+           can be the owner, user, database name) to be generated -->
       &lt;inputSchema>guestbook&lt;/inputSchema>
 
       &lt;!-- All elements that are generated from your schema (several Java regular expressions, separated by comma)
@@ -147,14 +150,14 @@ Once you have the JAR files and guestbook.xml in your temp directory, type this
 (use colons instead of semi-colons on UNIX/Linux systems):
 </p>
 <pre>
-java -classpath jooq-2.0.0.jar;jooq-meta-2.0.0.jar;jooq-codegen-2.0.0.jar;mysql-connector-java-5.1.18-bin.jar;. org.jooq.util.GenerationTool /guestbook.xml
+java -classpath jooq-<?=$version?>.jar;jooq-meta-<?=$version?>.jar;jooq-codegen-<?=$version?>.jar;mysql-connector-java-5.1.18-bin.jar;. org.jooq.util.GenerationTool /guestbook.xml
 </pre>
 <p>
 Note the prefix slash before guestbook.properies.
 Even though it's in our working directory, we need to prepend a slash, as it is
 loaded from the classpath.
 Replace the filenames with your filenames.
-In this example, jOOQ 2.0.0 is being used.
+In this example, jOOQ <?=$version?> is being used.
 If everything has worked, you should see this in your console output:
 </p>
 <pre>
@@ -247,7 +250,10 @@ public class Main {
             e.printStackTrace();
         } finally {
             if (conn != null) {
-                conn.close();
+                try {
+                    conn.close();
+                } catch (SQLException ignore) {
+                }
             }
         }
     }
@@ -331,7 +337,7 @@ public class Main {
             conn = DriverManager.getConnection(url, userName, password);
 
             GuestbookFactory create = new GuestbookFactory(conn);
-            Result result = create.select().from(POSTS).fetch();
+            Result&lt;?&gt; result = create.select().from(POSTS).fetch();
 
             for (Record r : result) {
                 Long id = r.getValue(POSTS.ID);
@@ -344,7 +350,10 @@ public class Main {
             e.printStackTrace();
         } finally {
             if (conn != null) {
-                conn.close();
+                try {
+                    conn.close();
+                } catch (SQLException ignore) {
+                }
             }
         }
     }
