fix bugs for json writer

Author: Yell-walkalone

src/database/manager/parser/json/GJWriter.cpp

@@ -83,6 +83,7 @@ void JsonTextWriter::flush()
 
 bool JsonTextWriter::begin(int i)
 {
+  _has_data_entry = false;
   // <stream format>
   (*_stream) <<"{"<< std::endl;
   write_header(i+1);
@@ -273,10 +274,11 @@ void JsonTextWriter::writeTopStruct(int i)
     auto element_list = str->get_element_list();
     temp=0;
 for (size_t j = 0; j < element_list.size(); j++) {
-  // if (j != 0) {
-    // (*_stream) << ",\n";
-  // }
-  write_struct_element(element_list[j],i,temp!=0);
+  size_t previous_temp = temp;
+  write_struct_element(element_list[j], i, _has_data_entry || temp != 0);
+  if (temp != previous_temp) {
+    _has_data_entry = true;
+  }
 }
   write_endstr(i,1);
 
@@ -341,6 +343,9 @@ void JsonTextWriter::writeStruct(int i)
 
 
     // <structure>
+    if (_has_data_entry) {
+      (*_stream) << ",\n";
+    }
     write_bgnstr(str, i+1);
     write_strname(str, i + 2);
 
@@ -358,10 +363,7 @@ void JsonTextWriter::writeStruct(int i)
     // if(element_list.size()>1)
       (*_stream) <<std::endl<<indent3<<"]";
     write_endstr(i+1,0);
-
-    if (k != structListSize - 1) {
-      (*_stream) << ",\n";
-    }
+    _has_data_entry = true;
   }
   /// @brief clear
   flush();
@@ -892,4 +894,4 @@ void JsonTextWriter::write_layer(JsonLayer layer,int i) const
   (*_stream) <<indent<< "\"layer\" : " << layer <<","<< std::endl;
 }
 
-}  // namespace idb
+}  // namespace idb

src/database/manager/parser/json/GJWriter.hpp

@@ -61,6 +61,7 @@ class JsonTextWriter
   // members
   JsonData* _data = nullptr;
   std::ofstream* _stream = nullptr;
+  bool _has_data_entry = false;
 
   void flush();
 
@@ -96,4 +97,4 @@ class JsonTextWriter
   void write_layer(JsonLayer,int i) const;
 };
 
-}  // namespace idb
+}  // namespace idb