Changeset 3491

Timestamp:

08/29/13 15:53:37 (11 years ago)

Author:

andmor

Message:

Removed call to sloot.xpath2 over the response. Call is now just done for logging purposes.

File:

• cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.access.data/access/user.dpml (modified) (3 diffs)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.access.data/access/user.dpml

@@ -254 +254 @@
                         <!-- get the user information -->
                         <sequence>
-                                <request assignment="res">
+                                <request assignment="response">
                                         <identifier>active:org.basex.query</identifier>
                                         <argument name="operator">
@@ -268 +268 @@
                                         <argument name="args">this:arguments</argument>
                                 </request>
-                                <!-- pass the document returned by basex trough sloot.xpath2 so
-                                when we log the response (end of this dpml) the actual user 
-                                document is logged instead of the value of its pointer!-->
-                                <request assignment="response">
-                                        <identifier>active:sloot.xpath2</identifier>
-                                        <argument name="operand">this:res</argument>
-                                        <argument name="operator">
-                                                <literal type="xml">
-                                                        <dummy>.</dummy>
-                                                </literal>
-                                        </argument>
-                                </request>
-
-                                <!--    AAM: it would be better  to use sloot.xquery instead of sloot.xpath2
-                for instance to log the user document in its own line. However using it
-                causes a type mismatch in findUser.dpml since sloot.xquery does not seem 
-                to return an element of type "document" as expected by findUser.dpml
-                
-                                        <request assignment="response">
-                                        <identifier>active:sloot.xquery</identifier>
-                                        <argument name="operator">
-                                                <literal type="xml"><dummy>{$NL}{$doc}{$NL}</dummy></literal>
-                                        </argument>
-                                        <argument name="NL">
-                                                <literal type="string">
-</literal>
-                                        </argument>
-                                        <argument name="doc">this:res</argument>
-                                </request>-->
-
                         </sequence>
                 </then>
@@ -317 +287 @@
                                 <literal type="string">[access.data] User accessor response: [%1]</literal>
                         </message>
-                        <param>this:response</param>
+                        <param>
+                                <!-- pass the response trough sloot.xpath2 so the actual
+                                user document is logged instead of the value of its pointer!-->
+                                <request>
+                                        <identifier>active:sloot.xpath2</identifier>
+                                        <argument name="operand">this:response</argument>
+                                        <argument name="operator">
+                                                <literal type="xml">
+                                                        <dummy>.</dummy>
+                                                </literal>
+                                        </argument>
+                                </request>
+                        </param>
                 </log>
                 <request>