Scripts updated to use new PG interface.

[cocanwiki.git] / scripts / images.ml

diff --git a/scripts/images.ml b/scripts/images.ml
index 3b5e1e9..b11dafd 100644 (file)
--- a/scripts/images.ml
+++ b/scripts/images.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: images.ml,v 1.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: images.ml,v 1.10 2006/03/28 16:24:07 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
@@ -10,63 +25,69 @@ open Cgi
 open Printf
 
 open Cocanwiki
+open Cocanwiki_template
 
-open Merjisforwiki
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template dbh hostid "images.html" in
 
-let template = get_template "images.html"
-
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
   let deleted = q#param_true "deleted" in
   template#conditional "deleted" deleted;
 
-  let sql =
-    "select id, name, name_deleted, width, height, alt, octet_length (image),
-            tn_width, tn_height
+  let rows =
+    if not deleted then
+      PGSQL(dbh)
+       "select id, name, name_deleted, width, height, alt,
+            octet_length (image), tn_width, tn_height
+       from images
+      where hostid = $hostid and name is not null
+      order by 2, 3"
+    else
+      PGSQL(dbh)
+       "select id, name, name_deleted, width, height, alt,
+            octet_length (image), tn_width, tn_height
        from images
-      where hostid = ? and " ^
-    (if not deleted then "name is not null"
-     else "name_deleted is not null") ^
-    " order by 2, 3" in
-  let sth = dbh#prepare_cached sql in
-  sth#execute [`Int hostid];
+      where hostid = $hostid and name_deleted is not null
+      order by 2, 3" in
 
   let table =
-    sth#map
+    List.map
       (fun row ->
         let id, name, width, height, alt, size, tn_width, tn_height,
           is_deleted, has_thumbnail =
           match row with
-            | [`Int id; `String name; `Null; `Int width; `Int height;
-               `String alt; `Int size; `Int tn_width; `Int tn_height] ->
+            | (id, Some name, None, width, height,
+               alt, Some size, Some tn_width, Some tn_height) ->
                 id, name, width, height, alt, size, tn_width, tn_height,
                 false, true
-            | [`Int id; `Null; `String name; `Int width; `Int height;
-               `String alt; `Int size; `Int tn_width; `Int tn_height] ->
+            | (id, None, Some name, width, height,
+               alt, Some size, Some tn_width, Some tn_height) ->
                 id, name, width, height, alt, size, tn_width, tn_height,
                 true, true
-            | [`Int id; `String name; `Null; `Int width; `Int height;
-               `String alt; `Int size; `Null; `Null] ->
-                id, name, width, height, alt, size, 0, 0,
+            | (id, Some name, None, width, height,
+               alt, Some size, None, None) ->
+                id, name, width, height, alt, size, 0l, 0l,
                 false, false
-            | [`Int id; `Null; `String name; `Int width; `Int height;
-               `String alt; `Int size; `Null; `Null] ->
-                id, name, width, height, alt, size, 0, 0,
+            | (id, None, Some name, width, height,
+               alt, Some size, None, None) ->
+                id, name, width, height, alt, size, 0l, 0l,
                 true, false
             | _ -> assert false in
-        [ "id", Template.VarString (string_of_int id);
+        let size = Int32.to_int size in
+        [ "id", Template.VarString (Int32.to_string id);
           "name", Template.VarString name;
-          "width", Template.VarString (string_of_int width);
-          "height", Template.VarString (string_of_int height);
+          "width", Template.VarString (Int32.to_string width);
+          "height", Template.VarString (Int32.to_string height);
           "alt", Template.VarString alt;
           "ksize", Template.VarString (string_of_int (size / 1024));
-          "tn_width", Template.VarString (string_of_int tn_width);
-          "tn_height", Template.VarString (string_of_int tn_height);
+          "tn_width", Template.VarString (Int32.to_string tn_width);
+          "tn_height", Template.VarString (Int32.to_string tn_height);
           "is_deleted", Template.VarConditional is_deleted;
-          "has_thumbnail", Template.VarConditional has_thumbnail ]) in
+          "has_thumbnail", Template.VarConditional has_thumbnail ]
+      ) rows in
 
   template#table "images" table;
 
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run