Changeset 52

Timestamp:

09/08/08 22:45:07 (3 years ago)

Author:

angch

Message:

Memcache integration

Location:

drupal5/trunk/sites/all/modules/views

Files:

• views.module (modified) (7 diffs)
• views_cache.inc (modified) (12 diffs)

drupal5/trunk/sites/all/modules/views/views.module

@@ -201 +201 @@
       }
     }
-    cache_set("views_urls", 'cache_views', serialize($views));
+    cache_set("views_urls", 'cache_views', $views);
   }
   else {
-    $views = unserialize($cache->data);
+    $views = $cache->data;
   }
 
@@ -303 +303 @@
 
   // All views with an empty access setting are available to all roles.
-  if (!$view->access) { 
+  if (!$view->access) {
     return TRUE;
   }
@@ -524 +524 @@
     $args = array();
   }
-  
+
   // if no filter values are passed in, get them from the $_GET array
   if ($filters == NULL) {
@@ -833 +833 @@
 function _views_view_fields() {
   return array(
-    'vid' => '%d', 
-    'name' => "'%s'", 
-    'description' => "'%s'", 
-    'access' => "'%s'", 
-    'page' => '%d', 
-    'page_title' => "'%s'", 
-    'page_header' => "'%s'", 
-    'page_header_format' => '%d', 
-    'page_footer' => "'%s'", 
-    'page_footer_format' => '%d', 
-    'page_empty' => "'%s'", 
-    'page_empty_format' => '%d', 
-    'page_type' => "'%s'", 
-    'use_pager' => '%d', 
-    'nodes_per_page' => '%d', 
-    'url' => "'%s'", 
-    'menu' => '%d', 
-    'menu_tab' => '%d', 
-    'menu_tab_default' => '%d', 
-    'menu_tab_weight' => '%d', 
-    'menu_title' => "'%s'", 
+    'vid' => '%d',
+    'name' => "'%s'",
+    'description' => "'%s'",
+    'access' => "'%s'",
+    'page' => '%d',
+    'page_title' => "'%s'",
+    'page_header' => "'%s'",
+    'page_header_format' => '%d',
+    'page_footer' => "'%s'",
+    'page_footer_format' => '%d',
+    'page_empty' => "'%s'",
+    'page_empty_format' => '%d',
+    'page_type' => "'%s'",
+    'use_pager' => '%d',
+    'nodes_per_page' => '%d',
+    'url' => "'%s'",
+    'menu' => '%d',
+    'menu_tab' => '%d',
+    'menu_tab_default' => '%d',
+    'menu_tab_weight' => '%d',
+    'menu_title' => "'%s'",
     'menu_tab_default_parent_type' => "'%s'",
-    'menu_parent_title' => "'%s'", 
-    'menu_parent_tab_weight' => '%d', 
-    'block' => '%d', 
-    'block_title' => "'%s'", 
-    'block_use_page_header' => '%d', 
-    'block_header' => "'%s'", 
-    'block_header_format' => '%d', 
-    'block_use_page_footer' => '%d', 
-    'block_footer' => "'%s'", 
-    'block_footer_format' => '%d', 
-    'block_use_page_empty' => '%d', 
-    'block_empty' => "'%s'", 
-    'block_empty_format' => '%d', 
-    'block_type' => "'%s'", 
-    'nodes_per_block' => '%d', 
-    'block_more' => '%d', 
-    'breadcrumb_no_home' => '%d', 
-    'changed' => '%d', 
-    'view_args_php' => "'%s'", 
+    'menu_parent_title' => "'%s'",
+    'menu_parent_tab_weight' => '%d',
+    'block' => '%d',
+    'block_title' => "'%s'",
+    'block_use_page_header' => '%d',
+    'block_header' => "'%s'",
+    'block_header_format' => '%d',
+    'block_use_page_footer' => '%d',
+    'block_footer' => "'%s'",
+    'block_footer_format' => '%d',
+    'block_use_page_empty' => '%d',
+    'block_empty' => "'%s'",
+    'block_empty_format' => '%d',
+    'block_type' => "'%s'",
+    'nodes_per_block' => '%d',
+    'block_more' => '%d',
+    'breadcrumb_no_home' => '%d',
+    'changed' => '%d',
+    'view_args_php' => "'%s'",
     'is_cacheable' => '%d',
   );
@@ -1315 +1315 @@
   $form['view'] = array('#type' => 'value', '#value' => $view);
   $form['submit'] = array('#type' => 'button', '#name' => '', '#value' => t('Submit'));
-  
+
   // clean URL get forms breaks if we don't give it a 'q'.
   if (!(bool)variable_get('clean_url', '0')) {
@@ -1387 +1387 @@
     $form["filter$count"] = $item;
   }
-  
+
   return $form;
 }
@@ -2000 +2000 @@
       $query->add_where("$field $operator NULL");
       break;
-  }  
+  }
 }
 

drupal5/trunk/sites/all/modules/views/views_cache.inc

@@ -29 +29 @@
   if (!$views_arguments) {
     $data = cache_get("views_arguments:$locale", 'cache_views');
-    $cache = unserialize($data->data);
+    $cache = $data->data;
     if (is_array($cache)) {
       $views_arguments = $cache;
@@ -55 +55 @@
       }
       $cache = $views_arguments;
-      cache_set("views_arguments:$locale", 'cache_views', serialize($cache));
+      cache_set("views_arguments:$locale", 'cache_views', $cache);
     }
   }
@@ -71 +71 @@
   if (!$views_tables) {
     $data = cache_get("views_tables:$locale", 'cache_views');
-    $cache = unserialize($data->data);
+    $cache = $data->data;
 
     if (is_array($cache)) {
@@ -78 +78 @@
     else {
       $table_data = module_invoke_all('views_tables');
-      
+
       // allow modules to alter the definitions supplied others
       foreach (module_implements('views_tables_alter') as $module) {
@@ -84 +84 @@
         $function($table_data);
       }
-      
+
       $views_tables['tables'] = $table_data;
 
@@ -144 +144 @@
         }
       }
-      cache_set("views_tables:$locale", 'cache_views', serialize($views_tables));
+      cache_set("views_tables:$locale", 'cache_views', $views_tables);
     }
   }
@@ -225 +225 @@
   if (!$views_default_views) {
     $data = cache_get("views_default_views:$locale", 'cache_views');
-    $cache = unserialize($data->data);
+    $cache = $data->data;
 
     if (is_array($cache)) {
@@ -244 +244 @@
         }
       }
-      cache_set("views_default_views:$locale", 'cache_views', serialize($views_default_views));
+      cache_set("views_default_views:$locale", 'cache_views', $views_default_views);
     }
   }
@@ -267 +267 @@
 function _views_get_query(&$view, $args, $filters) {
   if ($view->is_cacheable && ($cached = cache_get('views_query:' . $view->name, 'cache_views'))) {
-    $info = unserialize($cached->data);
+    $info = $cached->data;
 
     $plugins = _views_get_style_plugins();
@@ -282 +282 @@
     );
     if ($view->is_cacheable) {
-      cache_set('views_query:' . $view->name, 'cache_views', serialize($data));
+      cache_set('views_query:' . $view->name, 'cache_views', $data);
     }
     $info = array_merge($info, $data);
@@ -314 +314 @@
   if (!$views_style_plugins) {
     $data = cache_get("views_style_plugins:$locale", 'cache_views');
-    $cache = unserialize($data->data);
+    $cache = $data->data;
     if (is_array($cache)) {
       $views_style_plugins = $cache;
@@ -329 +329 @@
       }
       $cache = $views_style_plugins;
-      cache_set("views_style_plugins:$locale", 'cache_views', serialize($cache));
+      cache_set("views_style_plugins:$locale", 'cache_views', $cache);
     }
   }