dale at svn
Aug 27, 2008, 4:57 PM
Post #1 of 1
(22 views)
Permalink
|
|
SVN: [40115] trunk/extensions/MetavidWiki
|
|
Revision: 40115
Author: dale
Date: 2008-08-27 23:57:54 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
some updates for compatibility with new special pages
Modified Paths:
--------------
trunk/extensions/MetavidWiki/includes/articlepages/MV_SequencePage.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialCRUDStream.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
Modified: trunk/extensions/MetavidWiki/includes/articlepages/MV_SequencePage.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/articlepages/MV_SequencePage.php 2008-08-27 22:48:38 UTC (rev 40114)
+++ trunk/extensions/MetavidWiki/includes/articlepages/MV_SequencePage.php 2008-08-27 23:57:54 UTC (rev 40115)
@@ -22,7 +22,9 @@
function __construct($title){
global $wgRequest;
mvfAddHTMLHeader('sequence');
- parent::__construct($title);
+ if($title!=null){
+ parent::__construct($title);
+ }
return $this;
}
/*function doSeqReplace(&$input, &$argv, &$parser){
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialCRUDStream.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialCRUDStream.php 2008-08-27 22:48:38 UTC (rev 40114)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialCRUDStream.php 2008-08-27 23:57:54 UTC (rev 40115)
@@ -29,11 +29,14 @@
SpecialPage::addPage( new SpecialPage('Mv_Add_Stream','',true,'doSpecialAddStream',false) );
SpecialPage::addPage( new SpecialPage('Mv_Edit_Stream','',true,'doSpecialEditStream',false) );
*/
+
/* @@TODO depreciate in favor of oggFile -> stream setup */
class MV_SpecialCRUDStream extends SpecialPage{
- function __construct($mode='add'){
+ function __construct($mode='add'){
parent::__construct('Mv_Add_Stream');
- $this->mode='add';
+ $this->mode='add';
+ //print_r(debug_backtrace());
+
}
function execute() {
global $wgRequest, $wgOut, $wgUser, $mvStream_name, $mvgIP;
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php 2008-08-27 22:48:38 UTC (rev 40114)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php 2008-08-27 23:57:54 UTC (rev 40115)
@@ -21,9 +21,13 @@
global $IP, $smwgIP;
//all the special pages handled by this master Special Export (could reactor into individual classes if we want to)
class MvVideoFeed extends SpecialPage{
- function __construct(){
+ function __construct(){
parent::__construct('MvVideoFeed');
$MvSpecialExport = new MV_SpecialExport('category');
+
+ if (method_exists('SpecialPage', 'setGroup')) {
+ parent::setGroup('MvVideoFeed', 'mv_group');
+ }
}
}
class MvExportStream extends SpecialPage{
@@ -32,12 +36,28 @@
$MvSpecialExport = new MV_SpecialExport('stream');
}
}
-class MvExportSequence extends SpecialPage{
+class MvExportSequence extends SpecialPage{
function __construct(){
parent::__construct('MvExportSequence');
- $MvSpecialExport = new MV_SpecialExport('sequence');
+ global $wgRequest;
+ //@@todo replace this ugly hack .. don't know how to get around the missing param atm:
+ $tl = $wgRequest->getVal('title');
+ $par='';
+ if(strpos($tl,'/')!==false){
+ $par = substr($tl, strpos($tl,'/')+1 );
+ }
+ //print "par: ". $par ;
+ //die;
+ $MvSpecialExport = new MV_SpecialExport('sequence', $par);
+
+ if (method_exists('SpecialPage', 'setGroup')) {
+ parent::setGroup('MvExportSequence', 'mv_group');
+ }
}
}
+function wfSpecialMvExportSequence(){
+ return true;
+}
class MvExportSearch extends SpecialPage{
function __construct(){
parent::__construct('MvExportSearch');
@@ -54,6 +74,7 @@
return true;
}
+
//extend supported feed types:
$wgFeedClasses['cmml']='CmmlFeed';
$wgFeedClasses['podcast']='PodcastFeed';
@@ -63,7 +84,7 @@
function __construct($export_type, $par=''){
$this->export_type=$export_type;
$this->par = $par;
- $this->execute();
+ $this->execute();
}
//@@todo think about integration into api.php
function execute() {
@@ -72,6 +93,7 @@
//set universal variables:
$this->feed_format = $wgRequest->getVal('feed_format');
$error_page = '';
+ //print "RAN execute with export type: " .$this->export_type;
switch($this->export_type){
case 'stream':
$this->stream_name = $wgRequest->getVal('stream_name');
@@ -105,9 +127,11 @@
case 'search':
$this->get_search_feed();
break;
- case 'sequence':
- $this->seq_title = $this->par;
- $this->get_sequence_xspf();
+ case 'sequence':
+ if($this->par!=''){
+ $this->seq_title = $this->par;
+ $this->get_sequence_xspf();
+ }
break;
case 'ask':
$this->get_ask_feed();
@@ -119,7 +143,7 @@
$wgOut->addHTML($error_page);
}
}
- function get_sequence_xspf(){
+ function get_sequence_xspf(){
//get the sequence article and export in xspf format:
$seqTitle = Title::newFromText($this->seq_title, MV_NS_SEQUENCE);
$seqArticle = new MV_SequencePage($seqTitle);
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js 2008-08-27 22:48:38 UTC (rev 40114)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js 2008-08-27 23:57:54 UTC (rev 40115)
@@ -46,7 +46,7 @@
this.currentTime = this.vid.currentTime;
if( this.currentTime > 0 ){
- if(! this.userSlide){
+ if(!this.userSlide){
this.setSliderValue(this.currentTime/this.duration );
this.setStatus( seconds2ntp(this.currentTime) + '/'+ seconds2ntp(this.duration));
}else{
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php 2008-08-27 22:48:38 UTC (rev 40114)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php 2008-08-27 23:57:54 UTC (rev 40115)
@@ -22,10 +22,10 @@
$sample_embed = array();
$sample_embed[0]['tag'] = '<video id="vid_4184"
-thumbnail="http://metavid.ucsc.edu/wiki/index.php?action=ajax&rs=mv_frame_server&stream_name=senate_proceeding_08-01-07&t=0:27:16&size=small"
+thumbnail="http://metavid.ucsc.edu/wiki/index.php?action=ajax&rs=mv_frame_server&stream_name=senate_proceeding_08-01-07&t=0:27:16&size=large"
src="http://128.114.20.64/media/senate_proceeding_08-01-07.ogg.anx?t=0:27:16/0:27:32"
roe="http://localhost/mvw-exp/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=senate_proceeding_08-01-07&t=0:27:16/0:27:32"
-show_meta_link="false" autoplay="false" style="width:160px;height:120px" controls="true" embed_link="true" ></video>';
+show_meta_link="false" autoplay="false" style="width:400px;height:300px" controls="true" embed_link="true" ></video>';
$sample_embed[0]['desc']=' auto play test (similar embed syntax to the metavidWiki site)';
/*$sample_embed[0]['tag']='<video id="v0" src="sample.ogg" thumbnail="sample.jpg"></video>';
@@ -125,7 +125,7 @@
<table border="1" cellpadding="6" width="600">
<? foreach($sample_embed as $key=>$aval){
//$key!=8
- if($key!=2)continue;
+ if($key!=0)continue;
?>
<tr>
<td valign="top"><?=$aval['tag']?></td>
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
