Allow username field to be prepopulated.

[cocanwiki.git] / scripts / cocanwiki_diff.ml

diff --git a/scripts/cocanwiki_diff.ml b/scripts/cocanwiki_diff.ml
index 0da7f42..97f4b65 100644 (file)
--- a/scripts/cocanwiki_diff.ml
+++ b/scripts/cocanwiki_diff.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_diff.ml,v 1.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: cocanwiki_diff.ml,v 1.4 2004/09/20 10:56:47 rich Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -9,7 +24,7 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
+open Cocanwiki_files
 
 (* Convenience code for generating diffs between versions.  See diff.ml
  * and edit.ml which both use this code.
@@ -44,7 +59,7 @@ let get_version_for_diff (dbh : Dbi.connection) version =
 
     let css = sth#fetch1string () in
 
-    let sth = dbh#prepare_cached "select sectionname, content
+    let sth = dbh#prepare_cached "select coalesce (sectionname, ''), content
                                     from contents where pageid = ?
                                    order by ordering" in
     sth#execute [`Int version];