| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php |
| — | — | @@ -624,15 +624,15 @@ |
| 625 | 625 | protected function showFormatOptions( $format, array $paramValues ) { |
| 626 | 626 | $printer = SMWQueryProcessor::getResultPrinter( $format, SMWQueryProcessor::SPECIAL_PAGE ); |
| 627 | 627 | |
| 628 | | - $params = method_exists( $printer, 'getParameters' ) ? $printer->getParameters() : array(); |
| | 628 | + $params = method_exists( $printer, 'getValidatorParameters' ) ? $printer->getValidatorParameters() : array(); |
| 629 | 629 | |
| 630 | | - // Ignore the format parameter, as we got a special control in the GUI for it already. |
| 631 | | - unset( $params['format'] ); |
| 632 | | - |
| 633 | 630 | $optionsHtml = array(); |
| 634 | 631 | |
| 635 | 632 | foreach ( $params as $param ) { |
| 636 | | - $param = $this->tovalidatorParam($param); |
| | 633 | + // Ignore the format parameter, as we got a special control in the GUI for it already. |
| | 634 | + if( $param->getName() == 'format') { |
| | 635 | + continue; |
| | 636 | + } |
| 637 | 637 | $currentValue = array_key_exists( $param->getName(), $paramValues ) ? $paramValues[$param->getName()] : false; |
| 638 | 638 | |
| 639 | 639 | $optionsHtml[] = |
| — | — | @@ -675,45 +675,6 @@ |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | /** |
| 679 | | - * Returns a Validator style Parameter definition. |
| 680 | | - * SMW 1.5.x style definitions are converted. |
| 681 | | - * |
| 682 | | - * @param mixed $param Parameter or array |
| 683 | | - * |
| 684 | | - * @return Parameter |
| 685 | | - */ |
| 686 | | - private function toValidatorParam( $param ) { |
| 687 | | - static $typeMap = array( |
| 688 | | - 'int' => Parameter::TYPE_INTEGER |
| 689 | | - ); |
| 690 | | - |
| 691 | | - if ( !( $param instanceof Parameter ) ) { |
| 692 | | - if ( !array_key_exists( 'type', $param ) ) { |
| 693 | | - $param['type'] = 'string'; |
| 694 | | - } |
| 695 | | - |
| 696 | | - $paramClass = $param['type'] == 'enum-list' ? |
| 697 | | - 'ListParameter' : 'Parameter'; |
| 698 | | - $paramType = array_key_exists( $param['type'], $typeMap ) ? |
| 699 | | - $typeMap[$param['type']] : Parameter::TYPE_STRING; |
| 700 | | - |
| 701 | | - $parameter = new $paramClass( $param['name'], $paramType ); |
| 702 | | - |
| 703 | | - if ( array_key_exists( 'description', $param ) ) { |
| 704 | | - $parameter->setDescription( $param['description'] ); |
| 705 | | - } |
| 706 | | - |
| 707 | | - if ( array_key_exists( 'values', $param ) && is_array( $param['values'] ) ) { |
| 708 | | - $parameter->addCriteria( new CriterionInArray( $param['values'] ) ); |
| 709 | | - } |
| 710 | | - |
| 711 | | - return $parameter; |
| 712 | | - } else { |
| 713 | | - return $param; |
| 714 | | - } |
| 715 | | - } |
| 716 | | - |
| 717 | | - /** |
| 718 | 679 | * Get the HTML for a single parameter input. |
| 719 | 680 | * A helper method for showFormatOptions() |
| 720 | 681 | * |