v. 0.9.1

jsonstatslice (now also known as jsonstat2jsonstat) had a bug: it didn't work correctly with JSON-stat<2.0.

Author: Xavier Badosa

README.md

@@ -13,7 +13,7 @@ Available commands:
 * [jsonstat2arrobj](#jsonstat2arrobj) - converts JSON-stat into an array of objects
 * [jsonstat2csv](#jsonstat2csv) - converts JSON-stat into CSV
 * [jsonstat2object](#jsonstat2object) - converts JSON-stat into an object
-* [jsonstatslice](#jsonstatslice) - creates a subset from JSON-stat
+* [jsonstatslice (aka jsonstat2jsonstat)](#jsonstatslice-aka-jsonstat2jsonstat) - creates JSON-stat from JSON-stat
 
 ## Example
 
@@ -353,9 +353,9 @@ Boolean. Identifies categories by ID instead of label.
 jsonstat2object oecd.json oecd-object.json --cid
 ```
 
-## jsonstatslice
+## jsonstatslice (aka jsonstat2jsonstat)
 
-Creates a JSON-stat subset from a JSON-stat dataset. A JSON-stat subset has the same dimensions as the original dataset but with some of them fixed for a certain category.
+Creates JSON-stat from JSON-stat. It can be used to convert old JSON-stat to JSON-stat version 2.0. Because it supports a filter parameter, it can also be used to creates a JSON-stat subset from a JSON-stat dataset. A JSON-stat subset has the same dimensions as the original dataset but with some of them fixed for a certain category.
 
 ```
 jsonstatslice oecd.json oecd-subset.json -f area=DE,year=2014
@@ -365,7 +365,11 @@ In the previous example, oecd-subset.json only contains data for Germany in 2014
 
 #### --filter (-f)
 
-String. Specifies a filter. When no filter is specified, the original JSON-stat will be returned.
+String. Specifies a filter. When no filter is specified, the original JSON-stat will be returned unless it was not JSON-stat 2.0: in such case, it will be updated to version 2.0.
+
+```
+jsonstat2jsonstat jsonstat10.json jsonstat20.json
+```
 
 A filter is a comma-separated list of selection criteria. Each criterion must follow the pattern *{dimension id}={category id}*. Because dimension ids and category ids are strings that can contain whitespaces, they should be double-quoted.
 

jsonstat2jsonstat

@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+
+var
+	argv=require("yargs")
+		.version()
+		.usage("Usage:\n  $0 [input filename] [output filename]\n  $0 < [input] > [output] -t")
+		.example("$0 old.json v20.json", "converts JSON-stat file old.json into JSON-stat 2.0 (v20.json).")
+		.example("$0 < old.json > v20.json -t", "converts JSON-stat stream old.json into a JSON-stat 2.0 stream (v20.json).")
+		.alias("f", "filter")
+		.describe("f", "Filter string (for example: area=DE,year=2014)")
+		.boolean("t")
+		.alias("t", "stream")
+		.describe("t", "Enable the stream interface")
+		.help("h")
+		.alias("h", "help")
+		.argv
+	,
+	inout=require("./inout"),
+
+	stringify=function(json){
+		var tree=json.__tree__;
+
+		//if v<2.0 convert to 2.0
+		if(!tree.hasOwnProperty("id")){
+			tree.version="2.0";
+			if(!tree.hasOwnProperty("class")){
+				tree.class="dataset";
+			}
+
+			tree.id=tree.dimension.id;
+			tree.size=tree.dimension.size;
+			delete tree.dimension.id;
+			delete tree.dimension.size;
+
+			if(tree.dimension.hasOwnProperty("role")){
+				tree.role=tree.dimension.role;
+				delete tree.dimension.role;
+			}
+		}
+
+		delete tree.role.classification;
+		["geo", "time", "metric"].forEach(function(e){
+			if(tree.role[e]===null){
+				delete tree.role[e];
+			}
+		});
+
+		return JSON.stringify(tree);
+	}
+
+	callback=function(contents){
+		var
+			arrfil,
+			subset,
+			filter=argv.filter
+		;
+
+		//filter is not required: if not specified (no -f or -f without string) input=output
+		if(!filter || filter===true){
+			//Depending on version (v<2.0)
+			return contents.id ? contents : stringify( inout.dataset(contents) );
+		}
+
+		if(filter.indexOf("=")===-1){
+			console.error("Error: The filter has not been specified correctly (missing =).");
+			process.exit(1);
+		}
+
+		arrfil=filter.split(",").map(function(e){
+			return e.split("=");
+		});
+
+		subset=inout.dataset(contents).Slice(arrfil);
+		if(subset===null){
+			console.error("Error: The input does not containt valid JSON-stat or the filters are not valid.");
+			process.exit(1);
+		}else{
+			return stringify(subset);
+		}
+	}
+;
+
+inout.main(argv, callback, true);

jsonstatslice

@@ -17,6 +17,37 @@ var
 	,
 	inout=require("./inout"),
 
+	stringify=function(json){
+		var tree=json.__tree__;
+
+		//if v<2.0 convert to 2.0
+		if(!tree.hasOwnProperty("id")){
+			tree.version="2.0";
+			if(!tree.hasOwnProperty("class")){
+				tree.class="dataset";
+			}
+
+			tree.id=tree.dimension.id;
+			tree.size=tree.dimension.size;
+			delete tree.dimension.id;
+			delete tree.dimension.size;
+
+			if(tree.dimension.hasOwnProperty("role")){
+				tree.role=tree.dimension.role;
+				delete tree.dimension.role;
+			}
+		}
+
+		delete tree.role.classification;
+		["geo", "time", "metric"].forEach(function(e){
+			if(tree.role[e]===null){
+				delete tree.role[e];
+			}
+		});
+
+		return JSON.stringify(tree);
+	}
+
 	callback=function(contents){
 		var
 			arrfil,
@@ -26,7 +57,8 @@ var
 
 		//filter is not required: if not specified (no -f or -f without string) input=output
 		if(!filter || filter===true){
-			return contents;
+			//Depending on version (v<2.0)
+			return contents.id ? contents : stringify( inout.dataset(contents) );
 		}
 
 		if(filter.indexOf("=")===-1){
@@ -43,7 +75,7 @@ var
 			console.error("Error: The input does not containt valid JSON-stat or the filters are not valid.");
 			process.exit(1);
 		}else{
-			return JSON.stringify(subset.__tree__);
+			return stringify(subset);
 		}
 	}
 ;

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jsonstat-conv",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"description": "JSON-stat Command Line Conversion Tools",
 	"homepage": "https://github.com/badosa/JSON-stat-conv",
 	"keywords": [
@@ -18,7 +18,8 @@
 		"jsonstat2object": "jsonstat2object",
 		"jsonstat2csv": "jsonstat2csv",
 		"csv2jsonstat": "csv2jsonstat",
-		"jsonstatslice": "jsonstatslice"
+		"jsonstatslice": "jsonstatslice",
+		"jsonstat2jsonstat": "jsonstat2jsonstat"
 	},
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"