From svnnotify @ sourceforge.jp Sat May 1 21:47:18 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 01 May 2010 21:47:18 +0900 Subject: [Frameworkspider-svn] =?utf-8?b?c3BpZGVyLWNvbW1pdCBbOTldICDmraM=?= =?utf-8?b?6KaP6KGo54++44Gu6KiY6L+w44Of44K544KS5L+u5q2j?= Message-ID: <1272718038.976507.24770.nullmailer@users.sourceforge.jp> Revision: 99 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=99 Author: m_nakashima Date: 2010-05-01 21:47:18 +0900 (Sat, 01 May 2010) Log Message: ----------- 正規表現の記述ミスを修正 Modified Paths: -------------- 1.0.02/spider/lib/spider/BuildInformation.class.php -------------- next part -------------- Modified: 1.0.02/spider/lib/spider/BuildInformation.class.php =================================================================== --- 1.0.02/spider/lib/spider/BuildInformation.class.php 2010-04-26 01:48:34 UTC (rev 98) +++ 1.0.02/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:47:18 UTC (rev 99) @@ -95,10 +95,10 @@ */ function getAgentPageBuildFilePath() { $virtual_root = APPLICATION_BASE_PATH; - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { // Windows対策ドライブをディレクトリとして変換 $drive_name = substr($regmatch_array[0],0,1); - $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\/' + $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$drive_name.DIRECTORY_SEPARATOR,$virtual_root ); } else { $virtual_root = substr($virtual_root,1); @@ -106,10 +106,10 @@ // 2009-12-16 実行ファイル作成パスをspiderの上層ディレクトリ起点とする if( !defined('SPIDER_USE_ABSOLUTE_BIN_PATH') || SPIDER_USE_ABSOLUTE_BIN_PATH === false ) { $cutPath = dirname(DIR_PATH_SPIDER_DATA); - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { // Windows対策ドライブをディレクトリとして変換 $driveName = substr($regmatch_array[0],0,1); - $cutPath = preg_replace('/^[a-zA-Z]\\:\\\/' + $cutPath = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$driveName.DIRECTORY_SEPARATOR, $cutPath ); } $virtual_root = preg_replace('/^'.util_CharUtility::escapeRegxStr($cutPath).'/','',$virtual_root); From svnnotify @ sourceforge.jp Sat May 1 21:48:08 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 01 May 2010 21:48:08 +0900 Subject: [Frameworkspider-svn] spider-commit [100] Message-ID: <1272718088.144085.26625.nullmailer@users.sourceforge.jp> Revision: 100 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=100 Author: m_nakashima Date: 2010-05-01 21:48:08 +0900 (Sat, 01 May 2010) Log Message: ----------- Modified Paths: -------------- 1.0.02/spider/lib/spider/BuildInformation.class.php -------------- next part -------------- Modified: 1.0.02/spider/lib/spider/BuildInformation.class.php =================================================================== --- 1.0.02/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:47:18 UTC (rev 99) +++ 1.0.02/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:48:08 UTC (rev 100) @@ -95,10 +95,10 @@ */ function getAgentPageBuildFilePath() { $virtual_root = APPLICATION_BASE_PATH; - if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { + if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { // Windows対策ドライブをディレクトリとして変換 $drive_name = substr($regmatch_array[0],0,1); - $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\\/' + $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\/' ,$drive_name.DIRECTORY_SEPARATOR,$virtual_root ); } else { $virtual_root = substr($virtual_root,1); @@ -106,10 +106,10 @@ // 2009-12-16 実行ファイル作成パスをspiderの上層ディレクトリ起点とする if( !defined('SPIDER_USE_ABSOLUTE_BIN_PATH') || SPIDER_USE_ABSOLUTE_BIN_PATH === false ) { $cutPath = dirname(DIR_PATH_SPIDER_DATA); - if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { + if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { // Windows対策ドライブをディレクトリとして変換 $driveName = substr($regmatch_array[0],0,1); - $cutPath = preg_replace('/^[a-zA-Z]\\:\\\\/' + $cutPath = preg_replace('/^[a-zA-Z]\\:\\\/' ,$driveName.DIRECTORY_SEPARATOR, $cutPath ); } $virtual_root = preg_replace('/^'.util_CharUtility::escapeRegxStr($cutPath).'/','',$virtual_root); From svnnotify @ sourceforge.jp Sat May 1 21:51:16 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 01 May 2010 21:51:16 +0900 Subject: [Frameworkspider-svn] =?utf-8?b?c3BpZGVyLWNvbW1pdCBbMTAxXSAg5q2j?= =?utf-8?b?6KaP6KGo54++44Gu6KiY6L+w44Of44K544KS5L+u5q2j?= Message-ID: <1272718276.724856.30690.nullmailer@users.sourceforge.jp> Revision: 101 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=101 Author: m_nakashima Date: 2010-05-01 21:51:16 +0900 (Sat, 01 May 2010) Log Message: ----------- 正規表現の記述ミスを修正 Modified Paths: -------------- db/current/spider/lib/spider/BuildInformation.class.php -------------- next part -------------- Modified: db/current/spider/lib/spider/BuildInformation.class.php =================================================================== --- db/current/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:48:08 UTC (rev 100) +++ db/current/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:51:16 UTC (rev 101) @@ -95,10 +95,10 @@ */ function getAgentPageBuildFilePath() { $virtual_root = APPLICATION_BASE_PATH; - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { // Windows対策ドライブをディレクトリとして変換 $drive_name = substr($regmatch_array[0],0,1); - $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\/' + $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$drive_name.DIRECTORY_SEPARATOR,$virtual_root ); } else { $virtual_root = substr($virtual_root,1); @@ -106,10 +106,10 @@ // 2009-12-16 実行ファイル作成パスをspiderの上層ディレクトリ起点とする if( !defined('SPIDER_USE_ABSOLUTE_BIN_PATH') || SPIDER_USE_ABSOLUTE_BIN_PATH === false ) { $cutPath = dirname(DIR_PATH_SPIDER_DATA); - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { // Windows対策ドライブをディレクトリとして変換 $driveName = substr($regmatch_array[0],0,1); - $cutPath = preg_replace('/^[a-zA-Z]\\:\\\/' + $cutPath = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$driveName.DIRECTORY_SEPARATOR, $cutPath ); } $virtual_root = preg_replace('/^'.util_CharUtility::escapeRegxStr($cutPath).'/','',$virtual_root); @@ -155,7 +155,7 @@ $target_dir = str_replace("\\",DIRECTORY_SEPARATOR,$target_dir); $dir_name_array = explode(DIRECTORY_SEPARATOR,$target_dir ); $dir_path = ''; - if( preg_match('/^[a-zA-Z]\\:\\\/',$target_dir) ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/',$target_dir) ) { // Windowsなら頭にセパレータをつけないのでそのまま } else { // Unix系ならパスはディレクトリセパレータから開始 From svnnotify @ sourceforge.jp Sat May 1 21:51:47 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 01 May 2010 21:51:47 +0900 Subject: [Frameworkspider-svn] =?utf-8?b?c3BpZGVyLWNvbW1pdCBbMTAyXSAg5q2j?= =?utf-8?b?6KaP6KGo54++44Gu6KiY6L+w44Of44K544KS5L+u5q2j?= Message-ID: <1272718307.549251.30957.nullmailer@users.sourceforge.jp> Revision: 102 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=102 Author: m_nakashima Date: 2010-05-01 21:51:47 +0900 (Sat, 01 May 2010) Log Message: ----------- 正規表現の記述ミスを修正 Modified Paths: -------------- current/spider/lib/spider/BuildInformation.class.php -------------- next part -------------- Modified: current/spider/lib/spider/BuildInformation.class.php =================================================================== --- current/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:51:16 UTC (rev 101) +++ current/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:51:47 UTC (rev 102) @@ -95,10 +95,10 @@ */ function getAgentPageBuildFilePath() { $virtual_root = APPLICATION_BASE_PATH; - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { // Windows対策ドライブをディレクトリとして変換 $drive_name = substr($regmatch_array[0],0,1); - $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\/' + $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$drive_name.DIRECTORY_SEPARATOR,$virtual_root ); } else { $virtual_root = substr($virtual_root,1); @@ -106,10 +106,10 @@ // 2009-12-16 実行ファイル作成パスをspiderの上層ディレクトリ起点とする if( !defined('SPIDER_USE_ABSOLUTE_BIN_PATH') || SPIDER_USE_ABSOLUTE_BIN_PATH === false ) { $cutPath = dirname(DIR_PATH_SPIDER_DATA); - if( preg_match('/^[a-zA-Z]\\:\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { // Windows対策ドライブをディレクトリとして変換 $driveName = substr($regmatch_array[0],0,1); - $cutPath = preg_replace('/^[a-zA-Z]\\:\\\/' + $cutPath = preg_replace('/^[a-zA-Z]\\:\\\\/' ,$driveName.DIRECTORY_SEPARATOR, $cutPath ); } $virtual_root = preg_replace('/^'.util_CharUtility::escapeRegxStr($cutPath).'/','',$virtual_root); @@ -155,7 +155,7 @@ $target_dir = str_replace("\\",DIRECTORY_SEPARATOR,$target_dir); $dir_name_array = explode(DIRECTORY_SEPARATOR,$target_dir ); $dir_path = ''; - if( preg_match('/^[a-zA-Z]\\:\\\/',$target_dir) ) { + if( preg_match('/^[a-zA-Z]\\:\\\\/',$target_dir) ) { // Windowsなら頭にセパレータをつけないのでそのまま } else { // Unix系ならパスはディレクトリセパレータから開始 From svnnotify @ sourceforge.jp Thu May 6 17:53:20 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 06 May 2010 17:53:20 +0900 Subject: [Frameworkspider-svn] =?utf-8?q?spider-commit_=5B103=5D__Windows?= =?utf-8?b?44OJ44Op44Kk44OW44OR44K55ZWP6aGM44Gu5YaN5L+u5q2j?= Message-ID: <1273136000.461756.12832.nullmailer@users.sourceforge.jp> Revision: 103 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=103 Author: m_nakashima Date: 2010-05-06 17:53:20 +0900 (Thu, 06 May 2010) Log Message: ----------- Windowsドライブパス問題の再修正 Modified Paths: -------------- current/spider/lib/spider/BuildInformation.class.php -------------- next part -------------- Modified: current/spider/lib/spider/BuildInformation.class.php =================================================================== --- current/spider/lib/spider/BuildInformation.class.php 2010-05-01 12:51:47 UTC (rev 102) +++ current/spider/lib/spider/BuildInformation.class.php 2010-05-06 08:53:20 UTC (rev 103) @@ -95,10 +95,10 @@ */ function getAgentPageBuildFilePath() { $virtual_root = APPLICATION_BASE_PATH; - if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) ) { + if( preg_match('/^[a-zA-Z]\\:/', APPLICATION_BASE_PATH, $regmatch_array ) ) { // Windows対策ドライブをディレクトリとして変換 $drive_name = substr($regmatch_array[0],0,1); - $virtual_root = preg_replace('/^[a-zA-Z]\\:\\\\/' + $virtual_root = preg_replace('/^[a-zA-Z]\\:/' ,$drive_name.DIRECTORY_SEPARATOR,$virtual_root ); } else { $virtual_root = substr($virtual_root,1); @@ -106,10 +106,10 @@ // 2009-12-16 実行ファイル作成パスをspiderの上層ディレクトリ起点とする if( !defined('SPIDER_USE_ABSOLUTE_BIN_PATH') || SPIDER_USE_ABSOLUTE_BIN_PATH === false ) { $cutPath = dirname(DIR_PATH_SPIDER_DATA); - if( preg_match('/^[a-zA-Z]\\:\\\\/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { + if( preg_match('/^[a-zA-Z]\\:/', APPLICATION_BASE_PATH, $regmatch_array ) > 0 ) { // Windows対策ドライブをディレクトリとして変換 $driveName = substr($regmatch_array[0],0,1); - $cutPath = preg_replace('/^[a-zA-Z]\\:\\\\/' + $cutPath = preg_replace('/^[a-zA-Z]\\:/' ,$driveName.DIRECTORY_SEPARATOR, $cutPath ); } $virtual_root = preg_replace('/^'.util_CharUtility::escapeRegxStr($cutPath).'/','',$virtual_root); @@ -155,7 +155,7 @@ $target_dir = str_replace("\\",DIRECTORY_SEPARATOR,$target_dir); $dir_name_array = explode(DIRECTORY_SEPARATOR,$target_dir ); $dir_path = ''; - if( preg_match('/^[a-zA-Z]\\:\\\\/',$target_dir) ) { + if( preg_match('/^[a-zA-Z]\\:/',$target_dir) ) { // Windowsなら頭にセパレータをつけないのでそのまま } else { // Unix系ならパスはディレクトリセパレータから開始 From svnnotify @ sourceforge.jp Mon May 10 16:21:40 2010 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 10 May 2010 16:21:40 +0900 Subject: [Frameworkspider-svn] spider-commit [104] Message-ID: <1273476100.635767.15083.nullmailer@users.sourceforge.jp> Revision: 104 http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=104 Author: m_nakashima Date: 2010-05-10 16:21:40 +0900 (Mon, 10 May 2010) Log Message: ----------- Modified Paths: -------------- current/README.txt -------------- next part -------------- Modified: current/README.txt =================================================================== --- current/README.txt 2010-05-06 08:53:20 UTC (rev 103) +++ current/README.txt 2010-05-10 07:21:40 UTC (rev 104) @@ -3,6 +3,9 @@ ** ** このファイルにはコミットごとに変更点とファイル名を記述します。 ** +-- 2010-05-10 +1) ドライブ文字判断の正規表現に誤りがあり一部Windowsにて正常に動作しない現象の修正 + -- 2010-03-29 1) グローバルエラー機能を使えるように実装しました。 spider_HttpRequestクラスのaddGlobalError($message)メソッドで追加したエラーメッセージは次回