From 4f2905645a18374c7068ae91bd9b4c31225e9229 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 22 Aug 2011 08:04:02 -0700
Subject: [PATCH] Changed urls sent to the asset indexer from using getUrl
 which prepends the gateway to them.  Fixes bug #12229.

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Asset/Wobject/Thingy.pm | 4 ++--
 t/Asset/Wobject/Thingy/indexing.t  | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 223e1d268..6bcde18be 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.23
  - fixed #12225: Stock asset, multiple instances on a page
+ - fixed #12229: Indexed thingy data has gateway url prepended to it
 
 7.10.22
  - rfe   #12223: Add date type to content profiling (metadata)
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 16edd962f..bfeb97f8d 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1611,11 +1611,11 @@ sub indexThing {
     return unless $thing;
     my $index = WebGUI::Search::Index->new($self);
     $index->addRecord(
-        url         => $self->getUrl($self->getThingUrl($thing)),
         groupIdView => $thing->{groupIdView},
         title       => $thing->{label},
         subId       => $thing->{thingId},
         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
     ##And rebuilding them all.
@@ -1687,7 +1687,7 @@ sub indexThingData {
              || $self->getTitle;
     $index->addRecord(
         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},
         title       => $title,
         subId       => $thing->{thingId} . '-' . $thingData->{thingDataId},
diff --git a/t/Asset/Wobject/Thingy/indexing.t b/t/Asset/Wobject/Thingy/indexing.t
index 2f7058321..4c4073a7b 100644
--- a/t/Asset/Wobject/Thingy/indexing.t
+++ b/t/Asset/Wobject/Thingy/indexing.t
@@ -75,12 +75,12 @@ is $session->db->quickScalar('select count(*) from assetIndex where assetId=?',[
 
 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(
     $record,
     superhashof({
         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',
         groupIdView => 2,
         keywords    => all(
@@ -165,7 +165,7 @@ cmp_deeply(
         score        => ignore(),
         synopsis     => ignore(),
         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'
@@ -214,7 +214,7 @@ cmp_deeply(
         score        => ignore(),
         synopsis     => ignore(),
         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'