oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed urls sent to the asset indexer from using getUrl which prepends the gateway to them. Fixes bug #12229.

Browse source
This commit is contained in:
Colin Kuskie 2011-08-22 08:04:02 -07:00
parent 8ed3eba9bb
commit 4f2905645a
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,5 +1,6 @@
7.10.23 7.10.23
- fixed #12225: Stock asset, multiple instances on a page - fixed #12225: Stock asset, multiple instances on a page
- fixed #12229: Indexed thingy data has gateway url prepended to it
7.10.22 7.10.22
- rfe #12223: Add date type to content profiling (metadata) - rfe #12223: Add date type to content profiling (metadata)

4
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1611,11 +1611,11 @@ sub indexThing {
return unless $thing; return unless $thing;
my $index = WebGUI::Search::Index->new($self); my $index = WebGUI::Search::Index->new($self);
$index->addRecord( $index->addRecord(
url => $self->getUrl($self->getThingUrl($thing)),
groupIdView => $thing->{groupIdView}, groupIdView => $thing->{groupIdView},
title => $thing->{label}, title => $thing->{label},
subId => $thing->{thingId}, subId => $thing->{thingId},
keywords => join(' ', @{$thing}{qw/label editScreenTitle editInstructions searchScreenTitle searchDescription/}), keywords => join(' ', @{$thing}{qw/label editScreenTitle editInstructions searchScreenTitle searchDescription/}),
url => $self->session->url->append($self->get('url'), $self->getThingUrl($thing)),
); );
##Easy update of all thingData fields for this thing. This is in lieu of deleting all records ##Easy update of all thingData fields for this thing. This is in lieu of deleting all records
##And rebuilding them all. ##And rebuilding them all.
@ -1687,7 +1687,7 @@ sub indexThingData {
|| $self->getTitle; || $self->getTitle;
$index->addRecord( $index->addRecord(
assetId => $self->getId, assetId => $self->getId,
url => $self->getUrl('func=viewThingData;thingId='. $thing->{thingId} . ';thingDataId='. $thingData->{thingDataId}), url => $session->url->append($self->get('url'), 'func=viewThingData;thingId='. $thing->{thingId} . ';thingDataId='. $thingData->{thingDataId}),
groupIdView => $thing->{groupIdView}, groupIdView => $thing->{groupIdView},
title => $title, title => $title,
subId => $thing->{thingId} . '-' . $thingData->{thingDataId}, subId => $thing->{thingId} . '-' . $thingData->{thingDataId},

8
t/Asset/Wobject/Thingy/indexing.t
View file

@ -75,12 +75,12 @@ is $session->db->quickScalar('select count(*) from assetIndex where assetId=?',[
my $record; my $record;
$record = $session->db->quickHashRef('select * from assetIndex where assetId=?',[$thingy->getId]); $record = $session->db->quickHashRef('select * from assetIndex where assetId=? AND subId IS NOT NULL',[$thingy->getId]);
cmp_deeply( cmp_deeply(
$record, $record,
superhashof({ superhashof({
subId => 'THING_RECORD', subId => 'THING_RECORD',
url => $thingy->getUrl('func=search;thingId=THING_RECORD'), url => $session->url->append($thingy->get('url'), 'func=search;thingId=THING_RECORD'),
title => 'Label', title => 'Label',
groupIdView => 2, groupIdView => 2,
keywords => all( keywords => all(
@ -165,7 +165,7 @@ cmp_deeply(
score => ignore(), score => ignore(),
synopsis => ignore(), synopsis => ignore(),
title => 'Label', ##From the Thing's label title => 'Label', ##From the Thing's label
url => $thingy->getUrl('func=viewThingData;thingId='.$thingId.';thingDataId=THING_DATA'), url => $session->url->append($thingy->get('url'), 'func=viewThingData;thingId='.$thingId.';thingDataId=THING_DATA'),
} }
], ],
'Checking indexed data for the thingData' 'Checking indexed data for the thingData'
@ -214,7 +214,7 @@ cmp_deeply(
score => ignore(), score => ignore(),
synopsis => ignore(), synopsis => ignore(),
title => '8/16/2001', ##From viewScreenTitle, which is $birthday in user's preferred date format title => '8/16/2001', ##From viewScreenTitle, which is $birthday in user's preferred date format
url => $thingy->getUrl('func=viewThingData;thingId='.$thingId.';thingDataId=THING_DATA'), url => $session->url->append($thingy->get('url'), 'func=viewThingData;thingId='.$thingId.';thingDataId=THING_DATA'),
} }
], ],
'Checking indexed data for the thingData' 'Checking indexed data for the thingData'