specialize save member function instead of using a separate saveJSON

Author: arahlin

core/include/core/G3Frame.h

@@ -103,10 +103,9 @@ class G3Frame {
 	template <class A> void save(A &ar, unsigned) const;
 	template <class A> void load(A &ar, unsigned);
 
-  // JSON representation of a frame (if JSON output is enabled, otherwise
-  // outputs valid JSON telling you that JSON output isn't enabled)
-  template <typename T> void saveJSON(T &os) const;
-  std::string asJSON() const;
+	// JSON representation of a frame (if JSON output is enabled, otherwise
+	// outputs valid JSON telling you that JSON output isn't enabled)
+	std::string asJSON() const;
 
 	// Routines for handling the stored serialized copies of data.
 	// These are all const because they only manipulate caches and

core/src/G3Frame.cxx

@@ -264,15 +264,13 @@ void G3Frame::save(A &ar, unsigned v) const
 	ar << make_nvp("crc", crc);
 }
 
-template<typename T>
-void G3Frame::saveJSON(T & os) const
-{
 #ifdef SPT3G_ENABLE_JSON_OUTPUT
+template<>
+void G3Frame::save(cereal::JSONOutputArchive &ar, unsigned v) const
+{
 	using cereal::make_nvp;
-	uint32_t version(1), size(map_.size());
+	uint32_t size(map_.size());
 
-	cereal::JSONOutputArchive ar(os);
-	ar << make_nvp("version", version);
 	ar << make_nvp("size", size);
 	std::string typestr(1,(char) type);
 	ar << make_nvp("type", typestr);
@@ -282,16 +280,19 @@ void G3Frame::saveJSON(T & os) const
 		ar << make_nvp("name", i->first);
 		ar << make_nvp("val", i->second.frameobject);
 	}
-#else
-	os << " {error: \"spt3g-software compiled without JSON support\"}" << std::endl;
-#endif
 }
+#endif
 
 std::string
 G3Frame::asJSON() const
 {
 	std::stringstream str;
-	saveJSON(str);
+#ifdef SPT3G_ENABLE_JSON_OUTPUT
+	cereal::JSONOutputArchive ar(str);
+	ar << cereal::make_nvp("frame", *this);
+#else
+	str << "{error: \"spt3g_software compiled without JSON support\"}" << std::endl;
+#endif
 	return str.str();
 }
 
@@ -425,10 +426,6 @@ template void G3Frame::saves(std::ostringstream &) const;
 
 G3_SPLIT_SERIALIZABLE_CODE(G3Frame);
 
-template void G3Frame::saveJSON(std::ostream &) const;
-template void G3Frame::saveJSON(std::ostringstream &) const;
-template void G3Frame::saveJSON(boost::iostreams::filtering_ostream &) const;
-
 G3FramePtr
 g3frame_char_constructor(std::string max_4_chars)
 {

serve/src/spt3g-json-serve-files.cxx

@@ -262,7 +262,7 @@ static void handle_g3(const httplib::Request & req, httplib::Response & resp)
 
 					frame.loads(ifs);
 					if (i++ >= n_skip) {
-						frame.saveJSON(os);
+						os << frame.asJSON();
 						first = false;
 					}
 					if (n_frames_to_read > 0 && i >= n_frames_to_read + n_skip)