Don't forget the date\!

[cocanwiki.git] / scripts / files.ml

diff --git a/scripts/files.ml b/scripts/files.ml
index 5f8814e..c99d6df 100644 (file)
--- a/scripts/files.ml
+++ b/scripts/files.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: files.ml,v 1.8 2006/03/27 18:09:46 rich Exp $
+ * $Id: files.ml,v 1.10 2006/12/06 09:46:57 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
@@ -28,35 +28,41 @@ open Cocanwiki
 open Cocanwiki_template
 
 let run r (q : cgi) dbh hostid _ _ =
-  let template = get_template dbh hostid "files.html" in
+  let template = get_template r dbh hostid "files.html" in
 
   let deleted = q#param_true "deleted" in
   template#conditional "deleted" deleted;
 
-  let sql =
-    "select id, name, name_deleted, octet_length (content)
-       from files
-      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 [Some hostid];
+  let rows =
+    if not deleted then
+      PGSQL(dbh)
+       "select id, name, name_deleted, octet_length (content)
+           from files
+          where hostid = $hostid and name is not null
+          order by 2, 3"
+    else
+      PGSQL(dbh)
+       "select id, name, name_deleted, octet_length (content)
+           from files
+          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, size, is_deleted =
           match row with
-            | [Some id; Some name; None; Some size] ->
+            | (id, Some name, None, size) ->
                 id, name, size, false
-            | [Some id; None; Some name; Some size] ->
+            | (id, None, Some name, size) ->
                 id, name, size, true
             | _ -> assert false in
+        let size = Int32.to_int (Option.get size) in
         [ "id", Template.VarString (Int32.to_string id);
           "name", Template.VarString name;
-          "ksize", Template.VarString (Int32.to_string (size / 1024));
-          "is_deleted", Template.VarConditional is_deleted ]) in
+          "ksize", Template.VarString (string_of_int (size / 1024));
+          "is_deleted", Template.VarConditional is_deleted ]
+      ) rows in
 
   template#table "files" table;