https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113330
Revision: 113330
Author: jeroendedauw
Date: 2012-03-07 23:41:56 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
1.8 alpha
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/RELEASE-NOTES
trunk/extensions/SemanticResultFormats/SRF_Settings.php
trunk/extensions/SemanticResultFormats/SemanticResultFormats.php
Modified: trunk/extensions/SemanticResultFormats/RELEASE-NOTES
===================================================================
--- trunk/extensions/SemanticResultFormats/RELEASE-NOTES 2012-03-07
23:36:54 UTC (rev 113329)
+++ trunk/extensions/SemanticResultFormats/RELEASE-NOTES 2012-03-07
23:41:56 UTC (rev 113330)
@@ -2,6 +2,15 @@
http://semantic-mediawiki.org/wiki/Semantic_Result_Formats
+== SRF 1.8 ==
+
+THIS IS NOT A RELEASE YET
+
+Semantic Result Formats 1.7.1 is currently in beta-quality and is not
recommended for use in
+production until the actual release.
+
+* ...
+
== SRF 1.7.1 ==
Released on Match 8, 2012.
Modified: trunk/extensions/SemanticResultFormats/SRF_Settings.php
===================================================================
--- trunk/extensions/SemanticResultFormats/SRF_Settings.php 2012-03-07
23:36:54 UTC (rev 113329)
+++ trunk/extensions/SemanticResultFormats/SRF_Settings.php 2012-03-07
23:41:56 UTC (rev 113330)
@@ -20,8 +20,8 @@
require_once dirname( __FILE__ ) . '/SemanticResultFormats.php';
}
-# The formats you want to be able to use.
-# See the INSTALL file or this url for more info:
https://www.mediawiki.org/wiki/Extension:Semantic_Result_Formats#Installation
+// The formats you want to be able to use.
+// See the INSTALL file or this url for more info:
https://www.mediawiki.org/wiki/Extension:Semantic_Result_Formats#Installation
$srfgFormats = array(
'icalendar',
'vcard',
@@ -31,8 +31,6 @@
'timeline',
'outline',
'gallery',
- // Several issues need to be fixed before this can be enabled, most
notably it does not work properly with the RL.
- //'jitgraph',
'jqplotbar',
'jqplotpie',
'sum',
@@ -47,18 +45,16 @@
'tree',
'ultree',
'oltree',
-);
+ 'D3Line',
+ 'D3Bar',
+ 'D3Treemap',
-if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- $srfgFormats[] = 'D3Line';
- $srfgFormats[] = 'D3Bar';
- $srfgFormats[] = 'D3Treemap';
-
// Still in alpha.
- // $srfgFormats[] = 'filtered';
-}
+ //'filtered',
+ //'jitgraph', // Several issues need to be fixed before this can be
enabled, most notably it does not work properly with the RL.
+);
-# load hash format only if HashTables extension is initialised, otherwise
'Array' format is enough
+// load hash format only if HashTables extension is initialised, otherwise
'Array' format is enough
// FIXME: According to the INSTALL file only formats should be enabled, that
"do not require further software to be installed (besides SMW)"
if( array_key_exists( 'ExtHashTables', $wgAutoloadClasses ) && defined(
'ExtHashTables::VERSION' )
&& version_compare( ExtHashTables::VERSION, '0.999', '>=' )
@@ -67,14 +63,14 @@
$srfgFormats[] = 'hash';
}
-# Used for jqplot formats.
+// Used for jqplot formats.
$srfgJQPlotIncluded = false;
-# Used for Array and Hash formats.
-# Allows value as string or object instances of Title or Article classes or an
array
-# where index 0 is the page title and 1 is the namespace-index (by default
NS_MAIN)
-# also allows defining optional template-arguments by index 'args' as array
where a
-# key represents an argument name and a keys associated value an argument
value.
+// Used for Array and Hash formats.
+// Allows value as string or object instances of Title or Article classes or
an array
+// where index 0 is the page title and 1 is the namespace-index (by default
NS_MAIN)
+// also allows defining optional template-arguments by index 'args' as array
where a
+// key represents an argument name and a keys associated value an argument
value.
$srfgArraySep = ', ';
$srfgArrayPropSep = '<PROP>';
$srfgArrayManySep = '<MANY>';
Modified: trunk/extensions/SemanticResultFormats/SemanticResultFormats.php
===================================================================
--- trunk/extensions/SemanticResultFormats/SemanticResultFormats.php
2012-03-07 23:36:54 UTC (rev 113329)
+++ trunk/extensions/SemanticResultFormats/SemanticResultFormats.php
2012-03-07 23:41:56 UTC (rev 113330)
@@ -21,8 +21,8 @@
die( 'Not an entry point.' );
}
-if ( version_compare( $wgVersion, '1.16', '<' ) ) {
- die( '<b>Error:</b> This version of Semantic Result Formats requires
MediaWiki 1.16 or above; use SRF 1.6.x for older versions.' );
+if ( version_compare( $wgVersion, '1.17', '<' ) ) {
+ die( '<b>Error:</b> This version of Semantic Result Formats requires
MediaWiki 1.17 or above; use SRF 1.7.x or SRF 1.6.x for older versions.' );
}
// Show a warning if Semantic MediaWiki is not loaded.
@@ -34,14 +34,12 @@
die( '<b>Error:</b> This version of Semantic Result Formats requires
Semantic MediaWiki 1.7 or above; use Semantic Result Formats 1.6.1 for older
versions of SMW.' );
}
-define( 'SRF_VERSION', '1.7.1' );
+define( 'SRF_VERSION', '1.8 alpha' );
// Require the settings file.
require dirname( __FILE__ ) . '/SRF_Settings.php';
-if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- require dirname( __FILE__ ) . '/SRF_Resources.php';
-}
+require dirname( __FILE__ ) . '/SRF_Resources.php';
// Initialize the formats later on, so the $srfgFormats setting can be
manipulated in LocalSettings.
$wgExtensionFunctions[] = 'srffInitFormats';
@@ -114,7 +112,7 @@
* @since 1.5.2
*/
function srffInitFormats() {
- global $srfgFormats, $smwgResultFormats, $smwgResultAliases,
$wgAutoloadClasses;
+ global $srfgFormats, $smwgResultFormats, $smwgResultAliases;
$formatClasses = array(
'timeline' => 'SRFTimeline',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
