Changeset 2574

Timestamp:

10/09/07 03:30:24 (12 months ago)

Author:

JeremyRuston

Message:

Added tiddler filtering mechanism (ticket #381)

Location:

Trunk/core/js

Files:

• Config.js (modified) (1 diff)
• FileAdaptor.js (modified) (3 diffs)
• Macros.js (modified) (1 diff)
• TiddlyWiki.js (modified) (1 diff)
• main.js (modified) (1 diff)

Trunk/core/js/Config.js

@@ -106 +106 @@
                 orphans: {},
                 shadowed: {},
-                touched: {}
+                touched: {},
+                filter: {}
         },
         closeAll: {},

Trunk/core/js/FileAdaptor.js

@@ -90 +90 @@
 
 // Gets the list of tiddlers within a given workspace
+//#   context - passed on to callback function
+//#   userParams - user parameters passed through to the callback function
 //#   callback - function to be called on completion
-//#   context - passed on to callback function
+//#   filter - filter expression
 //# Return value is true if the request was successfully issued,
 //#   or an error description string if there was a problem
@@ -99 +101 @@
 //#   context - parameters as originally passed into the getTiddlerList function
 //#   tiddlerList - array of objects describing each tiddler
-FileAdaptor.prototype.getTiddlerList = function(context,userParams,callback)
+FileAdaptor.prototype.getTiddlerList = function(context,userParams,callback,filter)
 {
         if(!this.store)
@@ -105 +107 @@
         if(!context)
                 context = {};
-        context.tiddlers = [];
-        this.store.forEachTiddler(function(title,tiddler)
-                {
-                var t = new Tiddler(title);
-                t.text = tiddler.text;
-                t.modified = tiddler.modified;
-                t.modifier = tiddler.modifier;
-                t.fields['server.page.revision'] = tiddler.modified.convertToYYYYMMDDHHMM();
-                t.tags = tiddler.tags;
-                context.tiddlers.push(t);
-                });
+        context.tiddlers = this.store.filterTiddlers(filter);
+        for(var t=0; t<context.tiddlers.length; t++) {
+                context.tiddlers[t].fields['server.page.revision'] = context.tiddlers[t].modified.convertToYYYYMMDDHHMM();
+        }
         context.status = true;
         window.setTimeout(function() {callback(context,userParams);},10);

Trunk/core/js/Macros.js

@@ -59 +59 @@
 {
         return store.getTouched();
+};
+
+config.macros.list.filter.handler = function(params)
+{
+        var filter = params[1];
+        var results = [];
+        if(filter) {
+                var tiddlers = store.filterTiddlers(filter);
+                for(var t=0; t<tiddlers.length; t++)
+                        results.push(tiddlers[t].title);
+        }
+        return results;
 };
 

Trunk/core/js/TiddlyWiki.js

@@ -531 +531 @@
 };
 
+// Filter a list of tiddlers
+//#   filter - filter expression (eg "tidlertitle [[multi word tiddler title]] [tag[systemConfig]]")
+//# Returns an array of Tiddler() objects that match the filter expression
+TiddlyWiki.prototype.filterTiddlers = function(filter)
+{
+        var results = [];
+        if(filter) {
+                var re = /(\w+)|(?:\[([ \w]+)\[([ \w]+)\]\])|(?:\[\[([ \w]+)\]\])/mg;
+                var match = re.exec(filter);
+                while(match) {
+                        if(match[1]) {
+                                //# matches (eg) text
+                                var tiddler = this.fetchTiddler(match[1])
+                                if(tiddler)
+                                        results.push(tiddler);
+                        } else if(match[2]) {
+                                //# matches (eg) [text[more text]]
+                                if(match[2]=="tag") {
+                                        this.forEachTiddler(function(title,tiddler) {
+                                                if(tiddler.isTagged(match[3]))
+                                                        results.push(tiddler);
+                                        });
+                                }
+                        } else if(match[4]) {
+                                //# matches (eg) [[tiddler title]]
+                                var tiddler = this.fetchTiddler(match[4])
+                                if(tiddler)
+                                        results.push(tiddler);
+                        }                       
+                        match = re.exec(filter);
+                }
+        } else {
+                this.forEachTiddler(function(title,tiddler) {results.push(tiddler);});
+        }
+        return results;
+};
+

Trunk/core/js/main.js

@@ -83 +83 @@
         invokeParamifier(params,"onstart");
         if(story.isEmpty()) {
-                var defaultParams = store.getTiddlerText("DefaultTiddlers").parseParams("open",null,false);
-                invokeParamifier(defaultParams,"onstart");
+                var tiddlers = store.filterTiddlers(store.getTiddlerText("DefaultTiddlers"));
+                for(var t=0; t<tiddlers.length; t++) {
+                        story.displayTiddler("bottom",tiddlers[t].title);
+                }
         }
         window.scrollTo(0,0);