dale at svn
Aug 21, 2008, 11:24 PM
Post #1 of 1
(343 views)
Permalink
|
|
SVN: [39812] trunk/extensions/MetavidWiki
|
|
Revision: 39812
Author: dale
Date: 2008-08-22 06:24:19 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
updates for archive.org downloader
other minor fixes
Modified Paths:
--------------
trunk/extensions/MetavidWiki/MV_LocalSettings.php
trunk/extensions/MetavidWiki/RELEASE
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php
trunk/extensions/MetavidWiki/maintenance/download_from_archive_org.php
Modified: trunk/extensions/MetavidWiki/MV_LocalSettings.php
===================================================================
--- trunk/extensions/MetavidWiki/MV_LocalSettings.php 2008-08-22 05:58:40 UTC (rev 39811)
+++ trunk/extensions/MetavidWiki/MV_LocalSettings.php 2008-08-22 06:24:19 UTC (rev 39812)
@@ -9,6 +9,6 @@
* eventually we should have some documentation somewhere ;)
*/
$mvExternalImages = true;
-$mvExternalImgServerPath = 'http://metavid.ucsc.edu/wiki/index.php';
+$mvExternalImgServerPath = 'http://metavid.ucsc.edu/mvw-exp/index.php';
?>
\ No newline at end of file
Modified: trunk/extensions/MetavidWiki/RELEASE
===================================================================
--- trunk/extensions/MetavidWiki/RELEASE 2008-08-22 05:58:40 UTC (rev 39811)
+++ trunk/extensions/MetavidWiki/RELEASE 2008-08-22 06:24:19 UTC (rev 39812)
@@ -34,7 +34,7 @@
* Also see http://svn.wikimedia.org/svnroot/mediawiki/tags/REL1_13_0RC2/phase3/RELEASE-NOTES
== Updated Compatibility to latest Semantic MediaWiki 1.2 ==
-* faster, lazyloading of all classes, better db structure, + lots more
+* faster, lazy loading of all classes, better db structure, + lots more
* Also See http://semantic-mediawiki.org/wiki/SMW_1.2
Modified: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php 2008-08-22 05:58:40 UTC (rev 39811)
+++ trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php 2008-08-22 06:24:19 UTC (rev 39812)
@@ -54,13 +54,13 @@
$tool_tip ='';
//print_r($row);
if(trim($row->Speech_by)!=''){
- $o.=wfMsg('mv_'.$pntype.'_speech', $sk->makeKnownLinkObj($streamTitle, $row->Speech_by));
+ $o.=wfMsg('mv_'.$pntype.'_speech', $sk->makeKnownLinkObj($streamTitle, str_replace('_',' ',$row->Speech_by)) );
//$tool_tip.= 'Speech By: '. $row->Speech_by;
}else if(trim($row->Bill)!=''){
- $o.=wfMsg('mv_'.$pntype.'_bill', $sk->makeKnownLinkObj($streamTitle, $row->Bill));
+ $o.=wfMsg('mv_'.$pntype.'_bill', $sk->makeKnownLinkObj($streamTitle, str_replace('_',' ',$row->Bill)) );
}else if(is_array($row->category) && count($row->category)!=0){
$first_cat = current($row->category);
- $o.=wfMsg('mv_'.$pntype.'_cat', $sk->makeKnownLinkObj($streamTitle, $first_cat));
+ $o.=wfMsg('mv_'.$pntype.'_cat', $sk->makeKnownLinkObj($streamTitle, str_replace('_',' ',$first_cat) ));
}
}
}
Modified: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php 2008-08-22 05:58:40 UTC (rev 39811)
+++ trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php 2008-08-22 06:24:19 UTC (rev 39812)
@@ -142,14 +142,14 @@
}
}
function get_fd_mvd_page(&$mvd_page, $content=''){
- global $wgOut;
+ global $wgOut, $mvDefaultVideoPlaybackRes;
//print_r($mvd_page);
//"<div id=\"mv_ctail_{$mvd_page->id}\" style=\"position:relative\">"
if(isset($this->mv_interface->smwProperties['playback_resolution'])){
//for now just put in a hack that forces no size adjustment
$img_url = MV_StreamImage::getStreamImageURL($mvd_page->stream_id, $mvd_page->start_time, null, true);
}else{
- $img_url = MV_StreamImage::getStreamImageURL($mvd_page->stream_id, $mvd_page->start_time, 'medium', true);
+ $img_url = MV_StreamImage::getStreamImageURL($mvd_page->stream_id, $mvd_page->start_time, $mvDefaultVideoPlaybackRes, true);
}
$oe_class='';
if($this->oddEvenToggle){
@@ -343,7 +343,7 @@
$smwKeyTitle=Title::newFromText($smw_key);
$valueTitle = Title::newFromText($smw_attr_val);
if($template_key=='anno_en')
- $smw_text_html.=$smwKeyTitle->getText(). ': '. $sk->makeLinkObj($valueTitle).'<br>';
+ $smw_text_html.=ucwords($smwKeyTitle->getText()). ': '. $sk->makeLinkObj($valueTitle).'<br>';
}
$pre_text_html.='<p class="text">';
if($mvd_page!=''){
Modified: trunk/extensions/MetavidWiki/maintenance/download_from_archive_org.php
===================================================================
--- trunk/extensions/MetavidWiki/maintenance/download_from_archive_org.php 2008-08-22 05:58:40 UTC (rev 39811)
+++ trunk/extensions/MetavidWiki/maintenance/download_from_archive_org.php 2008-08-22 06:24:19 UTC (rev 39812)
@@ -55,19 +55,25 @@
$ogg_file = $dbr->fetchObject($rdur);
$dur_val = $ogg_file->duration;
}
- $sql="INSERT INTO `mv_stream_files`
- (`id`,`base_offset`,`duration`,`file_desc_msg`,`path_type`,`path`)
- VALUES('',0,'{$dur_val}','mv_flash_low_quality','','".
- MV_BASE_MEDIA_SERVER_PATH . $stream->name .".flv');";
- echo $sql;
- die;
+ $dbw->insert('mv_stream_files',
+ array('stream_id'=>$stream->id,
+ 'duration'=>$dur_val,
+ 'file_desc_msg'=>'mv_flash_low_quality',
+ 'path_type'=>'url_anx',
+ 'path'=>MV_BASE_MEDIA_SERVER_PATH . $stream->name .".flv'")
+ );
+ print $dbw->lastQuery();
+ die;
print "insert {$stream->name}.flv\n";
- $dbw->query($sql);
+ //$dbw->query($sql);
}else{
$file = $dbr->fetchObject($resFcheck);
- $sql="UPDATE `mv_stream_files` WHERE `id` = '".$file->id."'
- SET `path`=".MV_BASE_MEDIA_SERVER_PATH . $stream->name .'.flv';
- print "update {$stream->name}.flv\n";
+ $dbr->update('mv_stream_files',
+ array('path'=>MV_BASE_MEDIA_SERVER_PATH . $stream->name .'.flv'),
+ array('id'=>$file->id),
+ __METHOD__,
+ array('LIMIT'=>1));
+
$dbw->query($sql);
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
