Changeset 112

Timestamp:

09/25/06 18:02:54 (2 years ago)

Author:

evdb

Message:

Bug fixes

Files:

• trunk/httpd-live.conf (modified) (1 diff)
• trunk/lib/PrlMnks/Daemon.pm (modified) (7 diffs)
• trunk/lib/PrlMnks/Template.pm (modified) (1 diff)
• trunk/t/plugin/search/search.t (modified) (2 diffs)
• trunk/t/template/template.t (modified) (1 diff)
• trunk/templates/rss/item.mason (modified) (2 diffs)
• trunk/templates/rss/list.mason (modified) (1 diff)
• trunk/templates/search/search.mason (modified) (2 diffs)

trunk/httpd-live.conf

@@ -1 @@
-egg.ecclestoad.co.uk
+*:80
-
-
-
-
+
-    ServerAlias www.prlmnks.org
-
-
-
-
-
+
+
-
-    CustomLog /home/evdb/sites/prlmnks/shared/logs/access_log combined
+    ErrorLog  /home/evdb/sites/prlmnks/shared/logs/error_log
+    LogLevel  warn
+
+
+    <Location />
+        SetOutputFilter DEFLATE
+
+        BrowserMatch ^Mozilla/4 gzip-only-text/html
+        BrowserMatch ^Mozilla/4\.0[678] no-gzip
+        BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html
+
+        SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
+
+        Header append Vary User-Agent env=!dont-vary
+    </Location>
-
-</VirtualHost>

trunk/lib/PrlMnks/Daemon.pm

@@ -47 +47 @@
-
-        if ( $self->fetch_node_by_id($high_id) ) {
+            $self->debug("Fetched $high_id\n");
-            $success_count++;
-            $high_id++;
@@ -52 +53 @@
-
-        if ( $low_id && $self->fetch_node_by_id($low_id) ) {
+            $self->debug("Fetched $low_id\n");
-            $success_count++;
-            $low_id--;
@@ -68 +70 @@
-    return if $self->delay_for_id($id);
-
-
+\t
-
-    # If the node is already in the database then return true
-    return 1 if PrlMnks::Node->have_db_entry_for_id($id);
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -91 +103 @@
-
-    if ( $node && !$node->is_found ) {    # don't store 404's
-
+
+
+
-        $self->set_delay_for_id( PrlMnks->conf('scrape_long_interval'),
-            $actual_id );
@@ -99 +113 @@
-    # write this xml to a file.
-    my $xml_file_name = PrlMnks::Node->xml_file_for_id($actual_id);
-    $self->debug("writing xml to '$xml_file_name'\n");
-    PrlMnks::Utils->write_to_file( $xml_file_name, \$node_xml );
+    $self->debug("\t\twrote xml for $actual_id to file\n");
-
-    return 1 unless $node;                # broken XML.
@@ -106 +120 @@
-
-    die "Could not save to db $node_xml" unless $node->save_to_db;
+    $self->debug("\t\tSaved xml for $actual_id to db\n");
-
-    $self->run_plugins(
@@ -111 +126 @@
-        node   => $node,
-    );
+    $self->debug("\t\tRan plugins for $actual_id\n");
-
-    return 1;

trunk/lib/PrlMnks/Template.pm

@@ -162 +162 @@
-}
-
+sub base_url {
+    my $class = shift;
+    my @args  = @_;
+
+    my $url = "http://";
+    $url .= $ENV{SERVER_NAME};
+    $url .= ":$ENV{SERVER_PORT}"
+      if $ENV{SERVER_PORT}
+      && $ENV{SERVER_PORT} != 80;
+
+    return join '/', $url, map { uri_escape($_) } @args;
+}
+
-1;

trunk/t/plugin/search/search.t

@@ -15 +15 @@
-}
-
-# {    # check that there are matches for 'scrabble'.
-#     my $matches = PrlMnks::Plugin::Search->_get_matches('scrabble');
-#     is_deeply $matches, {}, "no matches found";
-# }
-
-setup_scrabble_data( plugin => 'PrlMnks::Plugin::Search' );
-ok -e PrlMnks::Plugin::Search->search_index, "search index created";
-
-# check that there are matches for 'scrabble'.
-
+
+
-my $results = $search_data->{results};
-is scalar @$results, 1, "one matches found";
@@ -30 +26 @@
-my $hit = $results->[0];
-is $hit->{node_id}, 508221, "Got correct node";
+
+# Check that some searches work as expected.
+my $mech = test_mech();
+
+# no search
+$mech->get_ok( '/search/', 'get /search/' );
+
+# search for 'scrabble' - 16 matches
+$mech->submit_form( form_name => '', fields => { q => 'scrabble' } );
+$mech->content_contains( '1 to 16 of 16', 'got 16 results' );

trunk/t/template/template.t

@@ -24 +24 @@
-
-is $$out_ref, $expected, "Templating works.";
+
+# Check that the base_url works.
+$ENV{SERVER_NAME} = 'server_name';
+$ENV{SERVER_PORT} = 1234;
+is PrlMnks::Template->base_url( 'test', 'foo', 'bar' ),
+  "http://server_name:1234/test/foo/bar", "Got the correct url";
+
+$ENV{SERVER_NAME} = 'server_name';
+$ENV{SERVER_PORT} = 80;
+is PrlMnks::Template->base_url( 'test', 'foo', 'bar' ),
+  "http://server_name/test/foo/bar", "Got the correct url";

trunk/templates/rss/item.mason

@@ -16 +16 @@
-    $author_name =~ s{[^ -~]+}{}g;
-    
-"/html/$node_data->{node_id}.html"
+$t->base_url("html","$node_data->{node_id}.html")
-    
-</%perl>
@@ -22 +22 @@
-<item>
-    <title><% $title | h %> (<% $author_name | h %>)</title>
-
-
+| h 
+| h 
-
-    <description>

trunk/templates/rss/list.mason

@@ -15 +15 @@
-    <channel>
-        <title><% $title | h %></title>
-/html/<% $heading_node->{node_id} %>.html
+<% $t->base_url('html', "$heading_node->{node_id}.html" ) | h %>
-        <description>RSS feeds from perlmonks.org</description>
-        <language>en</language>

trunk/templates/search/search.mason

@@ -44 +44 @@
-    use List::MoreUtils qw( uniq );
-
-my $page_set = $vars->{page_set};
-
-
+if ( my $page_set = $vars->{page_set} ) {
+    
+    
-
-
+    
-
-
-
+    
+    
-
-
+    
-        
-
-
-
-
+    
+    
+    
+    
-
-
+    
-
-
+
+
-    }
-</%perl>        
@@ -90 +91 @@
-% }
-
-next_page = $vars->{page_set}->next_page
-#    <div class="search_pagination">
+page_set = $vars->{page_set}
+   if ( my $next_page = $vars->{page_set}->next_page ) {
-        <a href="<% $vars->{self_url} %>&amp;page=<% $next_page %>">next</a>
-#    </div>
+   }
-% }
-