[interchange-cvs] interchange - racke modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue Apr 15 19:37:57 UTC 2008
User: racke
Date: 2008-04-15 19:37:57 GMT
Modified: . WHATSNEW-5.5
Modified: lib/Vend Page.pm
Log:
Fail gracefully on bad searches (#164).
Revision Changes Path
1.103 interchange/WHATSNEW-5.5
rev 1.103, prev_rev 1.102
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- WHATSNEW-5.5 10 Apr 2008 22:26:12 -0000 1.102
+++ WHATSNEW-5.5 15 Apr 2008 19:37:57 -0000 1.103
@@ -111,6 +111,8 @@
* Quell threaded perl warning for 5.8.8 and above.
+* Fail gracefully on bad searches (#164).
+
UserTag
-------
2.26 interchange/lib/Vend/Page.pm
rev 2.26, prev_rev 2.25
Index: Page.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Page.pm,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -r2.25 -r2.26
--- Page.pm 9 Aug 2007 13:40:53 -0000 2.25
+++ Page.pm 15 Apr 2008 19:37:57 -0000 2.26
@@ -1,8 +1,8 @@
# Vend::Page - Handle Interchange page routing
#
-# $Id: Page.pm,v 2.25 2007-08-09 13:40:53 pajamian Exp $
+# $Id: Page.pm,v 2.26 2008-04-15 19:37:57 racke Exp $
#
-# Copyright (C) 2002-2007 Interchange Development Group
+# Copyright (C) 2002-2008 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
#
# This program was originally based on Vend 0.2 and 0.3
@@ -46,7 +46,7 @@
use vars qw/$VERSION/;
-$VERSION = substr(q$Revision: 2.25 $, 10);
+$VERSION = substr(q$Revision: 2.26 $, 10);
my $wantref = 1;
@@ -181,10 +181,14 @@
$c->{mv_cache_key} = generate_key($Vend::Session->{last_search})
unless defined $c->{mv_cache_key};
- $::Instance->{SearchObject}{''} = perform_search($c);
- $CGI::values{mv_nextpage} = $::Instance->{SearchObject}{''}->{mv_search_page}
- || find_special_page('search')
- if ! $CGI::values{mv_nextpage};
+ my $retval = perform_search($c);
+
+ if (ref($retval)) {
+ $::Instance->{SearchObject}{''} = $retval;
+ $CGI::values{mv_nextpage} = $retval->{mv_search_page}
+ || find_special_page('search')
+ if ! $CGI::values{mv_nextpage};
+ }
return 1;
}
More information about the interchange-cvs
mailing list