X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2FBarrel%2FPage.php;h=f35e73963457461d5fc78f657726ecc1a81d2973;hb=7d7400eafcf18fddfd6df14b7d0a3a1700455ea7;hp=118effe38cc538e34a8f3cd07fa70ac6d67b767a;hpb=8edec79dfecfe7ff0c9edea934487eced50d88e2;p=diogenes.git

diff --git a/include/Barrel/Page.php b/include/Barrel/Page.php
index 118effe..f35e739 100644
--- a/include/Barrel/Page.php
+++ b/include/Barrel/Page.php
@@ -78,7 +78,14 @@ class Diogenes_Barrel_Page
   {     
     global $globals;
       
-    $caller->info(__("Deleting page"). " $dir");    
+    $loc = $barrel->getLocation($dir);
+    if (!$loc)
+    {
+      $caller->info("Error : not deleting page $dir\n");
+      return false;
+    }
+    
+    $caller->info(__("Deleting page"). " '$loc'");
     
     // check there are no child pages
     $res = $globals->db->query("select PID from {$barrel->table_page} where parent=$dir");
@@ -92,7 +99,7 @@ class Diogenes_Barrel_Page
     
     $rcs = $caller->getRcs();
     $globals->db->query("delete from {$barrel->table_page} where PID=$dir");
-    $caller->log("page_delete","{$barrel->alias}:$dir");
+    $caller->log("page_delete","{$barrel->alias}:$loc");
     system("rm -rf ". escapeshellarg($rcs->rcsPath($dir)));
     system("rm -rf ". escapeshellarg($rcs->spoolPath($dir)));
     $barrel->compileTree();