zorba-coders team mailing list archive

[David Graf <david.graf@xxxxxxxxxx>]

David Graf has proposed merging lp:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba.

Requested reviews:
  David Graf (davidagraf)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478

Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all the parameters. Inclusive aEmitAttributes.
-- 
https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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();