Add support for pattern stages

app/controllers/map_controller.rb

@@ -1,4 +1,14 @@
-# map_controller v0.2
+# map_controller v0.3
+
+# Changes from v0.2:
+#   Add support for Pattern stages
+#   Further WQLize and simplify db searches
+#   Assume all Patterns have a +stage card.  This should be safe
+#     since creating a Pattern creates a +stage card.  The
+#     assumption eliminates the need for a separate search to
+#     show Patterns that did not appear in a +related patterns card,
+#     and thus also eliminates the need for the "done" checklist
+#     used in that search.
 
 # Changes from v0.1:
 #   Derive from ApplicationController instead of ActionController::Base
@@ -13,22 +23,14 @@ class MapController < ApplicationController
 
   def show
     content = []
-    done = {}
-    cards = Card.all(:include => :current_revision, 
-      :conditions => "name LIKE '%+related patterns' AND NOT trash")
-    cards.each do |card|
-      name = card.name.sub(/\+related patterns$/,'')
+    Card.search(:right=>'related patterns').each do |card|
+      pattern = card.name.trunk_name
       card.current_revision.content.scan(/\[\[([^\]]*)\]\]/) do |related|
-        content << name+"~->~"+related[0]
-        done[name] = true
-        done[related[0]] = true
+        content << pattern+"~->~"+related[0]
       end
     end
-    cards = Card.search(:type=>'Pattern')
-    cards.each do |card|
-      if (!done[card.name])
-        content << card.name
-      end
+    Card.search(:right=>'stage').each do |card|
+      content << card.name.trunk_name+"~.stage="+card.content
     end
     @content = content.join("\n")
   end