Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv15468/ecrire
Modified Files:
inc_base.php3 inc_statistiques.php3 inc_version.php3
Log Message:
suppression du "domaine" des referers (désolé !)
Index: inc_base.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_base.php3,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- inc_base.php3 25 Sep 2003 00:49:30 -0000 1.87
+++ inc_base.php3 26 Sep 2003 23:55:40 -0000 1.88
@@ -321,7 +321,6 @@
$query = "CREATE TABLE spip_referers_temp (
ip INTEGER UNSIGNED NOT NULL,
referer VARCHAR(255) NOT NULL,
- domaine VARCHAR(255) NOT NULL,
referer_md5 BIGINT UNSIGNED NOT NULL,
type ENUM('article', 'rubrique', 'breve', 'autre') NOT NULL,
id_objet INTEGER UNSIGNED NOT NULL,
@@ -333,7 +332,6 @@
referer_md5 BIGINT UNSIGNED NOT NULL,
date DATE NOT NULL,
referer VARCHAR(255) NOT NULL,
- domaine VARCHAR(255) NOT NULL,
visites INTEGER UNSIGNED NOT NULL,
visites_jour INTEGER UNSIGNED NOT NULL,
maj TIMESTAMP,
@@ -345,7 +343,6 @@
referer_md5 BIGINT UNSIGNED NOT NULL,
date DATE NOT NULL,
referer VARCHAR(255) NOT NULL,
- domaine VARCHAR(255) NOT NULL,
visites INTEGER UNSIGNED NOT NULL,
maj TIMESTAMP,
PRIMARY KEY (id_article, referer_md5),
@@ -1354,7 +1351,7 @@
maj_version (1.709);
}
- /* le bloc qui suit procede par etapes, car il risque de partir de timeout */
+ /* 'domaine' : idee abandonnee
if ($version_installee < 1.710) {
@set_time_limit(0);
spip_query("ALTER TABLE spip_referers ADD domaine varchar(255)");
@@ -1388,11 +1385,20 @@
spip_query("UPDATE spip_referers_articles SET domaine = REPLACE(domaine, 'www.', '') WHERE domaine LIKE 'www.%'");
maj_version (1.716);
}
+ */
if ($version_installee < 1.717) {
spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
maj_version (1.717);
}
+
+ if ($version_installee < 1.718) {
+ spip_query("ALTER TABLE spip_referers DROP domaine");
+ spip_query("ALTER TABLE spip_referers_articles DROP domaine");
+ spip_query("ALTER TABLE spip_referers_temp DROP domaine");
+ maj_version (1.718);
+ }
+
}
?>
Index: inc_statistiques.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_statistiques.php3,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- inc_statistiques.php3 26 Sep 2003 23:48:15 -0000 1.73
+++ inc_statistiques.php3 26 Sep 2003 23:55:40 -0000 1.74
@@ -165,11 +165,10 @@
while ($row = @spip_fetch_array($result)) {
$visites = $row['visites'];
$referer = addslashes($row['referer']);
- $domaine = addslashes($row['domaine']);
$referer_md5 = '0x'.$row['md5'];
$referer_update[$visites][] = $referer_md5;
- $referer_insert[] = "('$date', '$referer', '$domaine', $referer_md5, $visites, $visites)";
+ $referer_insert[] = "('$date', '$referer', $referer_md5, $visites, $visites)";
$referer_vus[] = $referer_md5;
}
@@ -183,7 +182,7 @@
}
if (is_array($referer_insert)) {
$query_insert = "INSERT IGNORE INTO spip_referers ".
- "(date, referer, domaine, referer_md5, visites, visites_jour) VALUES ".join(', ', $referer_insert);
+ "(date, referer, referer_md5, visites, visites_jour) VALUES ".join(', ', $referer_insert);
$result_insert = spip_query($query_insert);
}
@@ -200,11 +199,10 @@
$id_article = $row['id_objet'];
$visites = $row['visites'];
$referer = addslashes($row['referer']);
- $domaine = addslashes($row['domaine']);
$referer_md5 = '0x'.$row['md5'];
$referer_update[$visites][] = "(id_article=$id_article AND referer_md5=$referer_md5)";
- $referer_insert[] = "('$date', '$referer', '$domaine', $referer_md5, $id_article, $visites)";
+ $referer_insert[] = "('$date', '$referer', $referer_md5, $id_article, $visites)";
}
// Mise a jour de la base
@@ -217,7 +215,7 @@
}
if (is_array($referer_insert)) {
$query_insert = "INSERT IGNORE INTO spip_referers_articles ".
- "(date, referer, domaine, referer_md5, id_article, visites) VALUES ".join(', ', $referer_insert);
+ "(date, referer, referer_md5, id_article, visites) VALUES ".join(', ', $referer_insert);
$result_insert = spip_query($query_insert);
}
Index: inc_version.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_version.php3,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- inc_version.php3 25 Sep 2003 00:49:30 -0000 1.262
+++ inc_version.php3 26 Sep 2003 23:55:40 -0000 1.263
@@ -149,7 +149,7 @@
// (utilise pour les modifs de la base de donnees)
// version de la base
-$spip_version = 1.717;
+$spip_version = 1.718;
// version de spip
$spip_version_affichee = "1.7a7 CVS";