Minor corrections and refactorings

This commit is contained in:
Jeremy Ruston 2011-11-30 19:35:01 +00:00
parent 6202e64eaa
commit 4b3548e7bb
3 changed files with 17 additions and 13 deletions

View File

@ -21,6 +21,9 @@ as a TiddlyWiki quoted string (eg, "one [[two three]]").
"use strict";
var utils = require("./Utils.js"),
ArgParser = require("./ArgParser.js").ArgParser;
var Tiddler = function(/* tiddler,fields */) {
this.fields = {};
for(var c=0; c<arguments.length; c++) {

View File

@ -4,8 +4,7 @@ Functions concerned with parsing representations of tiddlers
"use strict";
var ArgParser = require("./ArgParser.js").ArgParser,
utils = require("./Utils.js"),
var utils = require("./Utils.js"),
util = require("util");
var tiddlerInput = exports;
@ -71,16 +70,17 @@ tiddlerInput.parseTiddlerFileByMimeType = {
return [fields];
},
"application/json": function(text,fields) {
var tiddlers = JSON.parse(text);
var result = [];
var tiddlers = JSON.parse(text),
result = [],
getKnownFields = function(tid) {
var fields = {};
"title text created creator modified modifier type tags".split(" ").forEach(function(value) {
fields[value] = tid[value];
});
return fields;
};
for(var t=0; t<tiddlers.length; t++) {
var tid = tiddlers[t],
fields = {};
// Just whitelist the fields we know that we want
"title text created creator modified modifier type tags".split(" ").forEach(function(value) {
fields[value] = tid[value];
});
result.push(fields);
result.push(getKnownFields(tiddlers[t]));
}
return result;
}

View File

@ -9,7 +9,8 @@ var TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
http = require("http"),
fs = require("fs"),
url = require("url"),
path = require("path");
path = require("path"),
util = require("util");
var filename = process.argv[2];
@ -21,4 +22,4 @@ http.createServer(function(request, response) {
});
}).listen(8000);
sys.puts("Server running at http://127.0.0.1:8000/");
util.puts("Server running at http://127.0.0.1:8000/");