Changeset 1889 for swish_website/src/search

Timestamp:

02/06/07 14:53:36 (2 years ago)

Author:

moseley

Message:

More updates getting ready to move to the new host
Combined the two search scripts into one.

Files:

• swish_website/src/search/.htaccess (deleted)
• swish_website/src/search/index.html (modified) (8 diffs)

swish_website/src/search/index.html

@@ -1 @@
-
-
+
+
+
-
-package SwishAPISearch;
-use strict;
-use warnings;
+use DateTime;
+
+
-
-######################################################################
-# Skeleton CGI script for searching a Swsih-e index with SWISH::API.
-
+t
-#
-# Copyright 2003, 2004 Bill Moseley - All rights reserved.
@@ -15 +19 @@
-#
-#######################################################################
+
+
+# Lookup hash for which metanames are defined
+our %METANAMES = (
+    title       => 'swishtitle',
+    name        => 'name',
+    email       => 'email',
+);
+
+our %PROPERTIES = (
+    name        => 'name',
+    email       => 'email',
+    title       => 'swishtitle',
+    rank        => 'swishrank',
+    date        => 'swishlastmodified',
+);
+
+our %REVERSE_SORT = (
+    swishrank           => 1,
+    swishlastmodified   => 1,
+);
+
+# Valid section metaname values -- to limit to sections of the site.
+our %SECTIONS = (
+    website     => 1,
+    devel       => 1,
+    docs        => 1,
+    archive     => 1,
+);
+
+
-
-use vars '$VERSION';
@@ -163 +198 @@
-    $instance->{request} = $request;
-
+    $instance->{cur_year} = (gmtime(time))[5] + 1900;
+
-    $instance->{rooturl} = '[% site.url.root %]';
-
@@ -169 +206 @@
-    if ( $request->{query} ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -188 +226 @@
-    print $fill_in_object->fill( scalarref => $output, fobject => $cgi );
-
+    warn sprintf("Query=[%s] Hits=[%d]\n",
+        $instance->{request}->{swish_query} || '', 
+        $instance->{result}->{hits} || 0 );
+
-    delete $instance->{request};  # clean up the request
-    delete $instance->{result};
@@ -195 +237 @@
-
-
+
+
+
+
+
+
+=item generate_query
+
+Looks at request and build up query, sorts, and limits
+
+=cut
+
+sub generate_query {
+    my $request = shift;
+
+    my $query       = $request->{query};
+    my $cgi         = $request->{cgi};
+
+
+    # Limit query to a specific metaname?
+    if ( my $meta = $cgi->param('meta') ) {
+
+        $query = "$METANAMES{$meta}=($query)" if $METANAMES{$meta};
+    }
+
+
+    # Limit the query to sections of the site
+
+    my $sections = join " or ", grep { $SECTIONS{$_} } $cgi->param('section');
+    $query .= " section=$sections" if $sections;
+
+
+    $request->{swish_query} = $query;
+
+
+
+
+    # Set sort
+    if ( $cgi->param('sort') && (my $sort = $PROPERTIES{ $cgi->param('sort')}) ) {
+
+        my $reverse = $cgi->param('reverse') ? 1 : 0;
+        $reverse = ! $reverse if $REVERSE_SORT{ $sort };
+
+        $sort .= ' desc' if $reverse;
+
+        $request->{sort} = $sort;
+    }
+
+
+    # Limit by dates
+    my $limit = $cgi->param('date') || return;
+
+
+    my $low     = DateTime->now;
+    my $high    = DateTime->now;
+
+    my @limit_range;
+
+    if ( $limit =~ /^(day|month|year|week)$/ ) {
+        @limit_range = (
+            DateTime->now->truncate( to => $1 )->epoch,
+            time,
+        );
+    }
+
+
+    if ( $limit =~ /^\d+$/ && $limit < 5000 ) {
+        @limit_range = (
+            DateTime->now->truncate( to => $1 )->subtract( days => $limit ),
+            time,
+        );
+    }
+
+    if ( $limit eq 'select' ) {
+
+        my %params;
+        for my $t ( 's', 'e' ) {
+            for my $x ( qw/ year month day / ) {
+                my $value = $cgi->param( $t . $x );
+                next unless $value;
+                $params{$t}{$x} = $value;
+            }
+        }
+        unless ( $params{s}{year} && $params{e}{year} ) {
+            $request->{message} = 'Incomplete date submitted';
+            return;
+        }
+
+
+        eval {
+            @limit_range = (
+                DateTime->new( %{$params{s}} )->epoch,
+                DateTime->new( %{$params{e}}
+                    )->add( days => 1 )->subtract( seconds => 1 )->epoch,
+            );
+        };
+
+        if ( $@ ) {
+            warn "Bad date submitted $@\n";
+            $request->{message} = "Invalid date submitted";
+            @limit_range = ();
+        } else {
+            if ( $limit_range[0] > $limit_range[1] ) {
+                $request->{message} = "Start date must be before end date";
+                @limit_range = ();
+            }
+        }
+    }
+
+
+    $request->{limit_search} = [ 'swishlastmodified' , @limit_range ] if @limit_range;
+}
+
+
+
+
+
+
-# Subroutine to run the Swish query.  Returns a hash reference.
-# A better design might be to return an object with methods for accessing the data.
@@ -218 +378 @@
-
-    # $$$ TODO need to test for index file being modified
-public_html/seach/index.html
+this script
-
-    if ( ! $swish ) {
@@ -240 +400 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    return { message => check_swish_error( $swish ) } if $swish->Error;