diff --git a/base/blocklog.php b/base/blocklog.php index 9c1b0f7..df8684d 100755 --- a/base/blocklog.php +++ b/base/blocklog.php @@ -55,10 +55,7 @@ function blocklog_declarer_tables_objets_sql($tables) { 'maj' => 'TIMESTAMP' ), 'key' => array( - 'PRIMARY KEY' => 'id_blocklog,id_objet,objet', - 'KEY id_blocklog' => 'id_blocklog', - 'KEY id_objet' => 'id_objet', - 'KEY objet' => 'objet' + 'PRIMARY KEY' => 'id_blocklog', ), 'champs_editables' => array('num', 'blockchaine', 'chaine','id_objet', 'objet'), ); diff --git a/blocklog_administrations.php b/blocklog_administrations.php index aab0be3..fb68a15 100755 --- a/blocklog_administrations.php +++ b/blocklog_administrations.php @@ -27,7 +27,7 @@ function blocklog_upgrade($nom_meta_base_version, $version_cible) { $maj = array(); $maj['create'] = array(array('maj_tables', array('spip_blocklogs'))); - $maj['1.0.1'] = array(array('maj_tables', array('spip_blocklogs'))); + $maj['1.0.2'] = array(array('maj_tables', array('spip_blocklogs'))); include_spip('base/upgrade'); maj_plugin($nom_meta_base_version, $version_cible, $maj); @@ -43,17 +43,5 @@ function blocklog_upgrade($nom_meta_base_version, $version_cible) { **/ function blocklog_vider_tables($nom_meta_base_version) { - sql_drop_table('spip_blocklogs'); - sql_drop_table('spip_blocklogs_liens'); - - # Nettoyer les liens courants (le génie optimiser_base_disparus se chargera de nettoyer toutes les tables de liens) - sql_delete('spip_documents_liens', sql_in('objet', array('blocklog'))); - sql_delete('spip_mots_liens', sql_in('objet', array('blocklog'))); - sql_delete('spip_auteurs_liens', sql_in('objet', array('blocklog'))); - # Nettoyer les versionnages et forums - sql_delete('spip_versions', sql_in('objet', array('blocklog'))); - sql_delete('spip_versions_fragments', sql_in('objet', array('blocklog'))); - sql_delete('spip_forum', sql_in('objet', array('blocklog'))); - effacer_meta($nom_meta_base_version); } diff --git a/blocklog_fonctions.php b/blocklog_fonctions.php index 9d7fc32..117b2b9 100755 --- a/blocklog_fonctions.php +++ b/blocklog_fonctions.php @@ -118,6 +118,9 @@ function blocklog_verifier_blockchaines($objet, $date_debut = '', $date_fin = '' } } } + var_dump($retour); + die; + return $retour; } diff --git a/inc/blocklog.php b/inc/blocklog.php index a023e61..0887ffc 100755 --- a/inc/blocklog.php +++ b/inc/blocklog.php @@ -68,8 +68,8 @@ function inc_blocklog_dist($objet, $id_objet = 0, $num = 0, $chaine = '') { include_spip('action/editer_objet'); set_request('id_auteur', null); $r = objet_inserer("blocklog", null, $set); - if (!$r) { - spip_log("la blockchaine pour $objet / $id_objet existe deja", 'blocklog'._LOG_ERREUR); + if (!intval($r)) { + spip_log("la blockchaine pour $objet / $id_objet ne pas pas etre inserer en bdd", 'blocklog'._LOG_ERREUR); } return $r; diff --git a/paquet.xml b/paquet.xml index b640f66..cf539ae 100755 --- a/paquet.xml +++ b/paquet.xml @@ -1,12 +1,12 @@ Block Log