can now from JSON

scopatz · Feb 6, 2015 · b468cdf · b468cdf
1 parent f6f9d24
commit b468cdf
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 57 deletions.
diff --git a/cli/cyclus.cc b/cli/cyclus.cc
@@ -129,11 +129,6 @@ int main(int argc, char* argv[]) {
   // Try to detect schema type
   std::stringstream input;
   LoadStringstreamFromFile(input, infile);
-  std::string inext = fs::path(infile).extension().string();
-  if (inext == ".json") {
-    std::string inxml = cyclus::toolkit::JsonToXml(input.str());
-    input.str(inxml);
-  }
   boost::shared_ptr<XMLParser> parser =
       boost::shared_ptr<XMLParser>(new XMLParser());
   parser->Init(input);
@@ -377,7 +372,7 @@ int EarlyExitArgs(const ArgInfo& ai) {
     std::string infile(ai.vm["json-to-xml"].as<std::string>());
     try {
       std::stringstream input;
-      LoadStringstreamFromFile(input, infile);
+      LoadRawStringstreamFromFile(input, infile);
       std::cout << cyclus::toolkit::JsonToXml(input.str());
     } catch (cyclus::IOError err) {
       std::cout << err.what() << "\n";
@@ -387,7 +382,7 @@ int EarlyExitArgs(const ArgInfo& ai) {
     std::string infile(ai.vm["xml-to-json"].as<std::string>());
     try {
       std::stringstream input;
-      LoadStringstreamFromFile(input, infile);
+      LoadRawStringstreamFromFile(input, infile);
       std::cout << cyclus::toolkit::XmlToJson(input.str());
     } catch (cyclus::IOError err) {
       std::cout << err.what() << "\n";

diff --git a/share/cyclus-flat.rng.in b/share/cyclus-flat.rng.in
@@ -47,18 +47,22 @@ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
 
   <zeroOrMore>
     <element name="commodity">
-      <element name="name"><text/></element>
-      <element name="solution_priority"><data type="double"/></element>
+      <interleave>
+        <element name="name"><text/></element>
+        <element name="solution_priority"><data type="double"/></element>
+      </interleave>
     </element>
   </zeroOrMore>
 
   <element name="archetypes"> 
     <oneOrMore>
-      <element name="spec"> 
-        <optional><element name="path"><text/></element></optional>
-        <optional><element name="lib"><text/></element></optional>
-        <element name="name"><text/></element>
-        <optional><element name="alias"><text/></element></optional>
+      <element name="spec">
+        <interleave>
+          <optional><element name="path"><text/></element></optional>
+          <optional><element name="lib"><text/></element></optional>
+          <element name="name"><text/></element>
+          <optional><element name="alias"><text/></element></optional>
+        </interleave>
       </element>
     </oneOrMore>
   </element>
@@ -83,24 +87,30 @@ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
 
   <oneOrMore>
     <element name="agent">
-      <element name="name"><text/></element>
-      <element name="prototype"><text/></element>
-      <optional>
-        <element name="parent"><text/></element>
-      </optional>
+      <interleave>
+        <element name="name"><text/></element>
+        <element name="prototype"><text/></element>
+        <optional>
+          <element name="parent"><text/></element>
+        </optional>
+      </interleave>
     </element>
   </oneOrMore>
 
   <zeroOrMore>
     <element name="recipe">
-      <element name="name"><text/></element>
-      <element name="basis"><text/></element>
-      <oneOrMore>
-        <element name="nuclide">
-          <element name="id"><data type="string"/></element>
-          <element name="comp"><data type="double"/></element>
-        </element>
-      </oneOrMore>
+      <interleave>
+        <element name="name"><text/></element>
+        <element name="basis"><text/></element>
+        <oneOrMore>
+          <element name="nuclide">
+            <interleave>
+              <element name="id"><data type="string"/></element>
+              <element name="comp"><data type="double"/></element>
+            </interleave>
+          </element>
+        </oneOrMore>
+      </interleave>
     </element>
   </zeroOrMore>
 

diff --git a/share/cyclus.rng.in b/share/cyclus.rng.in
@@ -49,34 +49,40 @@ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
 
   <zeroOrMore>
     <element name="commodity">
-      <element name="name"> <text/> </element>
-      <element name="solution_priority"> <data type="double"/> </element>
+      <interleave>
+        <element name="name"> <text/> </element>
+        <element name="solution_priority"> <data type="double"/> </element>
+      </interleave>
     </element>
   </zeroOrMore>
 
   <element name="archetypes"> 
     <oneOrMore>
-      <element name="spec"> 
-        <optional><element name="path"><text/></element></optional>
-        <optional><element name="lib"><text/></element></optional>
-        <element name="name"><text/></element>
-        <optional><element name="alias"><text/></element></optional>
+      <element name="spec">
+        <interleave>
+          <optional><element name="path"><text/></element></optional>
+          <optional><element name="lib"><text/></element></optional>
+          <element name="name"><text/></element>
+          <optional><element name="alias"><text/></element></optional>
+        </interleave>
       </element>
     </oneOrMore>
   </element>
 
   <oneOrMore>
     <element name="facility">
-      <element name="name"> <text/> </element>
-      <optional>
-        <element name="lifetime"> <data type="nonNegativeInteger"/> </element>
-      </optional>
-
-      <element name="config">
-        <choice>
-        @Facility_REFS@
-        </choice>
-      </element>
+      <interleave>
+        <element name="name"> <text/> </element>
+        <optional>
+          <element name="lifetime"> <data type="nonNegativeInteger"/> </element>
+        </optional>
+
+        <element name="config">
+          <choice>
+          @Facility_REFS@
+          </choice>
+        </element>
+      </interleave>
     </element>
   </oneOrMore>
 
@@ -104,8 +110,10 @@ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
             <element name="initialfacilitylist">
               <oneOrMore>
                 <element name="entry">
-                  <element name="prototype"> <text/> </element>
-                  <element name="number"> <data type="nonNegativeInteger"/> </element>
+                  <interleave>
+                    <element name="prototype"> <text/> </element>
+                    <element name="number"> <data type="nonNegativeInteger"/> </element>
+                  </interleave>
                 </element>
               </oneOrMore>
             </element>
@@ -124,14 +132,18 @@ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
 
   <zeroOrMore>
     <element name="recipe">
-      <element name="name"><text/></element>
-      <element name="basis"><text/></element>
-      <oneOrMore>
-        <element name="nuclide">
-          <element name="id"><data type="string"/></element>
-          <element name="comp"><data type="double"/></element>
-        </element>
-      </oneOrMore>
+      <interleave>
+        <element name="name"><text/></element>
+        <element name="basis"><text/></element>
+        <oneOrMore>
+          <element name="nuclide">
+            <interleave>
+              <element name="id"><data type="string"/></element>
+              <element name="comp"><data type="double"/></element>
+            </interleave>
+          </element>
+        </oneOrMore>
+      </interleave>
     </element>
   </zeroOrMore>
 

diff --git a/src/xml_file_loader.cc b/src/xml_file_loader.cc
@@ -19,12 +19,13 @@
 #include "infile_tree.h"
 #include "logger.h"
 #include "sim_init.h"
+#include "toolkit/infile_converters.h"
 
 namespace cyclus {
 
 namespace fs = boost::filesystem;
 
-void LoadStringstreamFromFile(std::stringstream& stream, std::string file) {
+void LoadRawStringstreamFromFile(std::stringstream& stream, std::string file) {
   std::ifstream file_stream(file.c_str());
   if (!file_stream) {
     throw IOError("The file '" + file + "' could not be loaded.");
@@ -34,6 +35,15 @@ void LoadStringstreamFromFile(std::stringstream& stream, std::string file) {
   file_stream.close();
 }
 
+void LoadStringstreamFromFile(std::stringstream& stream, std::string file) {
+  LoadRawStringstreamFromFile(stream, file);
+  std::string inext = fs::path(file).extension().string();
+  if (inext == ".json") {
+    std::string inxml = cyclus::toolkit::JsonToXml(stream.str());
+    stream.str(inxml);
+  }
+}
+
 std::vector<AgentSpec> ParseSpecs(std::string infile) {
   std::stringstream input;
   LoadStringstreamFromFile(input, infile);
@@ -144,8 +154,10 @@ XMLFileLoader::XMLFileLoader(Recorder* r,
   parser_ = boost::shared_ptr<XMLParser>(new XMLParser());
   parser_->Init(input);
 
+  std::stringstream orig_input;
+  LoadRawStringstreamFromFile(orig_input, file_);
   ctx_->NewDatum("InputFiles")
-      ->AddVal("Data", Blob(input.str()))
+      ->AddVal("Data", Blob(orig_input.str()))
       ->Record();
 }
 

diff --git a/src/xml_file_loader.h b/src/xml_file_loader.h
@@ -17,7 +17,10 @@ namespace cyclus {
 
 class Context;
 
-/// Reads the given file path into the passed stream.
+/// Reads the given file path into the passed stream without modification.
+void LoadRawStringstreamFromFile(std::stringstream& stream, std::string file);
+
+/// Reads the given file path as XML into the passed stream.
 void LoadStringstreamFromFile(std::stringstream& stream, std::string file);
 
 /// Returns a list of the full module+agent spec for all agents in the given