Merge lp:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba

[David Graf]

Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all the parameters. Inclusive aEmitAttributes.

Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all the parameters. Inclusive aEmitAttributes.

[David Graf (davidagraf)]

review: Approve

[Till Westmann (tillw)]

I'm trying to run:

zorba -q 'trace(attribute { "a" } { 1 }, "a")'

and that still results in a

serialization error [err:SENR0001]: "1": can not serialize attribute node

Does this work for you?

review: Needs Fixing

[David Graf (davidagraf)]

This query doesn't work because the serializer of the query result throws an error. The result of a query must not be an attribute. fn:trace does work on my side:

./bin/zorba -q 'trace(attribute { "a" } { 1 }, "a")'
a [1]: a="1" <========== fn:trace print
<?xml version="1.0" encoding="UTF-8"?>
serialization error [err:SENR0001]: "1": can not serialize attribute node; raised at /home/dagraf/zorba/sandbox/src/api/serialization/serializer.cpp:456

You need to execute something like: ./bin/zorba -q 'data(trace(attribute { "a" } { 1 }, "a"))'
... to not see an error.

[Till Westmann (tillw)]

Of course! I'm sorry about the confusion.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fn_trace_jsoniq_fix-2012-08-15T15-41-05.154Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fn_trace_jsoniq_fix-2012-08-15T15-41-05.154Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2012-07-25 23:20:47 +0000
+++ src/api/serialization/serializer.cpp	2012-08-14 07:19:22 +0000
@@ -1220,11 +1220,12 @@
 
 serializer::jsoniq_emitter::jsoniq_emitter(
   serializer* the_serializer,
-  std::ostream& the_stream)
+  std::ostream& the_stream,
+  bool aEmitAttributes)
   :
     emitter(the_serializer, the_stream),
     theEmitterState(JESTATE_UNDETERMINED),
-    theXMLEmitter(new xml_emitter(the_serializer, the_stream)),
+    theXMLEmitter(new xml_emitter(the_serializer, the_stream, aEmitAttributes)),
     theJSONEmitter(new json_emitter(the_serializer, the_stream))
 {
 }
@@ -2668,7 +2669,7 @@
   else if (method == PARAMETER_VALUE_JSON)
     e = new json_emitter(this, *tr);
   else if (method == PARAMETER_VALUE_JSONIQ)
-    e = new jsoniq_emitter(this, *tr);
+    e = new jsoniq_emitter(this, *tr, aEmitAttributes);
 #endif
   else
   {
 
=== modified file 'src/api/serialization/serializer.h'
--- src/api/serialization/serializer.h	2012-07-25 00:15:29 +0000
+++ src/api/serialization/serializer.h	2012-08-14 07:19:22 +0000
@@ -423,7 +423,10 @@
   class jsoniq_emitter : public emitter
   {
   public:
-    jsoniq_emitter(serializer* the_serializer, std::ostream& the_stream);
+    jsoniq_emitter(
+        serializer* the_serializer, 
+        std::ostream& the_stream,
+        bool aEmitAttributes = false);
 
     virtual ~jsoniq_emitter();