[refactor] Cleanup and enable debugging of XForm via Query Parameter

Author: adamretter

src/main/xar-resources/form.xq

@@ -1,7 +1,6 @@
 xquery version "1.0";
 
-declare namespace html="http://www.w3.org/1999/xhtml";
-declare namespace xf="http://www.w3.org/2002/xforms";
+import module namespace rh = "http://localhost/manuForma/request-helper" at "./modules/request-helper.xqm";
 
 (:~
  : Note need to add app:dir var, and use in configuring css
@@ -73,26 +72,14 @@ declare function local:insert-element($node as node()?, $new-node as node(),
          else $node
 };
 
-let $form-name := request:get-parameter("form", "")
-let $form-path := $form-name
+
+let $form-path := rh:request-param("form", "")
+let $xsltforms-debug := rh:request-param-yes-no("xsltforms-debug")
 let $form-doc := doc($form-path)
 let $form-description := <div class="description">Form Place Holder</div>
 let $form-doc := local:insert-element($form-doc, $form-description, 'iframe', 'remove')
-let $dummy := request:set-attribute("betterform.filter.ignoreResponseBody", "true")
-let $xslt-pi := processing-instruction xml-stylesheet {'type="text/xsl" href="/exist/rest/db/apps/xsltforms/xsltforms.xsl"'}
-let $css-pi := processing-instruction css-conversion {'no'}
-let $debug := processing-instruction xsltforms-options {'debug="no"'}
-(: Server side variables :)
-let $transform := doc('/exist/rest/db/apps/xsltforms/xsltforms.xsl')
-let $params :=
-<parameters>
-   <param name="omit-xml-declaration" value="yes"/>
-   <param name="indent" value="no"/>
-   <param name="media-type" value="text/html"/>
-   <param name="method" value="xhtml"/>
-   <param name="baseuri" value="/exist/rest/db/apps/xsltforms/"/>
-</parameters>
-
-let $serialization-options := 'method=xml media-type=text/html omit-xml-declaration=yes indent=no'
-let $cache := current-dateTime()
-return ($xslt-pi,$css-pi, $debug, $form-doc)
+let $xslt-pi := processing-instruction xml-stylesheet { 'type="text/xsl" href="/exist/rest/db/apps/xsltforms/xsltforms.xsl"' }
+let $css-pi := processing-instruction css-conversion { 'no' }
+let $debug := processing-instruction xsltforms-options { concat('debug="', $xsltforms-debug, '"') }
+return
+  ($xslt-pi, $css-pi, $debug, $form-doc)

src/main/xar-resources/modules/request-helper.xqm

@@ -46,6 +46,23 @@ declare function rh:request-param-bool($name as xs:string) as xs:boolean {
     lower-case(rh:request-param($name, "false")[1]) eq "true"
 };
 
+(:~
+ : Get a HTTP request parameter as a "yes" or "no" value.
+ : "true" is also considered as "yes".
+ : Unlike request:get-parameter this will ignore parameters that have an empty string value.
+ :
+ : @param $name the name of the HTTP request parameter
+ :
+ : @return either "yes", or "no".
+ :)
+declare function rh:request-param-yes-no($name as xs:string) as xs:string {
+    if (lower-case(rh:request-param($name, "no")[1]) = ("yes", "true"))
+    then
+      "yes"
+    else
+      "no"
+};
+
 (:~
  : Get HTTP request parameters.
  : Unlike request:get-parameter this will ignore parameters that have an empty string value.