| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_DISerializer.php |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | foreach ( $queryResult->getResults() as /* SMWDIWikiPage */ $diWikiPage ) { |
| 80 | | - $result = array( 'printeouts' => array() ); |
| | 80 | + $result = array( 'printouts' => array() ); |
| 81 | 81 | |
| 82 | 82 | foreach ( $queryResult->getPrintRequests() as /* SMWPrintRequest */ $printRequest ) { |
| 83 | 83 | $resultAarray = new SMWResultArray( $diWikiPage, $printRequest, $queryResult->getStore() ); |
| — | — | @@ -86,7 +86,7 @@ |
| 87 | 87 | $result += self::getSerialization( array_shift( $dataItems ) ); |
| 88 | 88 | } |
| 89 | 89 | else { |
| 90 | | - $result['printeouts'][$printRequest->getLabel()] = array_map( |
| | 90 | + $result['printouts'][$printRequest->getLabel()] = array_map( |
| 91 | 91 | array( __class__, 'getSerialization' ), |
| 92 | 92 | $resultAarray->getContent() |
| 93 | 93 | ); |
| Index: trunk/extensions/SemanticMediaWiki/includes/api/ApiAskArgs.php |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * API module to query SMW by providing a query specified as |
| 6 | | - * a list of conditions, printeouts and parameters. |
| | 6 | + * a list of conditions, printouts and parameters. |
| 7 | 7 | * |
| 8 | 8 | * @since 1.6.2 |
| 9 | 9 | * |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | |
| 24 | 24 | $query = $this->getQuery( |
| 25 | 25 | implode( array_map( array( __CLASS__, 'wrapCondition' ), $params['conditions'] ) ), |
| 26 | | - array_map( array( __CLASS__, 'printeoutFromString' ), $params['printeouts'] ) |
| | 26 | + array_map( array( __CLASS__, 'printoutFromString' ), $params['printouts'] ) |
| 27 | 27 | ); |
| 28 | 28 | |
| 29 | 29 | $this->addQueryResult( $this->getQueryResult( $query ) ); |
| — | — | @@ -32,11 +32,11 @@ |
| 33 | 33 | return "[[$c]]"; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | | - public static function printeoutFromString( $printeout ) { |
| | 36 | + public static function printoutFromString( $printout ) { |
| 37 | 37 | return new SMWPrintRequest( |
| 38 | 38 | SMWPrintRequest::PRINT_PROP, |
| 39 | | - $printeout, |
| 40 | | - SMWPropertyValue::makeUserProperty( $printeout ) |
| | 39 | + $printout, |
| | 40 | + SMWPropertyValue::makeUserProperty( $printout ) |
| 41 | 41 | ); |
| 42 | 42 | } |
| 43 | 43 | |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | ApiBase::PARAM_TYPE => 'string', |
| 48 | 48 | ApiBase::PARAM_ISMULTI => true, |
| 49 | 49 | ), |
| 50 | | - 'printeouts' => array( |
| | 50 | + 'printouts' => array( |
| 51 | 51 | ApiBase::PARAM_TYPE => 'string', |
| 52 | 52 | ApiBase::PARAM_DFLT => '', |
| 53 | 53 | ApiBase::PARAM_ISMULTI => true, |
| — | — | @@ -61,15 +61,15 @@ |
| 62 | 62 | |
| 63 | 63 | public function getParamDescription() { |
| 64 | 64 | return array( |
| 65 | | - 'conditions' => 'The query conditions, ie the requirements for a subject to be included', |
| 66 | | - 'printeouts' => 'The query printeouts, ie the properties to show per subject', |
| 67 | | - 'parameters' => 'The query parameters, ie all non-condition and non-printeout arguments', |
| | 65 | + 'conditions' => 'The query conditions, i.e. the requirements for a subject to be included', |
| | 66 | + 'printouts' => 'The query printouts, i.e. the properties to show per subject', |
| | 67 | + 'parameters' => 'The query parameters, i.e. all non-condition and non-printout arguments', |
| 68 | 68 | ); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | public function getDescription() { |
| 72 | 72 | return array( |
| 73 | | - 'API module to query SMW by providing a query specified as a list of conditions, printeouts and parameters. |
| | 73 | + 'API module to query SMW by providing a query specified as a list of conditions, printouts and parameters. |
| 74 | 74 | This API module is in alpha stage, and likely to see changes in upcomming versions of SMW.' |
| 75 | 75 | ); |
| 76 | 76 | } |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | |
| 83 | 83 | protected function getExamples() { |
| 84 | 84 | return array( |
| 85 | | - 'api.php?action=askargs&conditions=Modification date::%2B&printeouts=Modification date¶meters=|sort%3DModification date|order%3Ddesc', |
| | 85 | + 'api.php?action=askargs&conditions=Modification%20date::%2B&printouts=Modification%20date¶meters=|sort%3DModification%20date|order%3Ddesc', |
| 86 | 86 | ); |
| 87 | 87 | } |
| 88 | 88 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/api/ApiSMWQuery.php |
| — | — | @@ -56,10 +56,10 @@ |
| 57 | 57 | $result->setIndexedTagName( $serialized['printrequests'], 'printrequest' ); |
| 58 | 58 | |
| 59 | 59 | foreach ( $serialized['results'] as $subjectName => $subject ) { |
| 60 | | - if ( is_array( $subject ) && array_key_exists( 'printeouts', $subject ) ) { |
| 61 | | - foreach ( $subject['printeouts'] as $property => $values ) { |
| | 60 | + if ( is_array( $subject ) && array_key_exists( 'printouts', $subject ) ) { |
| | 61 | + foreach ( $subject['printouts'] as $property => $values ) { |
| 62 | 62 | if ( is_array( $values ) ) { |
| 63 | | - $result->setIndexedTagName( $serialized['results'][$subjectName]['printeouts'][$property], 'value' ); |
| | 63 | + $result->setIndexedTagName( $serialized['results'][$subjectName]['printouts'][$property], 'value' ); |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | } |
| Index: trunk/extensions/SemanticMediaWiki/includes/api/ApiAsk.php |
| — | — | @@ -20,13 +20,13 @@ |
| 21 | 21 | |
| 22 | 22 | $rawParams = explode( '|', $params['query'] ); |
| 23 | 23 | $queryString = ''; |
| 24 | | - $printeouts = array(); |
| | 24 | + $printouts = array(); |
| 25 | 25 | |
| 26 | | - SMWQueryProcessor::processFunctionParams( $rawParams, $queryString, $this->parameters, $printeouts ); |
| | 26 | + SMWQueryProcessor::processFunctionParams( $rawParams, $queryString, $this->parameters, $printouts ); |
| 27 | 27 | |
| 28 | 28 | $queryResult = $this->getQueryResult( $this->getQuery( |
| 29 | 29 | $queryString, |
| 30 | | - $printeouts |
| | 30 | + $printouts |
| 31 | 31 | ) ); |
| 32 | 32 | |
| 33 | 33 | $this->addQueryResult( $queryResult ); |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | |
| 62 | 62 | protected function getExamples() { |
| 63 | 63 | return array( |
| 64 | | - 'api.php?action=ask&query=[[Modification date::%2B]]|%3FModification date|sort%3DModification date|order%3Ddesc', |
| | 64 | + 'api.php?action=ask&query=[[Modification%20date::%2B]]|%3FModification%20date|sort%3DModification%20date|order%3Ddesc', |
| 65 | 65 | ); |
| 66 | 66 | } |
| 67 | 67 | |