diff --git a/plugins/tiddlywiki/multiwikiserver/docs/readme.tid b/plugins/tiddlywiki/multiwikiserver/docs/readme.tid index 4a027016c..21d5799ce 100644 --- a/plugins/tiddlywiki/multiwikiserver/docs/readme.tid +++ b/plugins/tiddlywiki/multiwikiserver/docs/readme.tid @@ -16,8 +16,14 @@ tiddlywiki editions/multiwikiserver --listen Then visit the sample wikis in a browser: -* http://127.0.0.1:8080/wiki/recipe-rho -* http://127.0.0.1:8080/wiki/recipe-sigma +* http://127.0.0.1:8080/wiki/recipe-rho - bag-alpha, bag-beta +* http://127.0.0.1:8080/wiki/recipe-sigma - bag-alpha, bag-gamma +* http://127.0.0.1:8080/wiki/recipe-tau - bag-alpha +* http://127.0.0.1:8080/wiki/recipe-upsilon - bag-alpha, bag-gamma, bag-beta + +Note that changes are written to the topmost bag in a recipe. + +Note that until syncing is improved it is necessary to use "Get latest changes from the server" to speed up propogation of changes. To run the tests: diff --git a/plugins/tiddlywiki/multiwikiserver/modules/init.js b/plugins/tiddlywiki/multiwikiserver/modules/init.js index 8b0624ece..2a9acd7cb 100644 --- a/plugins/tiddlywiki/multiwikiserver/modules/init.js +++ b/plugins/tiddlywiki/multiwikiserver/modules/init.js @@ -49,11 +49,11 @@ exports.startup = function() { $tw.sqlTiddlerStore.createRecipe("recipe-rho",["bag-alpha","bag-beta"]); $tw.sqlTiddlerStore.createRecipe("recipe-sigma",["bag-alpha","bag-gamma"]); $tw.sqlTiddlerStore.createRecipe("recipe-tau",["bag-alpha"]); + $tw.sqlTiddlerStore.createRecipe("recipe-upsilon",["bag-alpha","bag-gamma","bag-beta"]); // Save tiddlers - $tw.sqlTiddlerStore.saveTiddler({title: "Another Tiddler",text: "I'm in alpha",tags: "one two three"},"bag-alpha"); - $tw.sqlTiddlerStore.saveTiddler({title: "Hello There",text: "I'm in alpha as well",tags: "one two three"},"bag-alpha"); - $tw.sqlTiddlerStore.saveTiddler({title: "Hello There",text: "I'm in beta",tags: "four five six"},"bag-beta"); - $tw.sqlTiddlerStore.saveTiddler({title: "Hello There",text: "I'm in gamma",tags: "seven eight nine"},"bag-gamma"); + $tw.sqlTiddlerStore.saveTiddler({title: "$:/SiteTitle",text: "Bag Alpha"},"bag-alpha"); + $tw.sqlTiddlerStore.saveTiddler({title: "$:/SiteTitle",text: "Bag Beta"},"bag-beta"); + $tw.sqlTiddlerStore.saveTiddler({title: "$:/SiteTitle",text: "Bag Gamma"},"bag-gamma"); }; })(); diff --git a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js index 6a9a0d881..570ad4556 100644 --- a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js +++ b/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js @@ -23,9 +23,10 @@ describe("SQL tiddler store", function() { sqlTiddlerStore.createBag("bag-alpha"); sqlTiddlerStore.createBag("bag-beta"); sqlTiddlerStore.createBag("bag-gamma"); - sqlTiddlerStore.createRecipe("recipe-rho",["bag-gamma"]); sqlTiddlerStore.createRecipe("recipe-rho",["bag-alpha","bag-beta"]); sqlTiddlerStore.createRecipe("recipe-sigma",["bag-alpha","bag-gamma"]); + sqlTiddlerStore.createRecipe("recipe-tau",["bag-alpha"]); + sqlTiddlerStore.createRecipe("recipe-upsilon",["bag-alpha","bag-gamma","bag-beta"]); // Tear down afterAll(function() { // Close the database