documentation updates, fix blog example bad_lexical_cast error, code cleanups

Author: Koen Deforche

doc/tutorial/dbo.doc

@@ -234,8 +234,6 @@ happen within a transaction.
     user->karma = 13;
 
     dbo::ptr<User> userPtr = session.add(user);
-
-    transaction.commit();
 }
 ----
 
@@ -259,6 +257,11 @@ database. Flushing happens automatically when committing the
 transaction, or whenever needed to maintain consistency between the
 transient objects and the database copy (e.g. before doing a query).
 
+The transaction commits automatically if the transaction object goes
+out of scope. If however an exception is thrown, which unwinds the
+stack and causes the transaction to go out of scope, then the
+transaction will roll back instead.
+
 This generates the following SQL:
 
 [source,sql]
@@ -1086,8 +1089,6 @@ void run()
         userInfo->info = "great guy";
 
         session.add(userInfo);
-
-        transaction.commit();
     }
 
     {
@@ -1096,8 +1097,6 @@ void run()
         dbo::ptr<UserInfo> info = session.find<UserInfo>();
 
         std::cerr << info->user->name << " is a " << info->info << std::endl;
-
-        transaction.commit();
     }
 }
 
@@ -1182,7 +1181,11 @@ wider transaction if that is available. A transaction will in fact
 defer opening a real transaction in the database until needed, and
 thus there is no penalty for instantiating a transaction to make sure
 a unit of work is atomic, even if you are not yet sure that there will
-be actual work done.
+be actual work done. Note that there is no need (sinds Wt 3.2.1) to
+explicitly commit a transaction: a transaction will automatically
+commited when it goes out of scope, unless the transaction goes out of
+scope (and thus its destructor is called) while an exception is being
+thrown.
 
 Transactions may fail and dealing with failing transactions is an
 integral aspect of their usage. When the library detects a concurrent

examples/blog/view/BlogView.C

@@ -369,73 +369,54 @@ private:
     boost::split(parts, path, boost::is_any_of("/"));
 
     WDate lower, upper;
-    int year = boost::lexical_cast<int>(parts[0]);
+    try {
+      int year = boost::lexical_cast<int>(parts[0]);
 
-    if (parts.size() > 1) {
-      int month = boost::lexical_cast<int>(parts[1]);
+      if (parts.size() > 1) {
+	int month = boost::lexical_cast<int>(parts[1]);
 
-      if (parts.size() > 2) {
-	int day = boost::lexical_cast<int>(parts[2]);
+	if (parts.size() > 2) {
+	  int day = boost::lexical_cast<int>(parts[2]);
 
-	lower.setDate(year, month, day);
-	upper = lower.addDays(1);
+	  lower.setDate(year, month, day);
+	  upper = lower.addDays(1);
+	} else {
+	  lower.setDate(year, month, 1);
+	  upper = lower.addMonths(1);
+	}
       } else {
-	lower.setDate(year, month, 1);
-	upper = lower.addMonths(1);
+	lower.setDate(year, 1, 1);
+	upper = lower.addYears(1);
       }
-    } else {
-      lower.setDate(year, 1, 1);
-      upper = lower.addYears(1);
-    }
-
-    Posts posts = session_.find<Post>
-      ("where date >= ? "
-       "and date < ? "
-       "and (state = ? or author_id = ?)")
-      .bind(WDateTime(lower))
-      .bind(WDateTime(upper))
-      .bind(Post::Published)
-      .bind(session_.user().id());
-
-    if (parts.size() > 3) {
-      std::string title = parts[3];
-
-      for (Posts::const_iterator i = posts.begin(); i != posts.end(); ++i)
-	if ((*i)->titleToUrl() == title) {
-	  showPost(*i, PostView::Detail, parent);
-	  return;
-	}
 
+      Posts posts = session_.find<Post>
+	("where date >= ? "
+	 "and date < ? "
+	 "and (state = ? or author_id = ?)")
+	.bind(WDateTime(lower))
+	.bind(WDateTime(upper))
+	.bind(Post::Published)
+	.bind(session_.user().id());
+
+      if (parts.size() > 3) {
+	std::string title = parts[3];
+
+	for (Posts::const_iterator i = posts.begin(); i != posts.end(); ++i)
+	  if ((*i)->titleToUrl() == title) {
+	    showPost(*i, PostView::Detail, parent);
+	    return;
+	  }
+
+	showError(tr("blog-no-post"));
+      } else {
+	showPosts(posts, parent);
+      }
+    } catch (std::exception& e) {
       showError(tr("blog-no-post"));
-    } else {
-      showPosts(posts, parent);
     }
   }
 
   void showPosts(dbo::ptr<User> user) {
-    /*
-<<<<<<< HEAD:examples/blog/view/BlogView.C
-    if (user == session_.user() && user->role == User::Admin) {
-      WTemplate *authorPanel = new WTemplate(tr("blog-author-panel"), items_);
-
-      WPushButton *newPost = new WPushButton(tr("new-post"));
-      newPost->clicked().connect(this, &BlogImpl::newPost);
-
-      WContainerWidget *unpublishedPosts = new WContainerWidget();
-      showPosts(user->allPosts(Post::Unpublished), unpublishedPosts);
-
-      authorPanel->bindString("user", user->name);
-      authorPanel->bindInt("unpublished-count",
-			   user->allPosts(Post::Unpublished).size());
-      authorPanel->bindInt("published-count",
-			   user->allPosts(Post::Published).size());
-      authorPanel->bindWidget("new-post", newPost);
-      authorPanel->bindWidget("unpublished-posts", unpublishedPosts);
-    }
-
-=======
->>>>>>> bvh_blog:examples/blog/view/BlogView.C
-    */
     showPosts(user->latestPosts(), items_);
   }
 

examples/feature/dbo/tutorial1.C

@@ -76,8 +76,6 @@ void run()
     user->karma = 13;
 
     dbo::ptr<User> userPtr = session.add(user);
-
-    transaction.commit();
   }
 
   /*****
@@ -93,8 +91,6 @@ void run()
 
     dbo::ptr<User> joe2 = session.query< dbo::ptr<User> >
       ("select u from user u").where("name = ?").bind("Joe");
-
-    transaction.commit();
   }
 
   {
@@ -109,8 +105,6 @@ void run()
     for (Users::const_iterator i = users.begin(); i != users.end(); ++i)
       std::cerr << " user " << (*i)->name
 		<< " with karma of " << (*i)->karma << std::endl;
-
-    transaction.commit();
   }
 
   /*****
@@ -124,16 +118,13 @@ void run()
 
     joe.modify()->karma++;
     joe.modify()->password = "public";
-
-    transaction.commit();
   }
 
   {
     dbo::Transaction transaction(session);
     dbo::ptr<User> joe = session.find<User>().where("name = ?").bind("Joe");
     if (joe)
       joe.remove();
-    transaction.commit();
   }
 
   {
@@ -142,8 +133,6 @@ void run()
     dbo::ptr<User> silly = session.add(new User());
     silly.modify()->name = "Silly";
     silly.remove();
-
-    transaction.commit();
   }
 
 }

examples/feature/dbo/tutorial2.C

@@ -105,8 +105,6 @@ void run()
     user->karma = 13;
 
     dbo::ptr<User> userPtr = session.add(user);
-
-    transaction.commit();
   }
 
   dbo::ptr<Post> post;
@@ -120,8 +118,6 @@ void run()
 
     // will print 'Joe has 1 post(s).'
     std::cerr << "Joe has " << joe->posts.size() << " post(s)." << std::endl;
-
-    transaction.commit();
   }
 
   {
@@ -134,8 +130,6 @@ void run()
 
     // will print '1 post(s) tagged with Cooking.'
     std::cerr << cooking->posts.size() << " post(s) tagged with Cooking." << std::endl;
-
-    transaction.commit();
   }
 
 }

examples/feature/dbo/tutorial5.C

@@ -127,8 +127,6 @@ void run()
     user->karma = 13;
 
     dbo::ptr<User> userPtr = session.add(user);
-
-    transaction.commit();
   }
 
   dbo::ptr<Post> post;
@@ -142,8 +140,6 @@ void run()
 
     // will print 'Joe has 1 post(s).'
     std::cerr << "Joe has " << joe->posts.size() << " post(s)." << std::endl;
-
-    transaction.commit();
   }
 
   {
@@ -156,8 +152,6 @@ void run()
 
     // will print '1 post(s) tagged with Cooking.'
     std::cerr << cooking->posts.size() << " post(s) tagged with Cooking." << std::endl;
-
-    transaction.commit();
   }
 }
 

examples/feature/dbo/tutorial7.C

@@ -99,8 +99,6 @@ void run()
     userInfo->info = "great guy";
 
     session.add(userInfo);
-
-    transaction.commit();
   }
 
   {
@@ -109,8 +107,6 @@ void run()
     dbo::ptr<UserInfo> info = session.find<UserInfo>();
 
     std::cerr << info->user->name << " is a " << info->info << std::endl;
-
-    transaction.commit();
   }
 }
 

examples/feature/dbo/tutorial8.C

@@ -170,8 +170,6 @@ void run()
       std::cerr << " " << ms.id.organisation->name
 		<< " (karma: " << ms.karma << ")" << std::endl;
     }
-
-    transaction.commit();
   }
 }
 

src/Wt/Auth/AbstractPasswordService

@@ -53,7 +53,7 @@ public:
    * a numeric scale (from 0 to 5) in addition to the normal validator
    * functionality of validating a password.
    *
-   * The actual computation is done by validateStrength(), which returns
+   * The actual computation is done by evaluateStrength(), which returns
    * an opaque number that is interpreted with isValid(), message() and
    * strength() methods.
    *

src/Wt/Auth/AuthModel.C

@@ -12,19 +12,16 @@
 
 #include "Wt/WApplication"
 #include "Wt/WEnvironment"
-#include "Wt/WLineEdit"
+#include "Wt/WInteractWidget"
 #include "Wt/WLogger"
-#include "Wt/WText"
 
 #ifndef WT_DEBUG_JS
 #include "js/AuthModel.min.js"
 #endif
 
-#include "web/Utils.h"
-
 namespace Wt {
 
-  LOGGER("Auth::AuthModel");
+LOGGER("Auth::AuthModel");
 
   namespace Auth {
 

src/Wt/Auth/AuthService.C

@@ -14,8 +14,6 @@
 #include "Wt/WApplication"
 #include "Wt/WRandom"
 
-#include "web/Utils.h"
-
 namespace Wt {
   namespace Auth {