dale at svn
Jul 18, 2008, 12:44 AM
Post #1 of 1
(49 views)
Permalink
|
|
SVN: [37812] branches/MetavidWiki-exp/MetavidWiki/includes
|
|
Revision: 37812
Author: dale
Date: 2008-07-18 07:44:53 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
minor bug fix in metadata merge in search results
Modified Paths:
--------------
branches/MetavidWiki-exp/MetavidWiki/includes/MV_Index.php
branches/MetavidWiki-exp/MetavidWiki/includes/MV_Settings.php
branches/MetavidWiki-exp/MetavidWiki/includes/MV_Title.php
branches/MetavidWiki-exp/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php
Modified: branches/MetavidWiki-exp/MetavidWiki/includes/MV_Index.php
===================================================================
--- branches/MetavidWiki-exp/MetavidWiki/includes/MV_Index.php 2008-07-18 06:46:35 UTC (rev 37811)
+++ branches/MetavidWiki-exp/MetavidWiki/includes/MV_Index.php 2008-07-18 07:44:53 UTC (rev 37812)
@@ -335,7 +335,7 @@
$sql.=' ORDER BY `view_count` DESC ';
break;
}
- echo $this->order;
+ //echo $this->order;
$sql.="LIMIT {$this->offset}, {$this->limit} ";
//echo "SQL:".$sql." \n";
@@ -409,22 +409,30 @@
}
}
$sql.=') LIMIT 0, 200';
+
+ //print "BEFORE merge: ";
+ //print_r($ret_ary);
+ //print_r($stream_groups);
+
//merge category info back into base results:
$result = $dbr->query($sql, 'MV_Index:doCategorySearchResult');
- while($cl_row = $dbr->fetchObject( $result )){
+ while($cl_row = $dbr->fetchObject( $result )){
+ //print_r($cl_row);
foreach($stream_groups[$cl_row->stream_id] as &$range){
foreach($range['rows'] as &$result_row){
if($result_row->start_time <= $cl_row->end_time &&
$result_row->end_time >= $cl_row->start_time){
-
- if($cl_row->cl_to)
+ //print "result row:"; print_r($result_row);
+ if(isset($cl_row->cl_to) && isset($ret_ary[$result_row->id]))
$ret_ary[$result_row->id]->categories[$cl_row->cl_to]=true;
- if($cl_row->bill_to)
- $ret_ary[$reult_row->id]->bills[$cl_row->bill_to]=true;
- }
+ if(isset($cl_row->bill_to) && isset($ret_ary[$result_row->id]))
+ $ret_ary[$result_row->id]->bills[$cl_row->bill_to]=true;
+ }
}
}
}
+ //print "AFTER MERGE: ";
+ //print_r($ret_ary);
}
//print "<pre>";
//print_r($ret_ary);
Modified: branches/MetavidWiki-exp/MetavidWiki/includes/MV_Settings.php
===================================================================
--- branches/MetavidWiki-exp/MetavidWiki/includes/MV_Settings.php 2008-07-18 06:46:35 UTC (rev 37811)
+++ branches/MetavidWiki-exp/MetavidWiki/includes/MV_Settings.php 2008-07-18 07:44:53 UTC (rev 37812)
@@ -6,7 +6,7 @@
/*
* your settings overrides here:
*/
-$mvExternalImages = false;
+$mvExternalImages = true;
$mvExternalImgServerPath = 'http://metavid.ucsc.edu/wiki/index.php';
?>
\ No newline at end of file
Modified: branches/MetavidWiki-exp/MetavidWiki/includes/MV_Title.php
===================================================================
--- branches/MetavidWiki-exp/MetavidWiki/includes/MV_Title.php 2008-07-18 06:46:35 UTC (rev 37811)
+++ branches/MetavidWiki-exp/MetavidWiki/includes/MV_Title.php 2008-07-18 07:44:53 UTC (rev 37812)
@@ -37,7 +37,6 @@
$title = parent::makeTitle($ns, $title);
}
$this->inheritTitle( $title) ;
-
//its just a plain string generate the parse info
$this->wiki_title = $title->getDBKey();
$this->parseTitle($title->getDBKey());
Modified: branches/MetavidWiki-exp/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php
===================================================================
--- branches/MetavidWiki-exp/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php 2008-07-18 06:46:35 UTC (rev 37811)
+++ branches/MetavidWiki-exp/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php 2008-07-18 07:44:53 UTC (rev 37812)
@@ -354,7 +354,7 @@
$sideBarLinkBucket = array ();
$o .= '
<ul id="results">';
- foreach ($this->results as $inx => & $mvd) {
+ foreach ($this->results as $inx => & $mvd) {
$mvTitle = new MV_Title($mvd->wiki_title);
$mvd_cnt_links = '';
if (isset ($mvd->spoken_by)) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
