OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed logstat (#5461) and okapi_syncbases

Browse Source
This commit is contained in:
following
2013-04-21 15:49:54 +02:00
parent ebb9d45160
commit c989c004f3
6 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/dbmaintain.php
View File

@ -26,6 +26,7 @@
$procedures[] = 'sp_updateall_cache_picturestat';
$procedures[] = 'sp_updateall_cachelog_picturestat';
$procedures[] = 'sp_updateall_cache_listingdates';
$procedures[] = 'sp_updateall_cachelog_logdates';
$tpl->assign('procedures', $procedures);
@ -55,6 +56,8 @@
sql("CALL sp_updateall_cachelog_picturestat(@c)");
else if ($proc == 'sp_updateall_cache_listingdates')
sql("CALL sp_updateall_cache_listingdates(@c)");
else if ($proc == 'sp_updateall_cachelog_logdates')
sql("CALL sp_updateall_cachelog_logdates(@c)");
else
{
$bError = true;

6
htdocs/doc/sql/db-changes.txt
View File

@ -60,4 +60,8 @@ date commit ID change
2013-03-24 9644465 added table 'pw_dict'
2013-03-25 21d92fe added field cache_reports.date_created + trigger
2013-03-27 467aae4 added fields cache_attrib.gc_id, .gc_inc and .gc_name
2013-04-06 e281cfa changed cach_logs.date and cach_logs_archived.date type to datetime
2013-04-06 e281cfa changed cach_logs.date and cach_logs_archived.date type to datetime
2013-04-22 added fields caches.meta_last_modified, cache_logs.log_last_modified,
cache_logs_archived.log_last_modified, and triggers
initialize with dbmaint.php / sp_updateall_logdates

66
htdocs/doc/sql/stored-proc/maintain.php
View File

@ -230,6 +230,19 @@
SET nModified = ROW_COUNT();
END;");
sql_dropProcedure('sp_updateall_cachelog_logdates');
sql("CREATE PROCEDURE sp_updateall_cachelog_logdates (OUT nModified INT)
BEGIN
UPDATE `cache_logs` SET `log_last_modified` =
GREATEST(`last_modified`,
IFNULL((SELECT MAX(`last_modified`) FROM `pictures` WHERE `pictures`.`object_type`=1 AND `pictures`.`object_id` = `cache_logs`.`id`),'0')
);
SET nModified = ROW_COUNT();
UPDATE `cache_logs_archived` SET `log_last_modified` =
GREATEST(`last_modified`,`log_last_modified`);
SET nModified = nModified + ROW_COUNT();
END;");
// set caches.desc_languages of given cacheid and fill cache_desc_prefered
sql_dropProcedure('sp_update_caches_descLanguages');
sql("CREATE PROCEDURE sp_update_caches_descLanguages (IN nCacheId INT(10) UNSIGNED)
@ -849,6 +862,7 @@
IF ISNULL(@XMLSYNC) OR @XMLSYNC!=1 THEN
SET NEW.`date_created`=NOW();
SET NEW.`last_modified`=NOW();
SET NEW.`log_last_modified`=NOW();
END IF;
IF ISNULL(NEW.`uuid`) OR NEW.`uuid`='' THEN
@ -893,8 +907,11 @@
NEW.`date`!=OLD.`date` OR
NEW.`text`!=OLD.`text` OR
NEW.`text_html`!=OLD.`text_html` THEN
SET NEW.`last_modified`=NOW();
SET NEW.`log_last_modified`=NOW();
END IF;
IF NEW.`picture`!=OLD.`picture` THEN
SET NEW.`log_last_modified`=NOW();
END IF;
END IF;
END;");
@ -903,7 +920,7 @@
sql("CREATE TRIGGER `cacheLogsAfterUpdate` AFTER UPDATE ON `cache_logs`
FOR EACH ROW
BEGIN
IF OLD.`cache_id`!=NEW.`cache_id` OR OLD.`user_id`!=NEW.`user_id` OR OLD.`type`!=NEW.`type` THEN
IF OLD.`cache_id`!=NEW.`cache_id` OR OLD.`user_id`!=NEW.`user_id` OR OLD.`type`!=NEW.`type` OR OLD.`date`!=NEW.`date` THEN
CALL sp_update_logstat(OLD.`cache_id`, OLD.`user_id`, OLD.`type`, TRUE);
CALL sp_update_logstat(NEW.`cache_id`, NEW.`user_id`, NEW.`type`, FALSE);
END IF;
@ -1430,4 +1447,49 @@
SET NEW.`date_created`=NOW();
END IF;
END;");
sql_dropTrigger('statCachesAfterInsert');
sql("CREATE TRIGGER `statCachesAfterInsert` AFTER INSERT ON `stat_caches`
FOR EACH ROW
BEGIN
/* meta_last_modified=NOW() is used to trigger an update of okapi_syncbase,
if OKAPI is installed. */
UPDATE caches SET meta_last_modified=NOW() WHERE caches.cache_id=NEW.cache_id;
END;");
sql_dropTrigger('statCachesAfterUpdate');
sql("CREATE TRIGGER `statCachesAfterUpdate` AFTER UPDATE ON `stat_caches`
FOR EACH ROW
BEGIN
IF NEW.found<>OLD.found OR NEW.notfound<>OLD.notfound OR NEW.note<>OLD.note OR
NEW.will_attend<>OLD.will_attend OR NEW.last_found<>OLD.last_found OR
NEW.watch<>OLD.watch OR NEW.ignore<>OLD.ignore OR NEW.toprating<>OLD.toprating THEN
/* meta_last_modified=NOW() is used to trigger an update of okapi_syncbase,
if OKAPI is installed. */
UPDATE caches SET meta_last_modified=NOW() WHERE caches.cache_id=NEW.cache_id;
END IF;
END;");
sql_dropTrigger('gkItemWaypointAfterInsert');
sql("CREATE TRIGGER `gkItemWaypointAfterInsert` AFTER INSERT ON `gk_item_waypoint`
FOR EACH ROW
BEGIN
UPDATE caches SET meta_last_modified=NOW() WHERE caches.wp_oc=NEW.wp;
END;");
sql_dropTrigger('gkItemWaypointAfterUpdate');
sql("CREATE TRIGGER `gkItemWaypointAfterUpdate` AFTER UPDATE ON `gk_item_waypoint`
FOR EACH ROW
BEGIN
UPDATE caches SET meta_last_modified=NOW() WHERE caches.wp_oc=OLD.wp;
UPDATE caches SET meta_last_modified=NOW() WHERE caches.wp_oc=NEW.wp;
END;");
sql_dropTrigger('gkItemWaypointAfterDelete');
sql("CREATE TRIGGER `gkItemWaypointAfterDelete` AFTER DELETE ON `gk_item_waypoint`
FOR EACH ROW
BEGIN
UPDATE caches SET meta_last_modified=NOW() WHERE caches.wp_oc=OLD.wp;
END;");
?>

1
htdocs/doc/sql/tables/cache_logs.sql
View File

@ -6,6 +6,7 @@ CREATE TABLE `cache_logs` (
`node` tinyint(3) unsigned NOT NULL default '0',
`date_created` datetime NOT NULL COMMENT 'via Trigger (cache_logs)',
`last_modified` datetime NOT NULL COMMENT 'via Trigger (cache_logs)',
`log_last_modified` datetime NOT NULL COMMENT 'via Trigger (cache_logs)',
`cache_id` int(10) unsigned NOT NULL,
`user_id` int(10) unsigned NOT NULL,
`type` tinyint(3) unsigned NOT NULL,

1
htdocs/doc/sql/tables/cache_logs_archived.sql
View File

@ -6,6 +6,7 @@ CREATE TABLE `cache_logs_archived` (
`node` tinyint(3) unsigned NOT NULL,
`date_created` datetime NOT NULL,
`last_modified` datetime NOT NULL,
`log_last_modified` datetime NOT NULL,
`cache_id` int(10) unsigned NOT NULL,
`user_id` int(10) unsigned NOT NULL,
`type` tinyint(3) unsigned NOT NULL,

1
htdocs/doc/sql/tables/caches.sql
View File

@ -8,6 +8,7 @@ CREATE TABLE `caches` (
`is_publishdate` tinyint(1) NOT NULL default '0' COMMENT '1 = date_created is publication date',
`last_modified` datetime NOT NULL COMMENT 'via Trigger (caches)',
`listing_last_modified` datetime NOT NULL COMMENT 'via Trigger (caches, cache_desc, coordinates, pictures)',
`meta_last_modified` datetime NOT NULL COMMENT 'via Trigger (stat_caches, gk_item_waypoint)',
`user_id` int(10) unsigned NOT NULL,
`name` varchar(255) NOT NULL,
`longitude` double NOT NULL,