Bugfix: Variable fields related code is now generated correctly when …

…saving a stream as a python script Fixes pstavirs#158
cdm-work · Oct 2, 2015 · 0052ec6 · 0052ec6
1 parent 14d29a0
commit 0052ec6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/common/pythonfileformat.cpp b/common/pythonfileformat.cpp
@@ -80,9 +80,8 @@ bool PythonFileFormat::saveStreams(const OstProto::StreamConfigList streams,
 
             refl->ListFields(protocol, &fields);
             for (uint k = 0; k < fields.size(); k++) {
-                // skip protocol_id field
-                if (fields.at(k)->number() == 
-                        OstProto::Protocol::kProtocolIdFieldNumber)
+                // skip non extension fields
+                if (!fields.at(k)->is_extension())
                     continue;
 
                 if (fields.at(k)->file()->name() !=
@@ -199,7 +198,8 @@ bool PythonFileFormat::saveStreams(const OstProto::StreamConfigList streams,
                         OstProto::Protocol::kProtocolIdFieldNumber)
                     continue;
                 QString pfx("    p.Extensions[X]");
-                pfx.replace("X", fields.at(k)->name().c_str());
+                pfx.replace(fields.at(k)->is_extension()? "X": "Extensions[X]",
+                        fields.at(k)->name().c_str());
                 writeFieldAssignment(out, pfx, protocol,
                         refl, fields.at(k));
             }