Author: earle
Date: 2005-10-12 04:15:22 +0100 (Wed, 12 Oct 2005)
New Revision: 692
Modified:
trunk/Changes
trunk/lib/OpenGuides.pm
trunk/lib/OpenGuides/RDF.pm
trunk/lib/OpenGuides/SuperSearch.pm
Log:
bump version numbers appropriately
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2005-10-12 01:57:58 UTC (rev 691)
+++ trunk/Changes 2005-10-12 03:15:22 UTC (rev 692)
@@ -1,7 +1,7 @@
0.51
New "format=raw" option for outputting wiki text of a node.
New "summary" metadata field for one-line summaries of nodes.
- Add "summary" field to RDF as dc:description.
+ Add summary field to RDF as dc:description.
Show node summary in search results.
Add "address" field that had got missed out from the RDF.
Fix bug that was breaking coordinate entry fields on search page if lat/lon
Modified: trunk/lib/OpenGuides/RDF.pm
===================================================================
--- trunk/lib/OpenGuides/RDF.pm 2005-10-12 01:57:58 UTC (rev 691)
+++ trunk/lib/OpenGuides/RDF.pm 2005-10-12 03:15:22 UTC (rev 692)
@@ -3,7 +3,7 @@
use strict;
use vars qw( $VERSION );
-$VERSION = '0.071';
+$VERSION = '0.08';
use CGI::Wiki::Plugin::RSS::ModWiki;
use Time::Piece;
Modified: trunk/lib/OpenGuides/SuperSearch.pm
===================================================================
--- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:57:58 UTC (rev 691)
+++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 03:15:22 UTC (rev 692)
@@ -1,6 +1,6 @@
package OpenGuides::SuperSearch;
use strict;
-our $VERSION = '0.09';
+our $VERSION = '0.10';
use CGI qw( :standard );
use CGI::Wiki::Plugin::Locator::Grid;
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm 2005-10-12 01:57:58 UTC (rev 691)
+++ trunk/lib/OpenGuides.pm 2005-10-12 03:15:22 UTC (rev 692)
@@ -13,7 +13,7 @@
use vars qw( $VERSION );
-$VERSION = '0.50';
+$VERSION = '0.51';
=head1 NAME
Author: earle
Date: 2005-10-12 02:57:58 +0100 (Wed, 12 Oct 2005)
New Revision: 691
Modified:
trunk/templates/node.tt
Log:
fix RT #8852 (missing OS IE X/Y coords)
Modified: trunk/templates/node.tt
===================================================================
--- trunk/templates/node.tt 2005-10-12 01:51:06 UTC (rev 690)
+++ trunk/templates/node.tt 2005-10-12 01:57:58 UTC (rev 691)
@@ -46,7 +46,7 @@
</form>
</div>
[% END %]
-[% IF (latitude AND longitude) OR (os_x AND os_y) %]
+[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %]
<div id="coordinates">
[% END %]
[% IF os_x AND os_y %]
@@ -54,11 +54,16 @@
<small>OS Y co-ord: [% CGI.escapeHTML(os_y) %]</small>
+[% ELSIF osie_x AND osie_y %]
+ <small>OS IE X co-ord: [% CGI.escapeHTML(osie_x) %]</small>
+
+ <small>OS IE Y co-ord: [% CGI.escapeHTML(osie_y) %]</small>
+
[% END %]
[% IF latitude AND longitude %]
<small>(Latitude: [% latitude %] Longitude: [% longitude %])</small>
[% END %]
-[% IF (latitude AND longitude) OR (os_x AND os_y) %]
+[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%]
</div>
[% END %]
<div id="rdf_link">
Author: earle
Date: 2005-10-12 02:51:06 +0100 (Wed, 12 Oct 2005)
New Revision: 690
Modified:
trunk/Changes
Log:
SuperSearch bugfix
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2005-10-12 01:49:28 UTC (rev 689)
+++ trunk/Changes 2005-10-12 01:51:06 UTC (rev 690)
@@ -8,8 +8,11 @@
was being used.
Replace underscores in node names in redirection message with spaces.
Redirection message now links to a rendered version of the old page
- rather than the editing view.
-
+ rather than the editing view.
+ Fix bug in OpenGuides::SuperSearch that wasn't passing "latitude" and
+ "longitude" values to the search template when a distance search
+ was being done.
+
0.50 2 October 2005
Remove rogue ampersand that had crept into the RSS feed.
Author: earle
Date: 2005-10-12 02:49:28 +0100 (Wed, 12 Oct 2005)
New Revision: 689
Modified:
trunk/lib/OpenGuides/SuperSearch.pm
Log:
always pass latitude and longitude to the template if criteria for distance search are defined
Modified: trunk/lib/OpenGuides/SuperSearch.pm
===================================================================
--- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:36:06 UTC (rev 688)
+++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:49:28 UTC (rev 689)
@@ -155,6 +155,8 @@
$doing_search = 1;
# Make sure to pass the criteria to the template.
$tt_vars{dist} = $self->{distance_in_metres};
+ $tt_vars{latitude} = $self->{latitude};
+ $tt_vars{longitude} = $self->{longitude};
if ( $self->config->geo_handler eq 1 ) {
$tt_vars{coord_field_1_value} = $self->{os_x};
$tt_vars{coord_field_2_value} = $self->{os_y};
Author: earle
Date: 2005-10-10 00:40:37 +0100 (Mon, 10 Oct 2005)
New Revision: 685
Modified:
trunk/Changes
trunk/README.CSS
trunk/lib/OpenGuides/SuperSearch.pm
Log:
add node summary to search results
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2005-10-09 23:37:43 UTC (rev 684)
+++ trunk/Changes 2005-10-09 23:40:37 UTC (rev 685)
@@ -1,7 +1,10 @@
0.51
New "summary" metadata field for one-line summaries of nodes.
Add "summary" field to RDF as dc:description.
+ Show node summary in search results.
Add "address" field that had got missed out from the RDF.
+ Fix bug that was breaking coordinate entry fields on search page if lat/lon
+ was being used.
Replace underscores in node names in redirection message with spaces.
Redirection message now links to a rendered version of the old page
rather than the editing view.
Modified: trunk/README.CSS
===================================================================
--- trunk/README.CSS 2005-10-09 23:37:43 UTC (rev 684)
+++ trunk/README.CSS 2005-10-09 23:40:37 UTC (rev 685)
@@ -84,6 +84,10 @@
Used in: recent_changes.tt
Purpose: User who made a change
+div.hit_summary
+ Used in: supersearch.tt
+ Purpose: One-line summary of individual search result.
+
IDs
---
Modified: trunk/lib/OpenGuides/SuperSearch.pm
===================================================================
--- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-09 23:37:43 UTC (rev 684)
+++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-09 23:40:37 UTC (rev 685)
@@ -252,6 +252,11 @@
my $formatter = $self->wiki->formatter;
foreach my $i ( 0 .. $#results ) {
my $name = $results[$i]{name};
+
+ # Add the one-line summary of the node, if there is one.
+ my %node = $self->wiki->retrieve_node($name);
+ $results[$i]{summary} = $node{metadata}{summary}[0];
+
my $node_param = $formatter->node_name_to_node_param( $name );
$results[$i]{url} = $self->{wikimain} . "?$node_param";
}