Pimki 1.4.092 → 1.5.092

data/app/views/wiki/adv_search.rhtml

@@ -0,0 +1,61 @@
+<% @title = "Advanced Search Options" %>
+<%= sub_template "top" %>
+
+<h3>Advanced Search Options:</h3>
+
+<form action="../search/" method="post">
+<table>
+  <tr>
+    <td>Search string:</td>
+    <td colspan="3"><input type='text' name='query' id='query' size='60' /></td>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
+  <tr>
+    <td colspan="3"><input type='checkbox' name='case'>Case sensitive</input></td>
+  </tr>
+  <tr>
+    <td>Search string as</td>
+    <td><input type='Radio' name='expression' value='regex' checked>Regular Expression</input></td>
+    <td><input type='Radio' name='expression' value='all'>All words</input></td>
+    <td><input type='Radio' name='expression' value='exact'>Exact phrase</input></td>
+  </tr>
+  <tr>
+    <td>Search in</td>
+    <td><input type='Radio' name='where' value='all' checked>Pages &amp; Bliki entries</input></td>
+    <td><input type='Radio' name='where' value='pages'>Pages only</input></td>
+    <td><input type='Radio' name='where' value='bliki'>Bliki entries only</input></td>
+  </tr>
+  <tr>
+    <td>Search on</td>
+    <td><input type='Radio' name='fields' value='both' checked>Pages names &amp; contents</input></td>
+    <td><input type='Radio' name='fields' value='names'>Page names only</input></td>
+    <td><input type='Radio' name='fields' value='contents'>Page contents only</input></td>
+  </tr>
+  <tr>
+    <td colspan="2">Limit search to selected categories:</td>
+    <td colspan="2"><select id="category" name="category" size="3" multiple style="width:200">
+        <option value="noselect">------------
+        <% for category in web.categories %>
+          <option value="<%= category %>"><%= category %>
+        <% end %>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">Limit search to selected authors:</td>
+    <td colspan="2"><select id="author" name="author" size="3" multiple style="width:200">
+        <option value="noselect">------------
+        <% for author in web.authors %>
+          <option value="<%= author %>"><%= author %>
+        <% end %>
+      </select>
+  </tr>
+  <tr>
+    <td><input type='submit' value='Search'></td>
+  </tr>
+</table>
+</form>
+
+
+<%= sub_template "bottom" %>
+

data/app/views/wiki/bliki.rhtml

@@ -79,9 +79,9 @@ function validateSelection() {
 </script>
 
 <h2>Apply filter:</h2>
+<form class="navigation" action="bliki" action="post" onSubmit="return validateSelection();">
 <table><tr>
   <td>Show only pages authored by:</td> 
-  <form class="navigation" action="bliki" action="post" onSubmit="return validateSelection();">
   <td>
   <select id="sel_author" name="authorname" size="1">
     <option value="noselect">------------
@@ -94,8 +94,10 @@ function validateSelection() {
   <td>Regexp search on all entries:</td>
   <td><input type="text" id="search_regex" name="regexp"></td>
   <td><input type="submit" name="Search" value="Search"></td>
-  </form>
+</tr><tr>
+  <td>Or go to <a href='../adv_search/'>Advanced Search</a></td>
 </tr></table>
+</form>
 
 <%= sub_template "bottom" %>
 

data/app/views/wiki/bliki_revision.rhtml

@@ -63,7 +63,7 @@
   
   <% if @page.revisions.length > 1 %>
     <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+      | <a href="#" onClick="toggleChanges(); return false;">Show changes</a>
     </span>
     <span id="hide_changes" style="display: none">
       | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>

data/app/views/wiki/edit.rhtml

@@ -1,8 +1,8 @@
 <% 
   @title = "Editing #{@page.plain_name}"
-  @content_width = 800
+  @content_width = 810
   @hide_navigation = true
-  @style_additions = "#Container, #Content {padding-left:100px;}"
+  @style_additions = "#Content, #Container {padding-left:100px;}"
 %>
 <%= sub_template "top" %>
 
@@ -10,6 +10,7 @@
 
 <%= render_markup_help %>
 
+<div id='main'>
   <form style="float:right" id="editForm" action="../save/<%= @page.name %>" method="post" onSubmit="cleanAuthorName();">
   <p>
       <textarea name="content" style="width: 550px; height: 430px"><%= @page.content %></textarea>
@@ -31,7 +32,7 @@
       | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
   </p>
   </form>
-
+</div>
 <script language="JavaScript1.2">
 function cleanAuthorName() {
   if (document.getElementById('authorName').value == "") {

data/app/views/wiki/edit_menu.rhtml

@@ -24,7 +24,7 @@
 </p>
 <p>For the above options you can choose if you want to limit the number of results. Enter the number of items you wish, or 0 for all items: <input type="textfield" size="20", name="limit" value="<%= @list_limit %>" /></p>
 <p><input type="radio" name="type" value="user" <%= 'checked' if @menu_type == 'user' %>>Or just write your own menu contents (as a regular Wiki page):
-    <textarea name="content" style="width: 400px; height: 300px"><%= @menu_content.content %></textarea>
+    <textarea name="content" style="width: 400px; height: 300px"><%= !@menu_content.nil? && Page === @menu_content ? @menu_content.content : @menu_content  %></textarea>
 </p>
 
 <% if Page === @menu_content && @menu_content.revisions.length > 1

data/app/views/wiki/edit_web.rhtml

@@ -1,6 +1,8 @@
 <% @title = "Edit Web" %>
 <%= sub_template "top" %>
 
+<%= "<p style='font-size: 15px; font-variant: italic; color: red;'>#{@message}</span>" if @message %>
+
 <form action="../update_web" id="setup" method="post" onSubmit="cleanAddress(); return validateSetup()">
   <h2 style="margin-bottom: 3px">Name and address</h2>
   <div class="help">
@@ -54,6 +56,15 @@
     <textarea id="additionalStyle" style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" name="additional_style"><%= @web.additional_style %></textarea>
   </div>
 
+  <h2 style="margin-bottom: 3px">Persistence Options (all webs)</h2>
+  <div class="help">
+    You can set how often to take snapshots of the web data. (All incremental changes are saved as command_logs; snapshots supercede those with the full data). Recommended values are 1-2 hours if you turn the web on and off often, or 24-48 hours if this is a long running service.<br />
+    Snapshots will not be taken if there are no incremental changes (in the form of command_logs). You can always force a snapshot in the administrative tasks below.
+  </div>
+  <div class="inputBox">
+    <input align='right' type="text" name="snapshots_interval" value='<%= @snapshot_interval %>' /> hour(s).
+  </div>
+
   <h2 style="margin-bottom: 3px">Password protection for this web (<%= @web.name %>)</h2>
   <div class="help">
     This is the password that visitors need to login to view and edit this web. Setting the password to nothing will remove the password protection.
@@ -148,27 +159,29 @@
       <input type="password" id="system_password" name="system_password">
       and
       <input type="submit" value="Update Web">
-      <br/><br/>
-      ...or forget changes and <a href="/new_web/">create a new web</a>
     </small>
   </p>
-
 </form>
 
 <br/>
-<h1>Other administrative tasks</h1>
-
-<form action="../remove_orphaned_pages" id="remove_orphaned_pages" method="post">
+<h2>Other administrative tasks</h2>
+<form action="../administrate" id="administrate" method="post">
+  <p style="font-size: 10px;">
+      Clean up by entering system password
+      <input type="password" id="system_password" name="system_password">
+      and...
+   </p>
+   <p align='right'>
+     <input type="submit" name='action' value="Delete Orphan Pages"><br/>
+     <input type="submit" name='action' value="Clear Render Cache"><br/>
+     <input type="submit" name='action' value="Force Data Snapshot"><br/>
+     <input type="submit" name='action' value="Clean Storage"><br/>
+  </p>
+</form>
 
-<p align="right">
-  <small>
-    Clean up by entering system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Delete Orphan Pages">
-  </small>
-</p>
+<p style='font-size: 10px;'>...or forget all your changes and <a href="/new_web/">create a new web</a>.</p>
 
+      
 <script>
 function proposeAddress() {
   document.getElementById('address').value =

data/app/views/wiki/page.rhtml

@@ -36,7 +36,7 @@
 
   <% if @page.revisions.length > 1 %>
     <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+      | <a href="#" onClick="toggleChanges(); return false;">Show changes</a>
     </span>
     <span id="hide_changes" style="display: none">
       | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>

data/app/views/wiki/revision.rhtml

@@ -23,6 +23,15 @@
 
 <div class="navigation">
 
+  <% if @revision.previous_revision %>
+    <a href="../revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Back in time</a>
+    (<%= @revision.previous_revision.number + 1 %> more)
+  <% end %>
+
+  <% if @revision.next_revision && @revision.previous_revision %>
+    |
+  <% end %>
+
   <% if @revision.next_revision %>
     <% if @revision.next_revision.number < (@page.revisions.length - 1) %>
       <a href="../revision/<%= @page.name %>?rev=<%= @revision.next_revision.number %>" class="navlink">
@@ -33,20 +42,11 @@
     (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
   <% end %>
 
-  <% if @revision.next_revision && @revision.previous_revision %>
-    |
-  <% end %>
-
-  <% if @revision.previous_revision %>
-    <a href="../revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Back in time</a>
-    (<%= @revision.previous_revision.number + 1 %> more)
-  <% end %>
-
-  | <a href="../show/<%= @page.name %>" class="navlink">See current</a>
+  | <a href="../show/<%= @page.name %>" class="navlink">Show current</a>
 
   <% if @revision.previous_revision %>
     <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+      | <a href="#" onClick="toggleChanges(); return false;">Show changes</a>
     </span>
     <span id="hide_changes" style="display: none">
       | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
@@ -60,6 +60,12 @@
       | Linked from: <%= @page.references.collect { |ref| "<a href='#{ref.name}'>#{ref.name}</a>" }.join(", ") %>
     </small>
   <% end %>
+
+  <% if @page.bliki_references.length > 0 %>
+    <small>
+      <br />| Bliki Linked from: <%= @page.bliki_references.collect { |ref| link_to_bliki(ref) }.join(", ") %>
+    </small>
+  <% end %>
 </div>
 
 <script language="Javascript">

data/app/views/wiki/rollback.rhtml

@@ -11,6 +11,9 @@
   <textarea name="content" style="font-size: 12px; width: 450px; height: 500px"><%= @revision.content %></textarea>
 </p>
 <p>
+    <% if @web.check_pass_on_edit %>
+      <p>Please enter edit password: <input type="password" name="password" id="password"></p>
+    <% end %>
     <input type="submit" value="Update"> as 
     <input type="text" name="author" id="authorName" value="<%= @author %>" 
         onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">

data/app/views/wiki/search.rhtml

@@ -1,7 +1,10 @@
-<% @title = @results.length > 0 ? "#{@results.length} pages contains \"#{@params["query"]}\"" : "No pages contains \"#{@query}\"" %><%= sub_template "top" %>
+<% num_results = @results.length + @bliki_results.length
+  @title = num_results > 0 ? "#{num_results} page#{ 's' unless num_results == 1} contain#{ 's' if num_results == 1} \"#{@params["query"]}\"" : "No pages contains \"#{@query}\""
+%>
+<%= sub_template "top" %>
 
 <% if @results.length > 0 %>
-  <h3>Matching Pages:</h3>
+  <h3><%= @results.length %> Matching Page<%= 's' unless @results.length == 1 %>:</h3>
   <ul>
     <% for page in @results %>
       <li><a href="../show/<%= page.name %>"><%= page.plain_name %></a><br />
@@ -20,7 +23,7 @@
   </ul>
 <% end %>
 <% if @bliki_results.length > 0 %>
-  <h3>Matching Bliki Entries:</h3>
+  <h3><%= @bliki_results.length %> Matching Bliki Entr<%= @bliki_results.length == 1 ? 'y' : 'ies' %>:</h3>
   <ul>
     <% for entry in @bliki_results %>
       <li><a href="../bliki_revision/<%= entry.name %>?rev=<%= entry.revisions.size-1 %>"><%= entry.name %></a><br />

data/libraries/action_controller_servlet.rb

@@ -6,11 +6,11 @@ include WEBrick
 require 'view_helper'
 
 class FavIconHandler < HTTPServlet::AbstractServlet
+  LOCAL_PATH = File.join(File.dirname(__FILE__), '../favicon.png')
+  ICO_FILE = File.open(LOCAL_PATH, "rb") { |f| f.read }
   def do_GET(req, res)
-    ico = File.read(File.join(Dir.pwd, 'favicon.png'))
     res['content-type'] = 'image/png'
-    res['content-length'] = ico.size
-    res.body = ico
+    res.body = ICO_FILE
   end
 end
 
@@ -171,8 +171,13 @@ class ActionControllerServlet < HTTPServlet::AbstractServlet
       begin
         ERB.new(IO.readlines(template_path).join).result(binding)
       rescue Exception => detail
-        @logger.error "Processing #{template_path}"
+        @logger.error "Error processing #{template_path}"
+        line = /:(\d+):/.match(detail.backtrace[0]).captures[0].to_i - 172
+        @logger.error "On Line: #{line}"
         @logger.error detail
+        src = ERB.new(IO.readlines(template_path).join).src
+        lines = src.split("\n")[(line-1)..(line+1)]
+        @logger.error "\n\n" + lines.join("\n\n") + "\n\n"
         raise
       end
     end

data/libraries/madeleine/automatic.rb

@@ -72,7 +72,7 @@ module Madeleine
 # keeping track of which methods are read only
 #
       def self.included(klass)
-        class <<klass
+        class << klass
           alias_method :_old_new, :new
 
           def new(*args, &block)

data/libraries/madeleine_service.rb

@@ -8,6 +8,8 @@ class MadeleineService
   include Madeleine::Automatic::Interceptor
 
   @@storage_path = self.name.downcase + "_storage"
+  automatic_read_only :snapshot_interval_hours, :take_snapshot, :clean_old_snapshots,
+                      :restart, :request_stop
 
   class << self
     def storage_path
@@ -19,25 +21,56 @@ class MadeleineService
     end
 
     def instance
-      @system = MadeleineServer.new(self).system if @system.nil?
+      if @system.nil?
+        @madeleine_server = MadeleineServer.new(self) 
+        @system = @madeleine_server.system
+      end
       @system
     end
     
     def restart
-      MadeleineServer.clean_storage(self)
-      @system = MadeleineServer.new(self).system
+      MadeleineServer.delete_storage(self)
+      @system = nil
+      instance
+    end
+
+    def clean_old_snapshots
+      instance
+      @madeleine_server.clean_storage(self)
+    end
+    
+    def take_snapshot
+      instance
+      @madeleine_server.force_snapshot
+    end
+    
+    def snapshot_interval_hours
+      instance
+      @madeleine_server.snapshot_interval.div MadeleineServer::ONE_HOUR rescue 1
     end
+    
+    def snapshot_interval_hours= hours
+      instance
+      @madeleine_server.snapshot_interval = hours.to_i * MadeleineServer::ONE_HOUR rescue MadeleineServer::ONE_HOUR
+    end
+
+    def request_stop
+      instance
+      @madeleine_server.request_stop
+    end
+    
   end
 end
 
+require 'fileutils'
 class MadeleineServer
-  SNAPSHOT_INTERVAL   = 30  * 60 * 24 # Each day
-  AUTOMATIC_SNAPSHOTS = true
+
+  attr_reader :storage_path
+  attr_accessor :snapshot_interval
 
   # Clears all the command_log and snapshot files located in the storage directory, so the
   # database is essentially dropped and recreated as blank. Used in tests.
-  def self.clean_storage(service)
-    require 'fileutils'
+  def self.delete_storage(service)
     if (File.directory?(service.storage_path))
       FileUtils.rm_rf(Dir[service.storage_path + '/*.command_log'])
       FileUtils.rm_rf(Dir[service.storage_path + '/*.snapshot'])
@@ -45,24 +78,86 @@ class MadeleineServer
       FileUtils.mkdir_p(service.storage_path)
     end
   end
+  
+  def clean_storage(service)
+    force_snapshot
+    command_logs = Dir[service.storage_path + '/*.command_log']
+    raise 'Error: existing command_logs after snapshot' unless command_logs.empty?
+
+    snapshots = Dir[service.storage_path + '/*.snapshot']
+    FileUtils.rm_rf(snapshots.sort[0..-2])
+  end
+  
 
   def initialize(service)
+    @storage_path = service.storage_path
+    @snapshot_interval = ONE_HOUR
     marshaller = Madeleine::ZMarshal.new()
     @server = Madeleine::Automatic::AutomaticSnapshotMadeleine.new(service.storage_path, 
         marshaller) { service.new }
-    start_snapshot_thread if AUTOMATIC_SNAPSHOTS
+    start_snapshot_thread
   end
 
   def system
     @server.system
   end
 
+  def command_log_present?
+    not Dir[storage_path + '/*.command_log'].empty?
+  end
+
+  def force_snapshot
+    begin
+      hours_since_last_snapshot = 0
+      @server.take_snapshot
+    rescue => e
+      sleep(ONE_MINUTE)
+      retry
+    end
+  end
+  
+  
+  ONE_MINUTE = 60
+  ONE_HOUR   = ONE_MINUTE * 60
+  MAX_INTERVAL_HOURS = 24 * 2
+
   def start_snapshot_thread
-    Thread.new(@server) {
-      while true
-        sleep(SNAPSHOT_INTERVAL)
-        @server.take_snapshot
+    @snapshot_thread = Thread.new(@server) {
+      hours_since_last_snapshot = 0
+      while not @request_stop
+        sleep(snapshot_interval)
+        hours_since_last_snapshot += snapshot_interval.div ONE_HOUR
+        begin
+          # Take a snapshot if there is a command log
+          if command_log_present? or hours_since_last_snapshot > MAX_INTERVAL_HOURS
+            #  'Taking a Madeleine snapshot'
+            @server.take_snapshot
+            hours_since_last_snapshot = 0
+            puts "[#{DateTime.now.strftime '%F %T'}] INFO Taking snapshot"
+          else
+            puts "[#{DateTime.now.strftime '%F %T'}] INFO Skipping snapshot (no command logs)"
+          end
+        rescue => e
+          # wait for a minute (not to spoof the log with the same error)
+          # and go back into the loop, to keep trying
+          sleep(ONE_MINUTE)
+          retry
+        end
       end
     }
   end
+  
+  def request_stop
+    begin
+      @request_stop = true
+      if @snapshot_thread and @snapshot_thread.alive?
+        @snapshot_thread.wakeup
+        @snapshot_thread.join
+      end
+      @server.take_snapshot if command_log_present?
+    rescue => detail
+      puts detail
+    end
+  end
+
 end