| Index: trunk/extensions/SemanticResultFormats/Ploticus/SRF_Ploticus.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | protected $m_tblheight = ''; |
| 38 | 38 | protected $m_width = ''; |
| 39 | 39 | protected $m_height = ''; |
| 40 | | - protected $m_params = array(); |
| | 40 | + protected $mShowHeaders = false; // override and make it false by default coz of current known overflow problem with Ploticus |
| 41 | 41 | |
| 42 | 42 | protected function readParameters($params, $outputmode) { |
| 43 | 43 | SMWResultPrinter::readParameters($params, $outputmode); |
| — | — | @@ -94,6 +94,13 @@ |
| 95 | 95 | if (array_key_exists('height', $this->m_params)) { |
| 96 | 96 | $this->m_height = trim($params['height']); |
| 97 | 97 | } |
| | 98 | + if (array_key_exists('headers', $this->m_params)) { |
| | 99 | + if ( 'hide' == strtolower(trim($params['headers']))) { |
| | 100 | + $this->mShowHeaders = false; |
| | 101 | + } else { |
| | 102 | + $this->mShowHeaders = true; |
| | 103 | + } |
| | 104 | + } |
| 98 | 105 | } |
| 99 | 106 | |
| 100 | 107 | protected function getResultText($res, $outputmode) { |
| — | — | @@ -176,8 +183,8 @@ |
| 177 | 184 | |
| 178 | 185 | // we create a hash based on params |
| 179 | 186 | // this is a great way to see if the params and/or the query result has changed |
| 180 | | - $hashname = hash('md5', implode(',',$this->m_params)); |
| 181 | | - if (!$this->m_imageformat != 'csv' && $this->m_liveupdating) { |
| | 187 | + $hashname = hash('md5', $smwgIQRunningNumber . implode(',',$this->m_params)); |
| | 188 | + if ($this->m_imageformat != 'csv' && $this->m_liveupdating) { |
| 182 | 189 | // only include contents of result csv in hash when liveupdating is on and imageformat != csv |
| 183 | 190 | // in this way, doing file_exists check against hash filename will fail when query result has changed |
| 184 | 191 | $hashname .= hash_file('md5',$tmpFile); |
| Index: trunk/extensions/SemanticResultFormats/Ploticus/README |
| — | — | @@ -9,8 +9,8 @@ |
| 10 | 10 | 2) Ploticus 2.40 (http://ploticus.sourceforge.net). |
| 11 | 11 | Patch required if you plan to use SVG/SVGZ formats with imagemaps. (see Imagemap section below) |
| 12 | 12 | |
| 13 | | -When both of them are up and running, you can install this extension like |
| 14 | | -any other semantic result printer (refer to the separate README for that). |
| | 13 | +When both required systems are up and running, you can install this extension like |
| | 14 | +any other semantic result printer (refer to the Semantic Result Formats README for that). |
| 15 | 15 | |
| 16 | 16 | LocalSettings.php Modifications: |
| 17 | 17 | ------------------------------- |
| — | — | @@ -25,8 +25,8 @@ |
| 26 | 26 | E.g. if you plan to use additional fonts in SWF files |
| 27 | 27 | SWF_FONTS_DIR=/usr/share/ming/fonts/ttf-dejavu/fdb |
| 28 | 28 | |
| 29 | | - E.g. set global ploticus config parameters with a config file. See ./ploticus-addons/ploticus.config for a sample config file and |
| 30 | | - http://ploticus.sourceforge.net/doc/config.html for more info. |
| | 29 | + E.g. if you plan to set global ploticus config parameters with a config file. |
| | 30 | + See ./ploticus-addons/ploticus.config for a sample config file and http://ploticus.sourceforge.net/doc/config.html for more info. |
| 31 | 31 | PLOTICUS_CONFIG=/etc/ploticus/ploticus.config |
| 32 | 32 | |
| 33 | 33 | Remember, you can pass multiple environment variables, e.g. |
| — | — | @@ -48,10 +48,10 @@ |
| 49 | 49 | 0 0 * * * MW_INSTALL_PATH=/var/www/wiki /usr/bin/php /var/www/wiki/extension/SemanticResultFormats/Ploticus/SRF_Ploticus_cleanCache.php -v 2>&1 > /var/log/ploticus_cleanCache.log |
| 50 | 50 | |
| 51 | 51 | * $wgEnableUploads (default: false - this is a MediaWiki setting) |
| 52 | | - - must be true. Be sure the upload directory has the proper permissions. If you wish to use SRF-Ploticus without enabling uploads, |
| 53 | | - you can manually create the 'ploticus' directory under the MW upload. Further, under the ploticus directory, subdirectories from 0 to f hex |
| 54 | | - (e.g. 0,1,2,3...9,a,b,c,d,e,f) should also be created, all with permission 777. |
| 55 | | - (see http://www.mediawiki.org/wiki/Manual:$wgUploadPath) |
| | 52 | + - must be true. Be sure the upload directory has the proper permissions. (see http://www.mediawiki.org/wiki/Manual:$wgUploadPath) |
| | 53 | + If you MUST use SRF-Ploticus without enabling uploads, you can manually create the 'ploticus' directory under the |
| | 54 | + MediaWiki upload directory (Typically, MW_INSTALL_PATH/images). Further, under the ploticus directory, subdirectories from |
| | 55 | + 0 to f hex (e.g. 0,1,2...9,a,b,c,d,e,f) should also be created, all with permission 777. |
| 56 | 56 | |
| 57 | 57 | == Configuration and Usage == |
| 58 | 58 | |
| — | — | @@ -234,7 +234,7 @@ |
| 235 | 235 | At the moment, SRF-Ploticus corrects the clickmap URL targets for PNG, GIF and JPEG raster formats, swapping out the + for _. |
| 236 | 236 | SVG clickmaps will require the patch to work properly. |
| 237 | 237 | |
| 238 | | -Once the patch is applied, a new PLOTICUS_CONFIG parameter is now available - encodeclickmapurls. This should be set to |
| | 238 | +Once the patch is applied, a new PLOTICUS_CONFIG parameter is exposed - encodeclickmapurls. This should be set to |
| 239 | 239 | yes in the PLOTICUS_CONFIG file (e.g. encodeclickmapurls: yes). See http://ploticus.sourceforge.net/doc/config.html. |
| 240 | 240 | |
| 241 | 241 | |