Index: trunk/extensions/SemanticMaps/SemanticMaps.php |
— | — | @@ -35,7 +35,7 @@ |
36 | 36 | |
37 | 37 | // Only initialize the extension when all dependencies are present. |
38 | 38 | if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) { |
39 | | - define( 'SM_VERSION', '0.6 a17' ); |
| 39 | + define( 'SM_VERSION', '0.6 a19' ); |
40 | 40 | |
41 | 41 | $smgScriptPath = ( isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions' ) . '/SemanticMaps'; |
42 | 42 | $smgDir = dirname( __FILE__ ) . '/'; |
Index: trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php |
— | — | @@ -62,72 +62,72 @@ |
63 | 63 | 'geoservice' => array( |
64 | 64 | 'criteria' => array( |
65 | 65 | 'in_array' => $egMapsAvailableGeoServices |
66 | | - ), |
| 66 | + ), |
67 | 67 | 'default' => $egMapsDefaultGeoService |
68 | | - ), |
| 68 | + ), |
69 | 69 | 'format' => array( |
70 | 70 | 'required' => true, |
71 | 71 | 'default' => $egMapsDefaultServices['qp'] |
72 | | - ), |
| 72 | + ), |
73 | 73 | 'centre' => array( |
74 | 74 | 'aliases' => array( 'center' ), |
75 | | - ), |
| 75 | + ), |
76 | 76 | 'forceshow' => array( |
77 | 77 | 'type' => 'boolean', |
78 | 78 | 'aliases' => array( 'force show' ), |
79 | 79 | 'default' => $smgQPForceShow, |
80 | 80 | 'output-type' => 'boolean' |
81 | | - ), |
| 81 | + ), |
82 | 82 | 'template' => array( |
83 | 83 | 'criteria' => array( |
84 | 84 | 'not_empty' => array() |
85 | | - ), |
| 85 | + ), |
86 | 86 | 'default' => $smgQPTemplate, |
87 | | - ), |
| 87 | + ), |
88 | 88 | 'showtitle' => array( |
89 | 89 | 'type' => 'boolean', |
90 | 90 | 'aliases' => array( 'show title' ), |
91 | 91 | 'default' => $smgQPShowTitle, |
92 | 92 | 'output-type' => 'boolean' |
93 | | - ), |
| 93 | + ), |
94 | 94 | 'icon' => array( |
95 | 95 | 'criteria' => array( |
96 | 96 | 'not_empty' => array() |
97 | | - ) |
98 | | - ), |
| 97 | + ) |
| 98 | + ), |
99 | 99 | // SMW #Ask: parameters |
100 | 100 | 'limit' => array( |
101 | 101 | 'type' => 'integer', |
102 | 102 | 'criteria' => array( |
103 | 103 | 'in_range' => array( 0 ) |
104 | | - ) |
105 | | - ), |
| 104 | + ) |
| 105 | + ), |
106 | 106 | 'offset' => array( |
107 | 107 | 'type' => 'integer' |
108 | | - ), |
| 108 | + ), |
109 | 109 | 'sort' => array(), |
110 | 110 | 'order' => array( |
111 | 111 | 'criteria' => array( |
112 | 112 | 'in_array' => array( 'ascending', 'asc', 'descending', 'desc', 'reverse' ) |
113 | | - ) |
114 | | - ), |
| 113 | + ) |
| 114 | + ), |
115 | 115 | 'headers' => array( |
116 | 116 | 'criteria' => array( |
117 | 117 | 'in_array' => array( 'show', 'hide' ) |
118 | | - ) |
119 | | - ), |
| 118 | + ) |
| 119 | + ), |
120 | 120 | 'mainlabel' => array(), |
121 | 121 | 'link' => array( |
122 | 122 | 'criteria' => array( |
123 | 123 | 'in_array' => array( 'none', 'subject', 'all' ) |
124 | | - ) |
125 | | - ), |
| 124 | + ) |
| 125 | + ), |
126 | 126 | 'default' => array(), |
127 | 127 | 'intro' => array(), |
128 | 128 | 'outro' => array(), |
129 | 129 | 'searchlabel' => array(), |
130 | 130 | 'distance' => array(), |
131 | | - ); |
| 131 | + ); |
132 | 132 | } |
133 | 133 | |
134 | 134 | /** |