[Bps-public-commit] r14421 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jul 23 01:44:13 2008
New Revision: 14421

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/CLI/Command/Search.pm
   Prophet/trunk/lib/Prophet/CLI/Command/Show.pm

Log:
 r64796 at onn:  sartak | 2008-07-23 01:44:08 -0400
 Remove the HTML bits from search and show


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Search.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Search.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Search.pm	Wed Jul 23 01:44:13 2008
@@ -43,20 +43,7 @@
     my $search_cb = $self->get_search_callback();
     $records->matching($search_cb);
 
-    my $display_method = $self->has_arg('html')
-                       ? 'display_html'
-                       : 'display_terminal';
-    $self->$display_method($records);
-}
-
-# XXX: this should go away once we have publish-as-html
-sub display_html {
-    my $self = shift;
-    my $records = shift;
-
-    require Prophet::Server::View;
-    Template::Declare->init(roots => ['Prophet::Server::View']);
-    print Template::Declare->show('record_table' => $records);
+    $self->display_terminal($records);
 }
 
 sub display_terminal {

Modified: Prophet/trunk/lib/Prophet/CLI/Command/Show.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Show.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Show.pm	Wed Jul 23 01:44:13 2008
@@ -9,19 +9,11 @@
 
     my $record = $self->_load_record;
 
-    # XXX: this should go away once we have publish-as-html
-    if ($self->has_arg('html')) {
-        require Prophet::Server::View;
-        Template::Declare->init(roots => ['Prophet::Server::View']);
-        print Template::Declare->show('record' => $record);
-    }
-    else {
-        print $self->stringify_props(
-            record => $record,
-            batch   => $self->has_arg('batch'),
-            verbose => $self->has_arg('verbose'),
-        );
-    }
+    print $self->stringify_props(
+        record => $record,
+        batch   => $self->has_arg('batch'),
+        verbose => $self->has_arg('verbose'),
+    );
 }
 
 =head2 stringify_props