- Timestamp:
- Nov 29, 2009, 3:06:16 PM (14 years ago)
- Location:
- trunk/include
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/dblayer/functions_mysql.inc.php
r4385 r4387 459 459 } 460 460 461 function pwg_db_get_recent_period_expression($period, $date='CURRENT_DATE') 462 { 463 if ($date!='CURRENT_DATE') 464 { 465 $date = '\''.$date.'\''; 466 } 467 468 return 'SUBDATE('.$date.',INTERVAL '.$period.' DAY)'; 469 } 470 471 function pwg_db_get_recent_period($period, $date='CURRENT_DATE') 472 { 473 $query = ' 474 SELECT '.pwg_db_get_recent_period_expression($period); 475 list($d) = pwg_db_fetch_row(pwg_query($query)); 476 477 return $d; 461 function pwg_db_concat_ws($string, $separaor) 462 { 463 return 'CONCAT_WS(\''.$separaor.'\','. $string.')'; 464 } 465 466 function pwg_db_cast_to_text($string) 467 { 468 return 'CAST('.$string.' AS CHAR)'; 478 469 } 479 470 -
trunk/include/functions.inc.php
r4367 r4387 33 33 34 34 //----------------------------------------------------------- generic functions 35 function get_extra_fiels($order_by_fields) 36 { 37 $fields = str_ireplace(array(' order by ', ' desc', ' asc'), 38 array('', '', ''), 39 $order_by_fields 40 ); 41 if (!empty($fields)) 42 { 43 $fields = ','.$fields; 44 } 45 return $fields; 46 } 35 47 36 48 // The function get_moment returns a float value coresponding to the number -
trunk/include/functions_tag.inc.php
r4334 r4387 50 50 WHERE' 51 51 ).' 52 GROUP BY tag_id 53 ORDER BY NULL'; 52 GROUP BY tag_id'; 54 53 $tag_counters = simple_hash_from_query($query, 'tag_id', 'counter'); 55 54 … … 235 234 } 236 235 $query .=' 237 GROUP BY tag_id ';236 GROUP BY tag_id, t.id, t.name, t.url_name'; 238 237 if ($max_tags>0) 239 238 { … … 241 240 ORDER BY counter DESC 242 241 LIMIT '.$max_tags; 243 }244 else245 {246 $query .= '247 ORDER BY NULL';248 242 } 249 243 -
trunk/include/section_init.inc.php
r4385 r4387 293 293 // Main query 294 294 $query = ' 295 SELECT DISTINCT(image_id) 295 SELECT DISTINCT(image_id)'.get_extra_fields($conf['order_by']).' 296 296 FROM '.IMAGE_CATEGORY_TABLE.' 297 297 INNER JOIN '.IMAGES_TABLE.' ON id = image_id … … 327 327 { 328 328 $query = ' 329 SELECT DISTINCT image_id 329 SELECT DISTINCT image_id'.get_extra_fields($conf['order_by']).' 330 330 FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' ON image_id=id 331 331 WHERE image_id IN ('.implode(',', $items).') … … 444 444 445 445 $query = ' 446 SELECT DISTINCT(id) 446 SELECT DISTINCT(id)'.get_extra_fields($conf['order_by'].' 447 447 FROM '.IMAGES_TABLE.' 448 448 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id … … 482 482 $conf['order_by'] = ' ORDER BY hit DESC, file ASC'; 483 483 $query = ' 484 SELECT DISTINCT(id) 484 SELECT DISTINCT(id), hit, file 485 485 FROM '.IMAGES_TABLE.' 486 486 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id … … 509 509 510 510 $query =' 511 SELECT DISTINCT(id) 511 SELECT DISTINCT(id), average_rate 512 512 FROM '.IMAGES_TABLE.' 513 513 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id … … 532 532 { 533 533 $query =' 534 SELECT DISTINCT(id) 534 SELECT DISTINCT(id)'.get_extra_fields($conf['order_by'].' 535 535 FROM '.IMAGES_TABLE.' 536 536 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
Note: See TracChangeset
for help on using the changeset viewer.