| Index: trunk/WikiWord/WikiWordWeb/src/main/maintenance/concept-info-local.sql |
| — | — | @@ -59,3 +59,13 @@ |
| 60 | 60 | on X.concept = I.concept and I.lang = "{lang}" |
| 61 | 61 | set I.related = X.related; |
| 62 | 62 | |
| | 63 | +-- collect features |
| | 64 | +update {collection}_{thesaurus}_concept_info as I |
| | 65 | +join ( select concept1 as concept, group_concat(distinct concat(concept2, ":", if (local_concept_name is null, "", local_concept_name)) separator "|") as related |
| | 66 | +from {collection}_{thesaurus}_features |
| | 67 | + left join {collection}_{thesaurus}_origin as O on O.global_concept = concept2 and O.lang = "{lang}" |
| | 68 | + where bilink >= 1 |
| | 69 | + group by concept1 ) as X |
| | 70 | +on X.concept = I.concept and I.lang = "{lang}" |
| | 71 | +set I.features = X.features; |
| | 72 | + |
| Index: trunk/WikiWord/WikiWordWeb/src/main/www/wikipics/response.html.php |
| — | — | @@ -254,6 +254,8 @@ |
| 255 | 255 | <td colspan="3"> |
| 256 | 256 | <h1 class="name <?php print "weight_$wclass"; ?>"><?php print getConceptDetailsLink($langs, $concept); ?>:</h1> |
| 257 | 257 | <p class="definition"><?php print htmlspecialchars($definition); ?></p> |
| | 258 | + <div class="wikipages"><?php printConceptPageList( $langs, $concept, $lclass, $terse ? $wwMaxPreviewLinks : $wwMaxDetailLinks ); ?></div> |
| | 259 | + <strong class="more">[<?php print getConceptDetailsLink($langs, $concept, "details..."); ?>]</strong> |
| 258 | 260 | </td> |
| 259 | 261 | </tr> |
| 260 | 262 | |
| — | — | @@ -264,14 +266,17 @@ |
| 265 | 267 | else $more = printConceptImageList( $gallery, $terse, $wwGalleryColumns, $terse ? $wwMaxPreviewImages : $wwMaxGalleryImages ); |
| 266 | 268 | ?> |
| 267 | 269 | </td> |
| 268 | | - <?php if ($gallery) { ?> |
| 269 | | - <td class="cell_more_images" colspan="1" width="100%" style="vertical-align:bottom; padding: 1ex; font-size:normal;"> |
| 270 | | - <?php if ($terse) print " <div><strong class=\"more\">[" . getConceptDetailsLink($langs, $concept, "more/details...") . "]</strong></div>"; ?> |
| | 270 | + </tr> |
| | 271 | + |
| | 272 | + <?php if ($gallery && $terse && $more) { ?> |
| | 273 | + <tr class="row_images row_more_images"> |
| | 274 | + <td class="cell_more_images" colspan="3" width="100%" style="vertical-align:bottom; padding: 1ex; font-size:normal;"> |
| | 275 | + <?php print " <div><strong class=\"more\">[" . getConceptDetailsLink($langs, $concept, "all ".count($gallery)." images...") . "]</strong></div>"; ?> |
| 271 | 276 | </td> |
| 272 | | - <?php } ?> |
| 273 | 277 | </tr> |
| | 278 | + <?php } ?> |
| 274 | 279 | |
| 275 | | - <?php if (@$concept['narrower']) { ?> |
| | 280 | + <?php if (!$terse && @$concept['narrower']) { ?> |
| 276 | 281 | <tr class="row_narrower"> |
| 277 | 282 | <td class="cell_related" colspan="3"> |
| 278 | 283 | <strong class="label">Narrower:</strong> |
| — | — | @@ -283,6 +288,7 @@ |
| 284 | 289 | </tr> |
| 285 | 290 | <?php } ?> |
| 286 | 291 | |
| | 292 | + <?php if (!$terse && @$concept['narrower']) { ?> |
| 287 | 293 | <?php |
| 288 | 294 | $related = getRelatedConceptList($concept); |
| 289 | 295 | if ($related) { |
| — | — | @@ -297,8 +303,9 @@ |
| 298 | 304 | </td> |
| 299 | 305 | </tr> |
| 300 | 306 | <?php } ?> |
| | 307 | + <?php } ?> |
| 301 | 308 | |
| 302 | | - <?php if (@$concept['broader']) { ?> |
| | 309 | + <?php if (!$terse && @$concept['broader']) { ?> |
| 303 | 310 | <tr class="row_category"> |
| 304 | 311 | <td class="cell_related" colspan="3"> |
| 305 | 312 | <strong class="label">Broader:</strong> |
| — | — | @@ -310,15 +317,6 @@ |
| 311 | 318 | </tr> |
| 312 | 319 | <?php } ?> |
| 313 | 320 | |
| 314 | | - <?php if (!$terse && @$concept['pages']) { ?> |
| 315 | | - <tr class="row_pages"> |
| 316 | | - <td class="cell_pages wikipages" colspan="3"> |
| 317 | | - <strong class="label">Wiki pages:</strong> <?php $more = printConceptPageList( $langs, $concept, $lclass, $terse ? $wwMaxPreviewLinks : $wwMaxDetailLinks ); ?> |
| 318 | | - <?php if ($terse && $more) print " <strong class=\"more\">[" . getConceptDetailsLink($langs, $concept, "more...") . "]</strong>"; ?> |
| 319 | | - </td> |
| 320 | | - </tr> |
| 321 | | - <?php } ?> |
| 322 | | - |
| 323 | 321 | <tr class="row_blank"> |
| 324 | 322 | <td class="cell_blank" colspan="3"> |
| 325 | 323 | |
| Index: trunk/WikiWord/WikiWordWeb/src/main/www/wikipics/search.php |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | try { |
| 255 | 255 | if ($lang && $conceptId) { |
| 256 | 256 | $mode = "concept"; |
| 257 | | - $result = $thesaurus->getConceptInfo($conceptId, $lang, null, $allLanguages, $wwMax); |
| | 257 | + $result = $thesaurus->getConceptInfo($conceptId, $lang, null, $allLanguages); |
| 258 | 258 | if ( $result ) $result = array( $result ); //hack |
| 259 | 259 | } else if ($lang && $term) { |
| 260 | 260 | $mode = "term"; |