add p_id to r-tables and delete r-data when pingbackcontent data gets deleted

diff --git a/data/tables.sql b/data/tables.sql
index cd4aa7f5dc23c6da9d0af2cb0633661e2c76f258..096199f82516d40888ff1ef10d0cb16790024eca 100644 (file)
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -46,7 +46,7 @@ CREATE TABLE `pingbackcontent` (
   `pc_detected_type` varchar(16) NOT NULL,
   PRIMARY KEY (`pc_id`),
   UNIQUE KEY `pc_id` (`pc_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 
 CREATE TABLE `pingbacks` (
@@ -75,6 +75,7 @@ CREATE TABLE `pingbacktargets` (
 
 CREATE TABLE `rbookmarks` (
   `rb_id` int(11) NOT NULL AUTO_INCREMENT,
+  `rb_p_id` int(11) NOT NULL,
   `rb_pc_id` int(11) NOT NULL,
   `rb_target` varchar(2048) NOT NULL,
   `rb_source` varchar(2048) NOT NULL,
@@ -87,6 +88,7 @@ CREATE TABLE `rbookmarks` (
 
 CREATE TABLE `rcomments` (
   `rc_id` int(11) NOT NULL AUTO_INCREMENT,
+  `rc_p_id` int(11) NOT NULL,
   `rc_pc_id` int(11) NOT NULL,
   `rc_target` varchar(2048) NOT NULL,
   `rc_source` varchar(2048) NOT NULL,
@@ -103,6 +105,7 @@ CREATE TABLE `rcomments` (
 
 CREATE TABLE `rlinks` (
   `rl_id` int(11) NOT NULL AUTO_INCREMENT,
+  `rl_p_id` int(11) NOT NULL,
   `rl_pc_id` int(11) NOT NULL,
   `rl_target` varchar(2048) NOT NULL,
   `rl_source` varchar(2048) NOT NULL,
@@ -113,6 +116,6 @@ CREATE TABLE `rlinks` (
   `rl_author_image` varchar(2048) NOT NULL,
   PRIMARY KEY (`rl_id`),
   UNIQUE KEY `rb_id` (`rl_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Bookmarks, extracted from pingbackcontent';
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Bookmarks, extracted from pingbackcontent';
 
 

diff --git a/src/stapibas/Content/Extractor.php b/src/stapibas/Content/Extractor.php
index 63e3167768490a5d221db603617334e1ceaac47d..6bbfb9ed0a3ca2e8284e927bc1a372c18c2a9f7d 100644 (file)
--- a/src/stapibas/Content/Extractor.php
+++ b/src/stapibas/Content/Extractor.php
@@ -67,7 +67,8 @@ class Content_Extractor
             var_dump($data);
             $this->db->exec(
                 'INSERT INTO rcomments SET'
-                . '  rc_pc_id = ' . $this->db->quote($contentRow->pc_id)
+                . '  rc_p_id = ' . $this->db->quote($contentRow->p_id)
+                . ', rc_pc_id = ' . $this->db->quote($contentRow->pc_id)
                 . ', rc_source = ' . $this->db->quote($contentRow->p_source)
                 . ', rc_target = ' . $this->db->quote($contentRow->p_target)
                 . ', rc_title = ' . $this->db->quote($data['title'])
@@ -88,7 +89,8 @@ class Content_Extractor
             $this->log->info('Link found');
             $this->db->exec(
                 'INSERT INTO rlinks SET'
-                . '  rl_pc_id = ' . $this->db->quote($contentRow->pc_id)
+                . '  rl_p_id = ' . $this->db->quote($contentRow->p_id)
+                . ', rl_pc_id = ' . $this->db->quote($contentRow->pc_id)
                 . ', rl_source = ' . $this->db->quote($contentRow->p_source)
                 . ', rl_target = ' . $this->db->quote($contentRow->p_target)
                 . ', rl_title = ' . $this->db->quote($data['title'])

diff --git a/src/stapibas/Content/Fetcher.php b/src/stapibas/Content/Fetcher.php
index 108a703c669379846111bdb5515a00fa381d0324..de912c1c5b22d21d9d311e39aa8f4ad77009ba0d 100644 (file)
--- a/src/stapibas/Content/Fetcher.php
+++ b/src/stapibas/Content/Fetcher.php
@@ -56,13 +56,15 @@ class Content_Fetcher
             return;
         }
 
-        $this->db->exec(
-            'DELETE FROM pingbackcontent WHERE'
-            . ' pc_p_id = ' . $this->db->quote($pingbackRow->p_id)
-        );
+        $qPid = $this->db->quote($pingbackRow->p_id);
+        $this->db->exec('DELETE FROM pingbackcontent WHERE pc_p_id = ' . $qPid);
+        $this->db->exec('DELETE FROM rbookmarks WHERE rb_p_id = ' . $qPid);
+        $this->db->exec('DELETE FROM rcomments  WHERE rc_p_id = ' . $qPid);
+        $this->db->exec('DELETE FROM rlinks     WHERE rl_p_id = ' . $qPid);
+
         $this->db->exec(
             'INSERT INTO pingbackcontent SET'
-            . '  pc_p_id = ' . $this->db->quote($pingbackRow->p_id)
+            . '  pc_p_id = ' . $qPid
             . ', pc_mime_type = '
             . $this->db->quote($res->getHeader('content-type'))
             . ', pc_fulltext = ' . $this->db->quote($res->getBody())