http://www.mediawiki.org/wiki/Special:Code/MediaWiki/67606

Revision: 67606
Author:   jojo
Date:     2010-06-08 09:23:59 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
applied patch to enable Zeno and Okawix format

Modified Paths:
--------------
    trunk/extensions/Collection/Collection.body.php
    trunk/extensions/Collection/Collection.php
    trunk/extensions/Collection/README.txt

Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php     2010-06-08 08:34:32 UTC 
(rev 67605)
+++ trunk/extensions/Collection/Collection.body.php     2010-06-08 09:23:59 UTC 
(rev 67606)
@@ -1266,14 +1266,19 @@
                global $wgOut;
                global $wgCollectionMWServeURL;
                global $wgCollectionMWServeCredentials;
-               
+               global $wgCollectionFormatToServeURL;
+
+               $serveURL = $wgCollectionMWServeURL;
+               if ( array_key_exists( $args['writer'], 
$wgCollectionFormatToServeURL ) )
+                       $serveURL = $wgCollectionFormatToServeURL[ 
$args['writer'] ];
+
                $args['command'] = $command;
                if ( $wgCollectionMWServeCredentials ) {
                        $args['login_credentials'] = 
$wgCollectionMWServeCredentials;
                }
                $errorMessage = '';
                $info = false;
-               $response = self::curlreq( 'POST', $wgCollectionMWServeURL, 
$args, $errorMessage, $info, $timeout, $toFile );
+               $response = self::curlreq( 'POST', $serveURL, $args, 
$errorMessage, $info, $timeout, $toFile );
                if ( $toFile ) {
                        if ( $info ) {
                                return $info;

Modified: trunk/extensions/Collection/Collection.php
===================================================================
--- trunk/extensions/Collection/Collection.php  2010-06-08 08:34:32 UTC (rev 
67605)
+++ trunk/extensions/Collection/Collection.php  2010-06-08 09:23:59 UTC (rev 
67606)
@@ -91,8 +91,16 @@
                as mapping of mwlib writer to format name */
 $wgCollectionFormats = array(
        'rl' => 'PDF',
+       #'zeno' => 'ZENO',
+       #'okawix_zeno' => 'Okawix (ZENO + search engine)',
 );
 
+/** For formats which rendering depends on an external server
+*/
+$wgCollectionFormatToServeURL = array(
+       'zeno'=>'http://www.okawix.com/collections/render.php',
+       'okawix_zeno'=>'http://www.okawix.com/collections/render.php',
+);
 
 $wgCollectionContentTypeToFilename = array(
        'application/pdf' => 'collection.pdf',

Modified: trunk/extensions/Collection/README.txt
===================================================================
--- trunk/extensions/Collection/README.txt      2010-06-08 08:34:32 UTC (rev 
67605)
+++ trunk/extensions/Collection/README.txt      2010-06-08 09:23:59 UTC (rev 
67606)
@@ -233,6 +233,10 @@
        The name of the template can be adjusted via the system message
        Coll-savedbook_template, i.e. by editing 
[[MediaWiki:Coll-savedbook_template]].
 
+* To enable ZENO and Okawix export, uncomment the corresponding lines in 
$wgCollectionFormats
+  (file Collection.php). These exports are devoted to the Wikimedia projects 
and their mirrors.
+  They cannot be used on other wikis since they get data and search engine 
indexes from the cache
+  of wikiwix.com.
 
 Customization via System Messages
 =================================



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to