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

fixed search indexer errors

Browse source
This commit is contained in:
JT Smith 2004-09-13 19:44:38 +00:00
parent c485014062
commit 6402c8f3af
10 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/6.x.x.txt
View file

@ -22,6 +22,8 @@
- bugfix [ 1027129 ] view message causes error
- bugfix [ 1024079 ] "Software error" message
- Fixed a bunch of POD errors.
- Fixed some errors in the search engine indexer related to the new GUID
system.
6.2.1

4
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -76,8 +76,8 @@ sub getIndexerParams {
fieldsToIndex => ["description", "name"],
contentType => 'wobjectDetail',
url => 'WebGUI::URL::append($data{urlizedTitle},"func=viewEvent&wid=$data{wid}&eid=$data{eid}")',
headerShortcut => 'select name from EventsCalendar_event where EventsCalendar_eventId=$data{eid}',
bodyShortcut => 'select description from EventsCalendar_event where EventsCalendar_eventId=$data{eid}',
headerShortcut => 'select name from EventsCalendar_event where EventsCalendar_eventId=\'$data{eid}\'',
bodyShortcut => 'select description from EventsCalendar_event where EventsCalendar_eventId=\'$data{eid}\'',
}
};
}

4
lib/WebGUI/Wobject/FileManager.pm
View file

@ -93,8 +93,8 @@ sub getIndexerParams {
fieldsToIndex => ["fileTitle", "downloadFile", "briefSynopsis", "alternateVersion1", "alternateVersion2"],
contentType => 'wobjectDetail',
url => '$data{urlizedTitle}."#".$data{wid}',
headerShortcut => 'select fileTitle from FileManager_file where FileManager_fileId = $data{fid}',
bodyShortcut => 'select briefSynopsis from FileManager_file where FileManager_fileId = $data{fid}',
headerShortcut => 'select fileTitle from FileManager_file where FileManager_fileId = \'$data{fid}\'',
bodyShortcut => 'select briefSynopsis from FileManager_file where FileManager_fileId = \'$data{fid}\'',
}
};
}

2
lib/WebGUI/Wobject/IndexedSearch.pm
View file

@ -133,7 +133,7 @@ sub www_edit {
# Page roots
%searchRoot = ( 'any'=>WebGUI::International::get(15,$self->get("namespace")),
$session{page}{pageId}=>WebGUI::International::get(4,$self->get("namespace")),
WebGUI::SQL->buildHash("select pageId,title from page where parentId=0 and (pageId=1 or pageId>999) order by title")
WebGUI::SQL->buildHash("select pageId,title from page where parentId=0 and isSystem<>1 order by title")
);
$properties->checkList ( -name=>'searchRoot',
-options=>\%searchRoot,

2
lib/WebGUI/Wobject/IndexedSearch/Search.pm
View file

@ -669,7 +669,7 @@ sub search {
$sql .= " AND $filterElement in (".quoteAndJoin($filter->{$filterElement}).")";
}
# No trash or other garbage
$sql .= " AND (pageId > 999 or pageId < 0 or pageId = 1) ";
$sql .= " AND isSystem<>1 ";
# Keep @fts_docIds list order
$sql .= " ORDER BY FIELD(docID,$docIds)" unless $noFtsSearch;
my $filteredDocIds = WebGUI::SQL->buildArrayRef($sql);

8
lib/WebGUI/Wobject/MessageBoard.pm
View file

@ -67,8 +67,8 @@ sub getIndexerParams {
fieldsToIndex => ["title", "description"],
contentType => 'wobject',
url => '$data{urlizedTitle}."#".$data{wid}',
headerShortcut => 'select title from MessageBoard_forums where wobjectId = $data{wid}',
bodyShortcut => 'select description from MessageBoard_forums where wobjectId = $data{wid}',
headerShortcut => 'select title from MessageBoard_forums where wobjectId = \'$data{wid}\'',
bodyShortcut => 'select description from MessageBoard_forums where wobjectId = \'$data{wid}\'',
},
MessageBoard_Forum => {
sql => "select forumPost.forumPostId,
@ -98,8 +98,8 @@ sub getIndexerParams {
fieldsToIndex => ["username", "subject", "message"],
contentType => 'discussion',
url => 'WebGUI::URL::append($data{urlizedTitle},"func=view&wid=$data{wid}&forumOp=viewThread&forumPostId=$data{forumPostId}&forumId=$data{forumId}")',
headerShortcut => 'select subject from forumPost where forumPostId = $data{forumPostId}',
bodyShortcut => 'select message from forumPost where forumPostId = $data{forumPostId}',
headerShortcut => 'select subject from forumPost where forumPostId = \'$data{forumPostId}\'',
bodyShortcut => 'select message from forumPost where forumPostId = \'$data{forumPostId}\'',
}
};
}

4
lib/WebGUI/Wobject/Poll.pm
View file

@ -78,9 +78,9 @@ sub getIndexerParams {
"a11", "a12", "a13", "a14", "a15", "a16", "a17", "a18", "a19", "a20"],
contentType => 'wobjectDetail',
url => 'WebGUI::URL::append($data{urlizedTitle}, "func=view&wid=$data{wid}")',
headerShortcut => 'select question from Poll where wobjectId = $data{wid}',
headerShortcut => 'select question from Poll where wobjectId = \'$data{wid}\'',
bodyShortcut => 'select a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15,a16,a17,a18,a19,a20
from Poll where wobjectId = $data{wid}',
from Poll where wobjectId = \'$data{wid}\'',
}
};
}

4
lib/WebGUI/Wobject/Product.pm
View file

@ -116,8 +116,8 @@ sub getIndexerParams {
"productNumber", "benefit", "feature", "name", "value", "units"],
contentType => 'wobjectDetail',
url => 'WebGUI::URL::append($data{urlizedTitle}, "func=view&wid=$data{wid}")',
headerShortcut => 'select title from wobject where wobjectId = $data{wid}',
bodyShortcut => 'select description from wobject where wobjectId = $data{wid}',
headerShortcut => 'select title from wobject where wobjectId = \'$data{wid}\'',
bodyShortcut => 'select description from wobject where wobjectId = \'$data{wid}\'',
}
};
}

6
lib/WebGUI/Wobject/Survey.pm
View file

@ -137,11 +137,11 @@ sub getIndexerParams {
and page.startDate < $now
and page.endDate > $now",
fieldsToIndex => ["question",
'select answer from Survey_answer where Survey_questionId = $data{Survey_questionId}' ],
'select answer from Survey_answer where Survey_questionId = \'$data{Survey_questionId}\'' ],
contentType => 'wobjectDetail',
url => 'WebGUI::URL::append($data{urlizedTitle}, "func=view&wid=$data{wid}")',
headerShortcut => 'select title from wobject where wobjectId = $data{wid}',
bodyShortcut => 'select description from wobject where wobjectId = $data{wid}',
headerShortcut => 'select title from wobject where wobjectId = \'$data{wid}\'',
bodyShortcut => 'select description from wobject where wobjectId = \'$data{wid}\'',
}
};

8
lib/WebGUI/Wobject/USS.pm
View file

@ -114,8 +114,8 @@ sub getIndexerParams {
fieldsToIndex => ["username", "subject", "message"],
contentType => 'discussion',
url => 'WebGUI::URL::append($data{urlizedTitle},"func=viewSubmission&wid=$data{wid}&sid=$data{sid}&forumOp=viewThread&forumPostId=$data{forumPostId}&forumId=$data{forumId}")',
headerShortcut => 'select subject from forumPost where forumPostId = $data{forumPostId}',
bodyShortcut => 'select message from forumPost where forumPostId = $data{forumPostId}',
headerShortcut => 'select subject from forumPost where forumPostId = \'$data{forumPostId}\'',
bodyShortcut => 'select message from forumPost where forumPostId = \'$data{forumPostId}\'',
},
USS_submission => {
sql => "select USS_submission.title as title,
@ -145,8 +145,8 @@ sub getIndexerParams {
fieldsToIndex => ["username", "title", "content", "image", "attachment"],
contentType => 'wobjectDetail',
url => 'WebGUI::URL::append($data{urlizedTitle}, "func=viewSubmission&wid=$data{wid}&sid=$data{sid}")',
headerShortcut => 'select title from USS_submission where USS_submissionId = $data{sid}',
bodyShortcut => 'select content from USS_submission where USS_submissionId = $data{sid}',
headerShortcut => 'select title from USS_submission where USS_submissionId = \'$data{sid}\'',
bodyShortcut => 'select content from USS_submission where USS_submissionId = \'$data{sid}\'',
}
};
}