* updated respond_error messages after API change in ocaml-http 0.0.9

[helm.git] / helm / uwobo / uwobo_common.ml

diff --git a/helm/uwobo/uwobo_common.ml b/helm/uwobo/uwobo_common.ml
index b4a910f9d7cb0b17bd738ccac6283dfd9857016d..bdb455bc76f3106439e8315819d2441cd2e2a226 100644 (file)
--- a/helm/uwobo/uwobo_common.ml
+++ b/helm/uwobo/uwobo_common.ml
@@ -100,7 +100,7 @@ let usage_string =
       return a list of loaded stylesheets
     </p>
     <p>
-      <b><kbd>apply?xmluri=uri&keys=key1,key2,...[&errormode={ignore|comment|embed}][&debugmode={ignore|comment|embed}][&param.name=value[&param.name=value[&...]]][&param.key.name=value[&param.key.name=value[&...]]][&prop.name[=value][&prop.name[=value][&...]]]</kbd></b><br />
+      <b><kbd>apply?xmluri=uri&keys=key1,key2,...[&errormode={ignore|comment|embed}][&debugmode={ignore|comment|embed}][&profile=id][&password=password][&param.name=value[&param.name=value[&...]]][&param.key.name=value[&param.key.name=value[&...]]][&prop.name[=value][&prop.name[=value][&...]]]</kbd></b><br />
       apply a chain of stylesheets, specified by <em>key1, key2, ...</em>, to an
       input document, specified by <em>uri</em>.<br />
       Error and debugging modes could be ste to three different values.
@@ -114,11 +114,62 @@ let usage_string =
       <em>param.name=value</em> syntax, per stylesheet parameters are set using
       <em>param.key.name=value</em> where <em>key</em> is the key of a loaded
       stylesheet.<br />
+      Moreover, it is possible to specify a <em>profile</em> that is searched for
+      additional global and local parameters. The parameters stored in the profile
+      have lower precedence with respect to those provided in the URL. A
+      <em>password</em> for the profile must be provided if the read permission
+      of the profile is set to false.<br />
       Properties of the final chain output can be set too: valueless properties
       can be set using <em>prop.name</em> syntax, others can be set using
       <em>prop.name=value</em> syntax.<br />
       Current supported properties are: %s.
     </p>
+    <p>
+      <b><kbd>listprofiles</kbd></b><br />
+      return the list of profiles available
+    </p>
+    <p>
+      <b><kbd>createprofile?[id=id][&orig=orig][&origpassword=origpassword][&readperm={true|false}][&writeperm={true|false}][&adminperm={true|false}][&password=password]</kbd></b><br />
+      creates a new profile. The id of the created profile is <em>id</em> (if provided); otherwise it is a fresh id.
+      The parameters are inherited from the profile <em>orig</em>, if provided. <em>origpassword</em> is the password of the
+      profile being copied in case the read permission of that profile is set to false. The defaults for
+      <em>password</em> and <em>readper,writeperm,adminperm</em> are respectively true, true, true and no password.
+    </p>
+    <p>
+      <b><kbd>removeprofile?id=id[&password=password]</kbd></b><br />
+      completely removes the profile <em>id</em>. The password is required if the profile administrative permission
+      is set to false.
+    </p>
+    <p>
+      <b><kbd>setprofileparam?id=id[&password=password]&key=key[&value=value]</kbd></b><br />
+      sets the property <em>key</em> to <em>value</em>, if <em>value</em> is provided; otherwise
+      the parameter is unset. The password is required if the profile writing permission is set to
+      false.
+    </p>
+    <p>
+      <b><kbd>setpassword?id=id[&oldpassword=oldpassword][&password=password]</kbd></b><br />
+      changes or unset the password. The old password is required if it was set.
+    </p>
+    <p>
+      <b><kbd>setpermission?id=id[&password=password]&permission={read|write|admin}&value={true|false}</kbd></b><br />
+      changes the permission <em>permission</em>. The password is required if the administrative permission
+      is set to false.
+    </p>
+    <p>
+      <b><kbd>getparams?id=id[&password=password]</kbd></b><br />
+      returns all the params of the profile <em>id</em>. The password is required if the read permission
+      is set to false.
+    </p>
+    <p>
+      <b><kbd>getparam?id=id[&password=password]&key=key</kbd></b><br />
+      returns the value of the param <em>key</em> of the profile <em>id</em>. The password is required if the read permission
+      is set to false.
+    </p>
+    <p>
+      <b><kbd>getpermission?id=id[&password=password]&for={read|write|admin}</kbd></b><br />
+      returns the value of the permission <em>key</em> of the profile <em>id</em>. The password is required if the administrative
+      permission is set to false.
+    </p>
   </body>
 </html>
 "
@@ -133,7 +184,7 @@ let pp_error =
 let return_error msg ?(body = "") outchan =
   Http_daemon.respond ~body:(pp_error msg body) outchan;;
 let bad_request body outchan =
-  Http_daemon.respond_error ~code:400 ~body outchan
+  Http_daemon.respond_error ~code:(`Code 400) ~body outchan
 ;;
 
   (** {2 LibXSLT logging} *)