[Rt-commit] r4087 - in rt/branches/3.4-RELEASE: etc html/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Nov 14 16:50:12 2005
New Revision: 4087

Modified:
   rt/branches/3.4-RELEASE/etc/schema.mysql
   rt/branches/3.4-RELEASE/html/Elements/Callback
Log:
* fix: really hide hidden paths from callbacks
* fix: fetch data from the %cache by one key when store data with other

Modified: rt/branches/3.4-RELEASE/etc/schema.mysql
==============================================================================
--- rt/branches/3.4-RELEASE/etc/schema.mysql	(original)
+++ rt/branches/3.4-RELEASE/etc/schema.mysql	Mon Nov 14 16:50:12 2005
@@ -9,7 +9,7 @@
   Filename varchar(255) NULL  ,
   ContentType varchar(80) NULL  ,
   ContentEncoding varchar(80) NULL  ,
-  Content LONGTEXT NULL  ,
+  Content LONGBLOB NULL  ,
   Headers LONGTEXT NULL  ,
   Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
@@ -46,8 +46,8 @@
 
 CREATE TABLE Links (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Base varchar(240) NULL  ,
-  Target varchar(240) NULL  ,
+  Base varchar(240) CHARACTER SET latin1 NULL  ,
+  Target varchar(240) CHARACTER SET latin1 NULL  ,
   Type varchar(20) NOT NULL  ,
   LocalTarget integer NOT NULL DEFAULT 0  ,
   LocalBase integer NOT NULL DEFAULT 0  ,
@@ -433,7 +433,7 @@
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Name varchar(255) NULL  ,
   Description varchar(255) NULL  ,
-  Content text,
+  Content BLOB,
   ContentType varchar(16),
   ObjectType varchar(64),
   ObjectId integer, # foreign key to anything
@@ -455,8 +455,8 @@
 # We should have a reaper script somewhere.
 
 CREATE TABLE sessions (
-    id char(32) NOT NULL,
-    a_session LONGTEXT,
+    id char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+    a_session LONGBLOB,
     LastUpdated TIMESTAMP,
     PRIMARY KEY (id)
 );

Modified: rt/branches/3.4-RELEASE/html/Elements/Callback
==============================================================================
--- rt/branches/3.4-RELEASE/html/Elements/Callback	(original)
+++ rt/branches/3.4-RELEASE/html/Elements/Callback	Mon Nov 14 16:50:12 2005
@@ -68,14 +68,14 @@
         push @$callbacks,
             # Skip backup files, files without a leading package name,
             # and files we've already seen
-            grep {     !/^\.|~$/
+            grep {     !/\/\.|~$/
                    and $_ ne "/Callbacks/$Page/$_CallbackName"
                    and not $seen{$_}++ }
                  $m->interp->resolver->glob_path($path, $root);
     }
     
     $m->notes($CacheKey => $callbacks);
-    $cache{$Page,$_CallbackName} = $callbacks if !$RT::DevelMode;
+    $cache{$CacheKey} = $callbacks if !$RT::DevelMode;
 }
 
 my @rv;