Edit the description fields (metadata) for images and files.

[cocanwiki.git] / scripts / upload_image.ml

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 170c400..238b5a2 100644 (file)
--- a/scripts/upload_image.ml
+++ b/scripts/upload_image.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: upload_image.ml,v 1.10 2004/11/01 16:24:50 rich Exp $
+ * $Id: upload_image.ml,v 1.11 2004/11/01 17:05:14 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
@@ -30,9 +30,7 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_emailnotify
 open Cocanwiki_images
-
-let is_ws_re = Pcre.regexp "^\\s*$"
-let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str
+open Cocanwiki_strings
 
 (* Valid image names. *)
 let image_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
@@ -96,7 +94,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   );
 
   (* Check some ALT text was supplied. *)
-  if is_whitespace alt then (
+  if string_is_whitespace alt then (
     error ~title:"Missing Alt text" ~back_button:true
       q ("You must supply Alt text describing the image.  This is required " ^
         "by accessibility laws and to allow search engines to discover the " ^
@@ -104,9 +102,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     return ()
   );
 
-  let title = if is_whitespace title then `Null else `String title in
-  let longdesc = if is_whitespace longdesc then `Null else `String longdesc in
-  let clazz = if is_whitespace clazz then `Null else `String clazz in
+  let title = if string_is_whitespace title then `Null else `String title in
+  let longdesc =
+    if string_is_whitespace longdesc then `Null else `String longdesc in
+  let clazz = if string_is_whitespace clazz then `Null else `String clazz in
 
   (* Make a thumbnail of this image. *)
   let thumbnail, tn_mime_type, tn_width, tn_height =