Menu
▾
▴
binarycloud-cvs-commit — cvs commit list for binarycloud
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(47) |
Aug
(73) |
Sep
(104) |
Oct
(55) |
Nov
|
Dec
|
|---|
|
From: alex <bin...@li...> - 2001-08-16 20:44:03
|
alex Thu Aug 16 13:43:57 2001 EDT
Modified files:
/r2/binarycloud/base/mgr CacheManager.php
Log:
Many bugfixes, some reorganization. Now properly functions in conjunction with Page to cache Module
output.
Index: r2/binarycloud/base/mgr/CacheManager.php
diff -u r2/binarycloud/base/mgr/CacheManager.php:1.4 r2/binarycloud/base/mgr/CacheManager.php:1.5
--- r2/binarycloud/base/mgr/CacheManager.php:1.4 Thu Aug 16 10:08:24 2001
+++ r2/binarycloud/base/mgr/CacheManager.php Thu Aug 16 13:43:57 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*
- * -File $Id: CacheManager.php,v 1.4 2001/08/16 17:08:24 alex Exp $
+ * -File $Id: CacheManager.php,v 1.5 2001/08/16 20:43:57 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
@@ -26,9 +26,19 @@
function CacheOutput($output, $group) {
global $Cache;
global $Debug;
-
- $Cache->save($this->page['id'],$output,$this->page['expires'],$group);
- $Debug->CaptureMessage('CacheManager', "Cached $group output in ".$this->page['id']);
+ global $CacheManager;
+ switch ($group) {
+ case 'page':
+ $id =& $this->page['id'];
+ $expires =& $this->page['expires'];
+ break;
+ case 'module':
+ $id =& $this->module['id'];
+ $expires =& $this->module['expires'];
+ break;
+ }
+ $Cache->save($id,$output,$expires,$group);
+ $Debug->CaptureMessage('CacheManager', "Cached $group output in ".$id);
}
// }}}
@@ -54,7 +64,6 @@
function GetModuleCache() {
global $Cache;
- echo "returning mod cache";
return $Cache->get($this->module['id'],'module');
}
@@ -74,12 +83,14 @@
switch ($type) {
case 'page':
$this->page['seed'] = $HTTP_SERVER_VARS['REQUEST_URI'];
- if ($gPageDef['cache']['var']) {
+ if (isset($gPageDef['cache']['var'])) {
$var_name =& $gPageDef['cache']['var'];
$this->page['seed'] .= ":".$var_name.":".$$var_name;
}
$this->page['id'] = $Cache->generateID($this->page['seed']);
- $this->page['expires'] =& $gPageDef['cache']['expires'];
+ if (isset($gPageDef['cache']['expires'])) {
+ $this->page['expires'] =& $gPageDef['cache']['expires'];
+ }
$this->page['is_cached'] = $Cache->isCached($this->page['id'],$type);
$this->page['is_expired'] = $Cache->isExpired($this->page['id'],$type);
if ($this->page['is_cached'] == true && $this->page['is_expired'] == false) {
@@ -99,7 +110,7 @@
$this->module['seed'] .= $HTTP_SERVER_VARS['REQUEST_URI'];
}
$this->module['id'] = $Cache->generateID($this->module['seed']);
- $this->module['expires'] =& $gPageDef['cache']['expires'];
+ $this->module['expires'] =& $mod['cache']['expires'];
$this->module['is_cached'] = $Cache->isCached($this->module['id'],$type);
$this->module['is_expired'] = $Cache->isExpired($this->module['id'],$type);
if ($this->module['is_cached'] == true && $this->module['is_expired'] == false) {
@@ -121,4 +132,4 @@
// }}}
}
// }}}
-?>
+?>
\ No newline at end of file
|
|
From: alex <bin...@li...> - 2001-08-16 20:43:32
|
alex Thu Aug 16 13:43:26 2001 EDT
Modified files:
/r2/binarycloud/base/core Page.php
Log:
Major upgrade, Page now support caching of individual modules.
|
|
From: alex <bin...@li...> - 2001-08-16 17:08:44
|
alex Thu Aug 16 10:08:38 2001 EDT
Modified files:
/r2 INSTALL.WIN32
/r2/binarycloud/base/core Page.php
/r2/binarycloud/base/mgr CacheManager.php
/r2/binarycloud/user/htdocs bcp.xml
Log:
This is a proper update of bcp.xml, it's the 'actual' current page format.
|
alex Tue Aug 14 18:06:01 2001 EDT
Added files:
/r2/binarycloud/user/htdocs static_module.php
/r2/binarycloud/user/tmpl/html/masters static_example.php
Modified files:
/r2/binarycloud/base/core Page.php
/r2/binarycloud/base/init Init.php
/r2/binarycloud/base/mgr CacheManager.php
Log:
This is a static module master template.
|
|
From: alex <bin...@li...> - 2001-08-13 23:55:32
|
alex Mon Aug 13 16:55:26 2001 EDT
Modified files:
/r2 INSTALL.UNIX
Log:
Slight modification to include the make problem (argv)
Index: r2/INSTALL.UNIX
diff -u r2/INSTALL.UNIX:1.2 r2/INSTALL.UNIX:1.3
--- r2/INSTALL.UNIX:1.2 Wed Jul 11 12:15:42 2001
+++ r2/INSTALL.UNIX Mon Aug 13 16:55:26 2001
@@ -13,3 +13,9 @@
5. cd $BCHOME, run make
6. Your document root should be BCHOME/build/lang_code/htdocs/
+
+------------
+
+Make sure register_argc_argv is enabled in your php.ini
+(or if you are unsure, a command line php.ini is included at
+r2/tools/cli_php/php.ini).
|
|
From: alex <bin...@li...> - 2001-08-13 00:54:35
|
alex Sun Aug 12 17:54:29 2001 EDT
Modified files:
/r2/binarycloud/base/core Request.php Sess.php
/r2/binarycloud/base/init Init.php
Log:
Integrating Andreas' Changes from Earlier.
|
|
From: Andreas A. <a.a...@th...> - 2001-08-12 14:33:16
|
[1] Changed constructor behavior
---------------------------------------
You can now pass a variables order or a mode to the
constructor/SetVariables method. e.g. "GPS" or 'ini'
or 'user'. Ini takes the php.ini setting (which is the
default) and 'user' the calss specific setting. If
passed valid gps string this one is used.
Thanks to (Dave Weingart) for reporting this bug.
[2] Added class properties
---------------------------------------
var $decode, bool
Switch on/off decoding of variable values (default on)
var $decodeObj, bool
Enable or disable decoding of non-scalar values.
[3] Modded _Decode();
---------------------------------------
Listens now to the class properties above. Changed the bahavior a
bit if an array nests objects/arrays. This kind of elements are
skipped by the runtimefuntion while other scalar elements are
decoded. Currently supportet: arrays with depth=1. Objects are
ignored at all.
|
|
From: Andreas A. <a.a...@th...> - 2001-08-12 12:03:37
|
Files commited (sf): r2/binarycloud/base/core/Sess.php Updated method naming from old style Do_Something() to new style DoSomething(). Affected methods: Start_Session -> StartSession Destroy_Session -> DestorySession Unset_All -> UnsetAll r2/binarycloud/base/init/Init.php Updated method calls in _load_sess to match changed method naming in core/Sess.php Andi |
|
From: alex <bin...@li...> - 2001-08-12 01:35:22
|
alex Sat Aug 11 18:35:17 2001 EDT
Modified files:
/r2/binarycloud/base/utils xml2php.php
Log:
Modified import.
Index: r2/binarycloud/base/utils/xml2php.php
diff -u r2/binarycloud/base/utils/xml2php.php:1.3 r2/binarycloud/base/utils/xml2php.php:1.4
--- r2/binarycloud/base/utils/xml2php.php:1.3 Mon Jun 25 10:01:32 2001
+++ r2/binarycloud/base/utils/xml2php.php Sat Aug 11 18:35:17 2001
@@ -2,7 +2,7 @@
<?php
// {{{ Header
/*
- * -File $Id: xml2php.php,v 1.3 2001/06/25 17:01:32 odysseas Exp $
+ * -File $Id: xml2php.php,v 1.4 2001/08/12 01:35:17 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, Intacct Corp.
* -Author odysseas tsatalos, ody...@ya...
@@ -31,7 +31,7 @@
// }}}
// Process {{{
-import('XMLUtils');
+import('binarycloud.base.lib.XMLUtils');
$trees = XMLUtils::XMLStr2XML(join('',file($xmlfile, 1)));
$xmlTree = $trees[0];
switch ($form) {
|
|
From: alex <bin...@li...> - 2001-08-12 01:29:17
|
alex Sat Aug 11 18:29:11 2001 EDT
Modified files:
/r2 INSTALL.WIN32
Log:
Ronald's updated Win32 Installation instructions.
Index: r2/INSTALL.WIN32
diff -u r2/INSTALL.WIN32:1.6 r2/INSTALL.WIN32:1.7
--- r2/INSTALL.WIN32:1.6 Tue Aug 7 11:43:38 2001
+++ r2/INSTALL.WIN32 Sat Aug 11 18:29:11 2001
@@ -42,42 +42,24 @@
#!c:/path/to/php/php.exe -q (yes, is Windows sytle again)
7. things done, go back to $BCHOME, and type make, everythings should be fine.
+
+Known problem:
+1. If you face this problem after type make,
+ Builder da site
+ in user
+ in user/htdocs
+ in base
+ in core
+ in bldr
+ in init
+ Could not open file for writing :
+ in lib
+ in mgr
+ in ext
+ ....
+ Please turn on "register_argc_argv" in your php.ini
+ (thx Andris Spruds <li...@ap...> help to solve this problem)
-------------------------------------------------------------------------------
Please send your comment to ron...@ho....
have fun :)
-
-
-Complete Cygwin package list:
--------------------------------------------------------------------------------
-Autoconf
-Automake
-Bash
-Binutils
-Clear
-Cygwin (both packages)
-Diff
-File
-Fileutils
-Findutils
-Grep
-gZip
-Inetutils
-Less
-Lynx
-Make
-Perl
-Readline
-Reges
-Rsync
-Sed
-Sh-Utils
-Tar
-Textutils
-Time
-Unzip
-w32API
-wGet
-Which
----------
-Download is roughly 7.7MB.
|
|
From: TAO R. <ron...@ho...> - 2001-08-11 08:32:16
|
new INSTALL.WIN32 commited to sourceforge CVS server include known porblem and solution in make system. roni Ronald TAO ron...@ho... _________________________________________________________________ 在 http://explorer.msn.com.tw/intl.asp 免費下載 MSN Explorer |
|
From: alex <bin...@li...> - 2001-08-09 01:05:59
|
alex Wed Aug 8 18:05:54 2001 EDT
Added files:
/r2/tools/code_templates ClassTemplate.php ModuleClass.php
Log:
Added a couple code template files.
Index: r2/tools/code_templates/ClassTemplate.php
+++ r2/tools/code_templates/ClassTemplate.php
<?php
// Header {{{
/*
* -File $Id: ClassTemplate.php,v 1.1 2001/08/09 01:05:54 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, Entity
* -Author author name, au...@ex...
*/
$PACKAGE='binarycloud.package';
// }}}
// {{{ ClassName
/**
* This is the ClassName class, it
*
*/
class ClassName {
// {{{ method PublicMethod()
/**
* This method
*
* @access public
*/
function PublicMethod() {
}
// }}}
// {{{ method _PrivateMethod()
/**
* This method
*
* @access private
*/
function _PrivateMethod() {
}
// }}}
// {{{ Vars
var $variable;
// }}}
}
// }}}
?>
Index: r2/tools/code_templates/ModuleClass.php
+++ r2/tools/code_templates/ModuleClass.php
<?php
// Header {{{
/*
* -File $Id: ModuleClass.php,v 1.1 2001/08/09 01:05:54 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, Entity
* -Author author name, au...@ex...
*/
// {{{ class ModuleClass
/**
* This is the ModuleClass class
*
*/
class ModuleClass {
// {{{ method ModuleClass($_params)
/**
* This method
*
* @access public
*/
function ModuleClass($_params) {
$this->params = $_params;
// Application specific code here
return true;
}
// }}}
// {{{ method Output()
/**
* This method is responsible for output.
*
* @access public
*/
function Output() {
// Application specific code here
}
// }}}
// {{{ Vars
var $params;
// }}}
}
// }}}
?>
|
|
From: alex <bin...@li...> - 2001-08-09 00:56:13
|
alex Wed Aug 8 17:56:08 2001 EDT
Modified files:
/r2/binarycloud/base/core Request.php
/r2/binarycloud/user/conf datasources.php
Log:
No idea.. I'll have a look.
|
|
From: alex <bin...@li...> - 2001-08-09 00:54:44
|
alex Wed Aug 8 17:54:39 2001 EDT
Removed files:
/r2/binarycloud/user/htdocs cache.php
Modified files:
/r2/binarycloud/user/htdocs page_cache_test.php
Log:
don't need this, early test file.
Index: r2/binarycloud/user/htdocs/page_cache_test.php
diff -u /dev/null r2/binarycloud/user/htdocs/page_cache_test.php:1.4
--- /dev/null Wed Aug 8 17:54:39 2001
+++ r2/binarycloud/user/htdocs/page_cache_test.php Wed Aug 8 17:54:39 2001
@@ -0,0 +1,123 @@
+<?php
+// {{{ Header
+/*
+ * -File $Id: page_cache_test.php,v 1.4 2001/08/09 00:54:39 alex Exp $
+ * -License LGPL (http://www.gnu.org/copyleft/lesser.html)
+ * -Copyright 2001, The Turing Studio, Inc.
+ * -Author alex black, en...@tu...
+ */
+// }}}
+
+include_once('./prepend.php');
+
+import('binarycloud.init.Init');
+
+// ripped from /path/to/binarycloud/user/htdocs/index.xml
+$gPageDef = array(
+ 'cache' => array(
+ 'expires' => '30',
+ 'var' => 'moo'
+ ),
+ 'title' => "binarycloud page title",
+ 'init' => array(
+ 'ini' => true,
+ 'auth' => false,
+ 'perm' => false,
+ 'sess' => true,
+ 'lang' => true,
+ 'cache' => true,
+ ),
+ 'templates' => array(
+ 'default' => array(
+ 'name' => "example",
+ 'package' => "html.masters",
+ 'type' => "html",
+ ),
+ 'other' => array(
+ 'name' => "other",
+ 'package' => "html.masters",
+ 'type' => "html",
+ )
+ ),
+
+ 'modules' => array(
+ 'content' => array(
+ 'layout' => array(
+ 'name' => "example",
+ 'package' => "html.layouts",
+ ),
+ 'load' => array(
+ array(
+ 'id' => 'mooboo',
+ 'name' => "OtherWorld",
+ 'package' => "hello_world",
+ 'load_order' => "3"
+ ),
+ array(
+ 'id' => 'some_other_unique_name',
+ 'name' => "SetLangExample",
+ 'package' => "set_lang_example",
+ 'load_order' => "6"
+ ),
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "1",
+ 'params' => array (
+ 'example' => "this is an option value",
+ 'another' => 1
+ ),
+ ),
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "5"
+ ),
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "4"
+ ),
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "2"
+ ),
+
+ ),
+ ),
+ 'left' => array(
+ 'load' => array(
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "2"
+ ),
+ array(
+ 'name' => "HelloWorld",
+ 'package' => "hello_world",
+ 'load_order' => "1"
+ ),
+ ),
+ ),
+ ),
+);
+
+$Init = new Init();
+$Init->Startup();
+$Page->BuildPage();
+$Init->Shutdown();
+
+// output debug
+$Debug->Output('script_time');
+//$Debug->Output('all_classes');
+//$Debug->Output('core_classes');
+$Debug->Output('messages');
+//$Debug->Output('system_constants');
+//$Debug->Output('user_constants');
+//$Debug->Output('vars');
+//$Debug->Output('server_env');
+//$Debug->Output('globals');
+//$Debug->Output('all');
+
+?>
|
|
From: alex <bin...@li...> - 2001-08-09 00:54:08
|
alex Wed Aug 8 17:54:02 2001 EDT
Removed files:
/r2/binarycloud/user/htdocs mod_cache_test.php
Log:
Don't need this.
|
|
From: alex <bin...@li...> - 2001-08-09 00:53:35
|
alex Wed Aug 8 17:53:30 2001 EDT
Removed files:
/r2/binarycloud/user/htdocs page_cache_test.php
Log:
Cranked page def, nuking it.
|
|
From: alex <bin...@li...> - 2001-08-09 00:52:53
|
alex Wed Aug 8 17:52:48 2001 EDT
Modified files:
/r2/binarycloud/base/core Page.php
/r2/binarycloud/base/init Init.php
/r2/binarycloud/base/mgr CacheManager.php Makefile
/r2/binarycloud/user/htdocs mod_cache_test.php
Log:
Test page...
Index: r2/binarycloud/base/core/Page.php
diff -u r2/binarycloud/base/core/Page.php:1.14 r2/binarycloud/base/core/Page.php:1.15
--- r2/binarycloud/base/core/Page.php:1.14 Wed Aug 8 16:04:52 2001
+++ r2/binarycloud/base/core/Page.php Wed Aug 8 17:51:54 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*
- * -File $Id: Page.php,v 1.14 2001/08/08 23:04:52 alex Exp $
+ * -File $Id: Page.php,v 1.15 2001/08/09 00:51:54 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Authors alex black, en...@tu...
@@ -9,6 +9,7 @@
*/
$PACKAGE='binarycloud.core';
+
// }}}
// {{{ Page
/**
@@ -164,7 +165,7 @@
echo join('', $this->output);
}
- if ($gPageDef['cache']) {
+ if (isset($gPageDef['cache'])) {
global $CacheManager;
$CacheManager->CachePage();
}
Index: r2/binarycloud/base/init/Init.php
diff -u r2/binarycloud/base/init/Init.php:1.36 r2/binarycloud/base/init/Init.php:1.37
--- r2/binarycloud/base/init/Init.php:1.36 Wed Aug 1 14:47:53 2001
+++ r2/binarycloud/base/init/Init.php Wed Aug 8 17:52:22 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*******************************************************************************
- ** -File $Id: Init.php,v 1.36 2001/08/01 21:47:53 alex Exp $
+ ** -File $Id: Init.php,v 1.37 2001/08/09 00:52:22 alex Exp $
** -License LGPL (http://www.gnu.org/copyleft/lesser.html)
** -Copyright 2001, The Turing Studio, Inc.
** -Author alex black, en...@tu...
@@ -69,10 +69,10 @@
$this->_set_include_paths();
$this->_set_ini();
$this->_load_pear();
- $this->_load_cache();
$this->_load_auth();
$this->_load_perm();
$this->_load_page();
+ $this->_load_cache();
}
// }}}
@@ -352,10 +352,13 @@
function _load_cache() {
global $gPageDef;
- if ($gPageDef['cache']) {
+ if ($gPageDef['init']['cache']) {
import('ext.pear.Cache');
+ import('binarycloud.mgr.CacheManager');
global $Cache;
+ global $CacheManager;
$Cache = new Cache("file", array('cache_dir'=>BC_PATH_CACHE));
+ $CacheManager = new CacheManager();
return true;
} else {
return false;
@@ -378,14 +381,13 @@
function _load_page() {
global $gPageDef;
-
+
if ($gPageDef['modules']) {
import('binarycloud.core.Page');
global $Page;
$Page = new Page();
return true;
} else {
-
return false;
}
}
Index: r2/binarycloud/base/mgr/CacheManager.php
diff -u r2/binarycloud/base/mgr/CacheManager.php:1.1 r2/binarycloud/base/mgr/CacheManager.php:1.2
--- r2/binarycloud/base/mgr/CacheManager.php:1.1 Wed Aug 8 12:26:40 2001
+++ r2/binarycloud/base/mgr/CacheManager.php Wed Aug 8 17:52:37 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*
- * -File $Id: CacheManager.php,v 1.1 2001/08/08 19:26:40 alex Exp $
+ * -File $Id: CacheManager.php,v 1.2 2001/08/09 00:52:37 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
@@ -10,7 +10,7 @@
$PACKAGE='binarycloud.mgr';
// }}}
-// {{{ CacheManager
+// {{{ CacheManager extends Page
/**
* This is the CacheManager class, it
*
@@ -31,11 +31,8 @@
case 'page':
$valid_cache = $this->_CheckPageCache();
break;
- case 'module_group':
- $valid_cache = $this->_CheckModuleGroupCache();
- break;
case 'module':
- $valid_cache = $this->_CheckModuleCache();
+ $valid_cache = $this->_CheckModuleCache($params);
break;
}
@@ -43,15 +40,19 @@
}
// }}}
- // {{{ method GetPayload()
+ // {{{ method CacheOutput()
/**
* This method
*
- * @access private
+ * @access public
*/
- function GetPayload() {
- return $this->payload;
+ function CachePage() {
+ global $Cache;
+ global $Debug;
+
+ $Cache->save($this->page_cache['id'],ob_get_contents(),$this->page_cache['expires'],'page');
+ $Debug->CaptureMessage('CacheManager', "Cached page output in ".$this->page_cache['id']);
}
// }}}
@@ -65,18 +66,19 @@
function _CheckPageCache() {
global $Cache;
global $gPageDef;
+ global $HTTP_SERVER_VARS;
$var_name =& $gPageDef['cache']['var'];
$this->page_cache['expires'] =& $gPageDef['cache']['expires'];
$this->page_cache['seed'] = $HTTP_SERVER_VARS['REQUEST_URI'].":".$var_name.":".$$var_name;
$this->page_cache['id'] = $Cache->generateID($this->page_cache['seed']);
- $this->page_cache['is_cached'] = $Cache->isCached($this->page_cache['id'],'pages');
- $this->page_cache['is_expired'] = $Cache->isExpired($this->page_cache['id'],'pages');
+ $this->page_cache['is_cached'] = $Cache->isCached($this->page_cache['id'],'page');
+ $this->page_cache['is_expired'] = $Cache->isExpired($this->page_cache['id'],'page');
if ($this->page_cache['is_cached'] == true && $this->page_cache['is_expired'] == false) {
$this->page_cache['is_valid'] = true;
- $this->_SetPayload($Cache->get($this->page_cache['id'],'pages'));
+ $this->_SetCachePayload($Cache->get($this->page_cache['id'],'page'));
return true;
} else {
$this->page_cache['is_valid'] = false;
@@ -84,39 +86,15 @@
}
}
- // }}}
- // {{{ method _CheckModuleGroupCache()
- /**
- * This method
- *
- * @access private
- */
-
- function _CheckModuleGroupCache() {
- global $Cache;
- }
-
- // }}}
- // {{{ method _CheckModuleCache()
- /**
- * This method
- *
- * @access private
- */
-
- function _CheckModuleCache() {
- global $Cache;
- }
-
// }}}
- // {{{ method _SetPayload()
+ // {{{ method _SetCachePayload()
/**
* This method
*
* @access private
*/
- function _SetPayload($payload) {
+ function _SetCachePayload($payload) {
$this->payload = $payload;
}
Index: r2/binarycloud/base/mgr/Makefile
diff -u r2/binarycloud/base/mgr/Makefile:1.4 r2/binarycloud/base/mgr/Makefile:1.5
--- r2/binarycloud/base/mgr/Makefile:1.4 Sat Jul 14 19:03:15 2001
+++ r2/binarycloud/base/mgr/Makefile Wed Aug 8 17:52:37 2001
@@ -1,5 +1,5 @@
# {{{ Header
-# -File $Id: Makefile,v 1.4 2001/07/15 02:03:15 alex Exp $
+# -File $Id: Makefile,v 1.5 2001/08/09 00:52:37 alex Exp $
# -License LGPL (http://www.gnu.org/copyleft/lesser.html)
# -Copyright 2001, Intacct Corp.
# -Author odysseas tsatalos, ody...@ya...
@@ -8,6 +8,7 @@
include ../../Makefile.in
PACKAGEDFILES= \
+ CacheManager.php \
$(EMPTY)
all: installcode
Index: r2/binarycloud/user/htdocs/mod_cache_test.php
diff -u r2/binarycloud/user/htdocs/mod_cache_test.php:1.2 r2/binarycloud/user/htdocs/mod_cache_test.php:1.3
--- r2/binarycloud/user/htdocs/mod_cache_test.php:1.2 Wed Aug 8 11:47:57 2001
+++ r2/binarycloud/user/htdocs/mod_cache_test.php Wed Aug 8 17:52:48 2001
@@ -1,7 +1,7 @@
<?php
// {{{ Header
/*
- * -File $Id: mod_cache_test.php,v 1.2 2001/08/08 18:47:57 alex Exp $
+ * -File $Id: mod_cache_test.php,v 1.3 2001/08/09 00:52:48 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
@@ -14,12 +14,10 @@
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
-/*
'cache' => array(
'expires' => '30',
'var' => 'moo'
),
-*/
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
@@ -27,6 +25,7 @@
'perm' => false,
'sess' => true,
'lang' => true,
+ 'cache' => true,
),
'templates' => array(
'default' => array(
@@ -85,10 +84,6 @@
'load_order' => "2"
),
- ),
- 'cache' => array(
- 'expires' => '30',
- 'var' => 'moo',
),
),
'left' => array(
|
|
From: alex <bin...@li...> - 2001-08-09 00:43:19
|
alex Wed Aug 8 17:43:14 2001 EDT
Removed files:
/r2/binarycloud/user/htdocs mod_group_cache_test.php
Modified files:
/r2/binarycloud/user/htdocs page_cache_test.php
Log:
htdocs mods
Index: r2/binarycloud/user/htdocs/page_cache_test.php
diff -u r2/binarycloud/user/htdocs/page_cache_test.php:1.1 r2/binarycloud/user/htdocs/page_cache_test.php:1.2
--- r2/binarycloud/user/htdocs/page_cache_test.php:1.1 Wed Aug 8 11:40:50 2001
+++ r2/binarycloud/user/htdocs/page_cache_test.php Wed Aug 8 17:43:14 2001
@@ -1,23 +1,17 @@
<?php
// {{{ Header
/*
- * -File $Id: page_cache_test.php,v 1.1 2001/08/08 18:40:50 alex Exp $
+ * -File $Id: page_cache_test.php,v 1.2 2001/08/09 00:43:14 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
*/
// }}}
-
include_once('./prepend.php');
-
import('binarycloud.init.Init');
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
- 'cache' => array(
- 'expires' => '30',
- 'var' => 'moo'
- ),
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
@@ -25,6 +19,7 @@
'perm' => false,
'sess' => true,
'lang' => true,
+ 'cache' => true
),
'templates' => array(
'default' => array(
@@ -40,17 +35,23 @@
),
'modules' => array(
- 'content' => array(
+ array(
+ 'id' => 'content',
'layout' => array(
'name' => "example",
- 'package' => "html.layouts",
+ 'package' => "html.layouts"
),
'load' => array(
array(
'id' => 'mooboo',
'name' => "OtherWorld",
'package' => "hello_world",
- 'load_order' => "3"
+ 'load_order' => "3",
+ 'cache' => array(
+ 'expires' => '30',
+ 'var' => 'moo',
+ 'use_uri' => true
+ ),
),
array(
'id' => 'some_other_unique_name',
@@ -64,7 +65,7 @@
'load_order' => "1",
'params' => array (
'example' => "this is an option value",
- 'another' => 1
+ 'another' => '1'
),
),
array(
@@ -85,7 +86,8 @@
),
),
- 'left' => array(
+ array(
+ 'id' => 'left',
'load' => array(
array(
'name' => "HelloWorld",
@@ -116,7 +118,7 @@
//$Debug->Output('user_constants');
//$Debug->Output('vars');
//$Debug->Output('server_env');
-//$Debug->Output('globals');
+$Debug->Output('globals');
//$Debug->Output('all');
?>
|
|
From: alex <bin...@li...> - 2001-08-08 23:04:57
|
alex Wed Aug 8 16:04:52 2001 EDT
Removed files:
/r2/binarycloud/base/core Cache.php
Modified files:
/r2/binarycloud/base/core Page.php
Log:
This is now CacheManager.
Index: r2/binarycloud/base/core/Page.php
diff -u r2/binarycloud/base/core/Page.php:1.13 r2/binarycloud/base/core/Page.php:1.14
--- r2/binarycloud/base/core/Page.php:1.13 Wed Aug 1 15:49:50 2001
+++ r2/binarycloud/base/core/Page.php Wed Aug 8 16:04:52 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*
- * -File $Id: Page.php,v 1.13 2001/08/01 22:49:50 alex Exp $
+ * -File $Id: Page.php,v 1.14 2001/08/08 23:04:52 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Authors alex black, en...@tu...
@@ -37,15 +37,17 @@
function BuildPage() {
global $gPageDef;
global $Debug;
+ global $Page;
if ($gPageDef['cache']) {
- $this->caching = true;
- $this->_check_page_cache();
+ global $CacheManager;
+ $this->cached = $CacheManager->CheckCache('page');
}
- if ($this->cache['is_valid'] == true && $this->cache['payload'] != "") {
- echo $this->cache['payload'];
- $Debug->CaptureMessage('Page', "Sent output from cache with id ".$this->cache['id']);
+ if ($this->cached == true) {
+ $Debug->CaptureMessage('Page', "Used cache with id ".$CacheManager->page_cache['id']);
+ $this->output =& $CacheManager->payload;
+ echo $this->output;
} else {
$this->title = $gPageDef['title'];
foreach (array_keys($gPageDef['modules']) as $group) {
@@ -55,62 +57,9 @@
}
$Debug->CaptureMessage('Page', "Built page from modules.");
$this->_ApplyMasterTemplate();
-
- }
- }
- // }}}
- // {{{ method _check_page_cache()
- /**
- * This method
- *
- * @access private
- */
-
- function _check_page_cache() {
- global $Cache;
- global $HTTP_SERVER_VARS;
-
- global $moo;
- global $$var_name;
-
- $moo = "choo test";
- $var_name = $gPageDef['cache']['var'];
-
- $this->cache['expires'] = $gPageDef['cache']['expires'];
- $this->cache['seed'] = $HTTP_SERVER_VARS['REQUEST_URI'].":".$var_name.":".$$var_name;
- $this->cache['id'] = $Cache->generateID($this->cache['seed']);
- $this->cache['is_cached'] = $Cache->isCached($this->cache['id'],'pages');
- $this->cache['is_expired'] = $Cache->isExpired($this->cache['id'],'pages');
-
- if ($this->cache['is_cached'] == true && $this->cache['is_expired'] == false) {
- $this->cache['is_valid'] = true;
- $this->cache['payload'] =& $Cache->get($this->cache['id'],'pages');
- return true;
- } else {
- $this->cache['is_valid'] = false;
- return false;
}
}
-
-
// }}}
- // {{{ method _cache_output($cache_group)
- /**
- * This method
- *
- * @access private
- */
-
- function _cache_output($cache_group) {
- global $Cache;
- global $Debug;
-
- $Cache->save($this->cache['id'],ob_get_contents(),$this->cache['expires'],$cache_group);
- $Debug->CaptureMessage('Page', "Cached output for group: $cache_group.");
- }
-
-
- // }}}
// {{{ method _GetModuleOutput($_group)
/**
* This method goes through each module group, for each module within
@@ -165,6 +114,20 @@
*/
function _ApplyLayoutTemplates($_group) {
global $gPageDef;
+
+/*
+ if ($gPageDef['modules'][$_group]['cache']) {
+ global $CacheManager;
+
+ if (!class_exists(CacheManager)) {
+ import('binarycloud.mgr.CacheManager');
+ global $CacheManager;
+ $CacheManager = new CacheManager();
+ $this->cache['is_valid'] = $CacheManager->CheckCache('module_groups',$_group);
+ $this->cache['caching'] = true;
+ }
+*/
+
$layout =& $gPageDef['modules'][$_group]['layout'];
if (isset($layout)) {
ob_start();
@@ -201,17 +164,17 @@
echo join('', $this->output);
}
- if ($this->caching == true) {
- $this->_cache_output('pages');
+ if ($gPageDef['cache']) {
+ global $CacheManager;
+ $CacheManager->CachePage();
}
}
// }}}
// {{{ Vars
var $modules_id;
var $modules;
+ var $cached;
var $output;
- var $caching;
- var $cache;
var $title;
// }}}
}
|
|
From: alex <bin...@li...> - 2001-08-08 19:26:46
|
alex Wed Aug 8 12:26:40 2001 EDT
Added files:
/r2/binarycloud/base/mgr CacheManager.php
Log:
This is the CacheManager, which contains code moved out from page (and some new stuff) for managing
caches of page output, module group output, and module output. This is not for generalized caching,
for that you can use the pear cache class.
Index: r2/binarycloud/base/mgr/CacheManager.php
+++ r2/binarycloud/base/mgr/CacheManager.php
<?php
// Header {{{
/*
* -File $Id: CacheManager.php,v 1.1 2001/08/08 19:26:40 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
*/
$PACKAGE='binarycloud.mgr';
// }}}
// {{{ CacheManager
/**
* This is the CacheManager class, it
*
*/
class CacheManager {
// {{{ method CheckCache()
/**
* This method
*
* @access public
*/
function CheckCache($type) {
$valid_cache = false;
switch ($type) {
case 'page':
$valid_cache = $this->_CheckPageCache();
break;
case 'module_group':
$valid_cache = $this->_CheckModuleGroupCache();
break;
case 'module':
$valid_cache = $this->_CheckModuleCache();
break;
}
return $valid_cache;
}
// }}}
// {{{ method GetPayload()
/**
* This method
*
* @access private
*/
function GetPayload() {
return $this->payload;
}
// }}}
// {{{ method _CheckPageCache()
/**
* This method
*
* @access private
*/
function _CheckPageCache() {
global $Cache;
global $gPageDef;
$var_name =& $gPageDef['cache']['var'];
$this->page_cache['expires'] =& $gPageDef['cache']['expires'];
$this->page_cache['seed'] = $HTTP_SERVER_VARS['REQUEST_URI'].":".$var_name.":".$$var_name;
$this->page_cache['id'] = $Cache->generateID($this->page_cache['seed']);
$this->page_cache['is_cached'] = $Cache->isCached($this->page_cache['id'],'pages');
$this->page_cache['is_expired'] = $Cache->isExpired($this->page_cache['id'],'pages');
if ($this->page_cache['is_cached'] == true && $this->page_cache['is_expired'] == false) {
$this->page_cache['is_valid'] = true;
$this->_SetPayload($Cache->get($this->page_cache['id'],'pages'));
return true;
} else {
$this->page_cache['is_valid'] = false;
return false;
}
}
// }}}
// {{{ method _CheckModuleGroupCache()
/**
* This method
*
* @access private
*/
function _CheckModuleGroupCache() {
global $Cache;
}
// }}}
// {{{ method _CheckModuleCache()
/**
* This method
*
* @access private
*/
function _CheckModuleCache() {
global $Cache;
}
// }}}
// {{{ method _SetPayload()
/**
* This method
*
* @access private
*/
function _SetPayload($payload) {
$this->payload = $payload;
}
// }}}
// {{{ Vars
var $page_cache;
var $payload;
// }}}
}
// }}}
?>
|
|
From: alex <bin...@li...> - 2001-08-08 19:25:49
|
alex Wed Aug 8 12:25:43 2001 EDT
Removed files:
/r2/binarycloud/base/mgr README
Log:
don't need this.
|
|
From: alex <bin...@li...> - 2001-08-08 18:48:03
|
alex Wed Aug 8 11:47:58 2001 EDT
Added files:
/r2/binarycloud/user/htdocs mod_group_cache_test.php
Modified files:
/r2/binarycloud/user/htdocs mod_cache_test.php
Log:
Adding module group cache test page.
Index: r2/binarycloud/user/htdocs/mod_cache_test.php
diff -u r2/binarycloud/user/htdocs/mod_cache_test.php:1.1 r2/binarycloud/user/htdocs/mod_cache_test.php:1.2
--- r2/binarycloud/user/htdocs/mod_cache_test.php:1.1 Wed Aug 8 11:40:50 2001
+++ r2/binarycloud/user/htdocs/mod_cache_test.php Wed Aug 8 11:47:57 2001
@@ -1,7 +1,7 @@
<?php
// {{{ Header
/*
- * -File $Id: mod_cache_test.php,v 1.1 2001/08/08 18:40:50 alex Exp $
+ * -File $Id: mod_cache_test.php,v 1.2 2001/08/08 18:47:57 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
@@ -14,10 +14,12 @@
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
+/*
'cache' => array(
'expires' => '30',
'var' => 'moo'
),
+*/
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
@@ -83,6 +85,10 @@
'load_order' => "2"
),
+ ),
+ 'cache' => array(
+ 'expires' => '30',
+ 'var' => 'moo',
),
),
'left' => array(
Index: r2/binarycloud/user/htdocs/mod_group_cache_test.php
+++ r2/binarycloud/user/htdocs/mod_group_cache_test.php
<?php
// {{{ Header
/*
* -File $Id: mod_group_cache_test.php,v 1.1 2001/08/08 18:47:57 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
*/
// }}}
include_once('./prepend.php');
import('binarycloud.init.Init');
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
/*
'cache' => array(
'expires' => '30',
'var' => 'moo'
),
*/
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
'auth' => false,
'perm' => false,
'sess' => true,
'lang' => true,
),
'templates' => array(
'default' => array(
'name' => "example",
'package' => "html.masters",
'type' => "html",
),
'other' => array(
'name' => "other",
'package' => "html.masters",
'type' => "html",
)
),
'modules' => array(
'content' => array(
'layout' => array(
'name' => "example",
'package' => "html.layouts",
),
'load' => array(
array(
'id' => 'mooboo',
'name' => "OtherWorld",
'package' => "hello_world",
'load_order' => "3"
),
array(
'id' => 'some_other_unique_name',
'name' => "SetLangExample",
'package' => "set_lang_example",
'load_order' => "6"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1",
'params' => array (
'example' => "this is an option value",
'another' => 1
),
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "5"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "4"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
),
'cache' => array(
'expires' => '30',
'var' => 'moo',
),
),
'left' => array(
'load' => array(
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1"
),
),
),
),
);
$Init = new Init();
$Init->Startup();
$Page->BuildPage();
$Init->Shutdown();
// output debug
$Debug->Output('script_time');
//$Debug->Output('all_classes');
//$Debug->Output('core_classes');
$Debug->Output('messages');
//$Debug->Output('system_constants');
//$Debug->Output('user_constants');
//$Debug->Output('vars');
//$Debug->Output('server_env');
//$Debug->Output('globals');
//$Debug->Output('all');
?>
|
|
From: alex <bin...@li...> - 2001-08-08 18:40:56
|
alex Wed Aug 8 11:40:50 2001 EDT
Added files:
/r2/binarycloud/user/htdocs mod_cache_test.php page_cache_test.php
Removed files:
/r2/binarycloud/user/htdocs cache_test.php
Log:
added cache test pages, killed original
Index: r2/binarycloud/user/htdocs/mod_cache_test.php
+++ r2/binarycloud/user/htdocs/mod_cache_test.php
<?php
// {{{ Header
/*
* -File $Id: mod_cache_test.php,v 1.1 2001/08/08 18:40:50 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
*/
// }}}
include_once('./prepend.php');
import('binarycloud.init.Init');
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
'cache' => array(
'expires' => '30',
'var' => 'moo'
),
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
'auth' => false,
'perm' => false,
'sess' => true,
'lang' => true,
),
'templates' => array(
'default' => array(
'name' => "example",
'package' => "html.masters",
'type' => "html",
),
'other' => array(
'name' => "other",
'package' => "html.masters",
'type' => "html",
)
),
'modules' => array(
'content' => array(
'layout' => array(
'name' => "example",
'package' => "html.layouts",
),
'load' => array(
array(
'id' => 'mooboo',
'name' => "OtherWorld",
'package' => "hello_world",
'load_order' => "3"
),
array(
'id' => 'some_other_unique_name',
'name' => "SetLangExample",
'package' => "set_lang_example",
'load_order' => "6"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1",
'params' => array (
'example' => "this is an option value",
'another' => 1
),
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "5"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "4"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
),
),
'left' => array(
'load' => array(
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1"
),
),
),
),
);
$Init = new Init();
$Init->Startup();
$Page->BuildPage();
$Init->Shutdown();
// output debug
$Debug->Output('script_time');
//$Debug->Output('all_classes');
//$Debug->Output('core_classes');
$Debug->Output('messages');
//$Debug->Output('system_constants');
//$Debug->Output('user_constants');
//$Debug->Output('vars');
//$Debug->Output('server_env');
//$Debug->Output('globals');
//$Debug->Output('all');
?>
Index: r2/binarycloud/user/htdocs/page_cache_test.php
+++ r2/binarycloud/user/htdocs/page_cache_test.php
<?php
// {{{ Header
/*
* -File $Id: page_cache_test.php,v 1.1 2001/08/08 18:40:50 alex Exp $
* -License LGPL (http://www.gnu.org/copyleft/lesser.html)
* -Copyright 2001, The Turing Studio, Inc.
* -Author alex black, en...@tu...
*/
// }}}
include_once('./prepend.php');
import('binarycloud.init.Init');
// ripped from /path/to/binarycloud/user/htdocs/index.xml
$gPageDef = array(
'cache' => array(
'expires' => '30',
'var' => 'moo'
),
'title' => "binarycloud page title",
'init' => array(
'ini' => true,
'auth' => false,
'perm' => false,
'sess' => true,
'lang' => true,
),
'templates' => array(
'default' => array(
'name' => "example",
'package' => "html.masters",
'type' => "html",
),
'other' => array(
'name' => "other",
'package' => "html.masters",
'type' => "html",
)
),
'modules' => array(
'content' => array(
'layout' => array(
'name' => "example",
'package' => "html.layouts",
),
'load' => array(
array(
'id' => 'mooboo',
'name' => "OtherWorld",
'package' => "hello_world",
'load_order' => "3"
),
array(
'id' => 'some_other_unique_name',
'name' => "SetLangExample",
'package' => "set_lang_example",
'load_order' => "6"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1",
'params' => array (
'example' => "this is an option value",
'another' => 1
),
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "5"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "4"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
),
),
'left' => array(
'load' => array(
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "2"
),
array(
'name' => "HelloWorld",
'package' => "hello_world",
'load_order' => "1"
),
),
),
),
);
$Init = new Init();
$Init->Startup();
$Page->BuildPage();
$Init->Shutdown();
// output debug
$Debug->Output('script_time');
//$Debug->Output('all_classes');
//$Debug->Output('core_classes');
$Debug->Output('messages');
//$Debug->Output('system_constants');
//$Debug->Output('user_constants');
//$Debug->Output('vars');
//$Debug->Output('server_env');
//$Debug->Output('globals');
//$Debug->Output('all');
?>
|
|
From: alex <bin...@li...> - 2001-08-07 21:14:34
|
alex Tue Aug 7 14:14:28 2001 EDT
Added files:
/r2 INFO
Log:
Added 'info' file with cvs etc info.
|
|
From: alex <bin...@li...> - 2001-08-07 18:43:43
|
alex Tue Aug 7 11:43:38 2001 EDT
Modified files:
/r2 INSTALL.WIN32
Log:
Added Package list.
Index: r2/INSTALL.WIN32
diff -u r2/INSTALL.WIN32:1.5 r2/INSTALL.WIN32:1.6
--- r2/INSTALL.WIN32:1.5 Tue Aug 7 11:10:23 2001
+++ r2/INSTALL.WIN32 Tue Aug 7 11:43:38 2001
@@ -46,3 +46,38 @@
Please send your comment to ron...@ho....
have fun :)
+
+
+Complete Cygwin package list:
+-------------------------------------------------------------------------------
+Autoconf
+Automake
+Bash
+Binutils
+Clear
+Cygwin (both packages)
+Diff
+File
+Fileutils
+Findutils
+Grep
+gZip
+Inetutils
+Less
+Lynx
+Make
+Perl
+Readline
+Reges
+Rsync
+Sed
+Sh-Utils
+Tar
+Textutils
+Time
+Unzip
+w32API
+wGet
+Which
+---------
+Download is roughly 7.7MB.
|
