Index: branches/feature-module-update/data/class/SC_SelectSql.php
===================================================================
--- branches/feature-module-update/data/class/SC_SelectSql.php	(revision 15532)
+++ branches/feature-module-update/data/class/SC_SelectSql.php	(revision 15570)
@@ -8,228 +8,228 @@
 /* ---- SQL文を作るクラス ---- */
 class SC_SelectSql {
-	
-	var $sql;
-	
-	var $select;	
-	var $where;
-	var $order;
-	var $group;
-	var $limit;
-	var $offset;
-	var $arrSql;
-	var $arrVal;
-
-	//--　コンストラクタ。
-	function SC_SelectSql($array = "") {
-		if (is_array($array)) {
-			$this->arrSql = $array;
-		}
-	}
-
-	//-- SQL分生成
-	function getSql( $mode = "" ){
-		$this->sql = $this->select ." ". $this->where ." ". $this->group ." ";
-						
-		// $mode == 1 は limit & offset無し						
-		if ($mode == 2) {
-			$this->sql .= $this->order;
-		}elseif ( $mode != 1 ){
-			$this->sql .= $this->order . " " .$this->limit ." ". $this->offset;	
-		}
-
-		return $this->sql;	
-	}
-
-		// 検索用
-	function addSearchStr($val) {
-		$return = sfManualEscape($val);
-		$return = "%" .$return. "%";
-		return $return;
-	}
-	
-	//-- 範囲検索（○　~　○　まで）
-	function selectRange($from, $to, $column) {
-
-		// ある単位のみ検索($from = $to)
-		if(  $from == $to ) {
-			$this->setWhere( $column ." = ?" );
-			$return = array($from);
-		//　~$toまで検索
-		} elseif(  strlen($from) == 0 && strlen($to) > 0 ) {
-			$this->setWhere( $column ." <= ? "); 
-			$return = array($to);
-		//　~$from以上を検索
-		} elseif(  strlen($from) > 0 && strlen($to) == 0 ) {
-			$this->setWhere( $column ." >= ? ");
-			$return = array($from);
-		//　$from~$toの検索
-		} else {
-			$this->setWhere( $column ."	BETWEEN ? AND ?" ); 
-			$return = array($from, $to);
-		}
-		return $return;
-	}
-
-	//--　期間検索（○年○月○日か~○年○月○日まで）
-	function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column) {
-
-		// FROM
-		$date1 = $from_year . "/" . $from_month . "/" . $from_day;
-		
-		// TO
-		$date2 = mktime (0, 0, 0, $to_month, $to_day,  $to_year);
-		$date2 = $date2 + 86400;
-		// SQL文のdate関数に与えるフォーマットは、yyyy/mm/ddで指定する。
-		$date2 = date('Y/m/d', $date2);
-		
-		// 開始期間だけ指定の場合
-		if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) &&	( $to_year == "" ) && ( $to_month == "" ) && ( $to_day == "" ) ) {
-			$this->setWhere( $column ." >= '" . $date1 . "'");
-		}
-
-		//　開始〜終了
-		if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && 
-			( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
-			$this->setWhere( $column ." >= '" . $date1 ."' AND ". $column . " < date('" . $date2 . "')" );
-		}
-
-		// 終了期間だけ指定の場合
-		if( ( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
-			$this->setWhere( $column ." < date('" . $date2 . "')");
-		}
-		return $return;
-	}	
-
-	// checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合　例: AND ( sex = xxx OR sex = xxx OR sex = xxx  ) AND ... 
-	function setItemTerm( $arr, $ItemStr ) {
-
-		foreach( $arr as $data ) {
-	
-			if( count( $arr ) > 1 ) {
-				if( ! is_null( $data ) ) $item .= $ItemStr . " = ? OR ";	
-			} else {
-				if( ! is_null( $data ) ) $item = $ItemStr . " = ?";	
-			}
-			$return[] = $data;
-		}
-
-		if( count( $arr ) > 1 )  $item = "( " . rtrim( $item, " OR " ) . " )";
-		$this->setWhere( $item );
-		return $return;
-	}
-
-	//　NULL値が必要な場合
-	function setItemTermWithNull( $arr, $ItemStr ) {
-
-		$item = " ${ItemStr} IS NULL ";
-		
-		if ( $arr ){
-			foreach( $arr as $data ) {	
-				if ($data != "不明") {
-					$item .= " OR ${ItemStr} = ?";
-					$return[] = $data;
-				}
-			}
-		}
-		
-	 	$item = "( ${item} ) ";
-		$this->setWhere( $item );
-		return $return;
-	}
-	// NULLもしくは''で検索する場合
-	function setItemTermWithNullAndSpace( $arr, $ItemStr ) {
-		$count = count($arr);
-		$item = " ${ItemStr} IS NULL OR ${ItemStr} = '' ";
-		$i = 1;
-		if ( $arr ){
-			foreach( $arr as $data ) {	
-				if ($i == $count) break;
-				$item .= " OR ${ItemStr} = ?";	
-				$return[] = $data;
-				$i ++;
-			}
-		}
-	 	$item = "( ${item} ) ";
-		$this->setWhere( $item );
-		return $return;
-	}
-	
-
-
-	/* 複数のカラムでORで優先検索する場合　例：　AND ( item_flag1 = xxx OR item_flag2 = xxx OR item_flag3 = xxx  ) AND ... 
-
-		配列の構造例　
-		if ( $_POST['show_site1'] ) $arrShowsite_1 = array( "column" => "show_site1",
-															"value"  => $_POST['show_site1'] );
-
-	*/
-	function setWhereByOR( $arrWhere ){
-
-		$count = count( $arrWhere );
-
-		for( $i = 0; $i < $count; $i++ ) {
-
-			if( isset( $arrWhere[$i]["value"] ) ) $statement .= $arrWhere[$i]["column"] ." = '" . addslashes( $arrWhere[$i]["value"] ) ."' OR "  ;
-		}
-
-		$statement = "( " . rtrim( $statement, " OR " ) . " )";
-
-		if( $this->where ) {
-
-			$this->where .= " AND " . $statement;
-
-		} else {
-
-			$this->where = "WHERE " . $statement;
-		}
-	}
-
-	function setWhere($where){
-		if ($where != "") {		
-			if( $this->where ) {
-	
-				$this->where .= " AND " . $where;
-	
-			} else {
-	
-				$this->where = "WHERE " . $where;
-			}
-		}
-	}
-
-	function setOrder($order){
-		
-			$this->order =  "ORDER BY " . $order;
-		
-	}
-
-	function setGroup( $group ) {
-		
-		$this->group =  "GROUP BY " . $group;
-		
-	}
-
-	
-	function setLimitOffset( $limit, $offset ){
-
-		if ( is_numeric($limit) and is_numeric($offset) ){
-
-			$this->limit = " LIMIT " .$limit;
-			$this->offset = " OFFSET " .$offset;
-		}	
-	}
-	
-	function clearSql(){
-		$this->select = "";
-		$this->where = "";
-		$this->group = "";
-		$this->order = "";
-		$this->limit = "";
-		$this->offset = "";
-	}
-	
-	function setSelect($sql) {
-		$this->select = $sql;
-	}
+
+    var $sql;
+
+    var $select;
+    var $where;
+    var $order;
+    var $group;
+    var $limit;
+    var $offset;
+    var $arrSql;
+    var $arrVal;
+
+    //--　コンストラクタ。
+    function SC_SelectSql($array = "") {
+        if (is_array($array)) {
+            $this->arrSql = $array;
+        }
+    }
+
+    //-- SQL分生成
+    function getSql( $mode = "" ){
+        $this->sql = $this->select ." ". $this->where ." ". $this->group ." ";
+
+        // $mode == 1 は limit & offset無し
+        if ($mode == 2) {
+            $this->sql .= $this->order;
+        }elseif ( $mode != 1 ){
+            $this->sql .= $this->order . " " .$this->limit ." ". $this->offset;
+        }
+
+        return $this->sql;
+    }
+
+        // 検索用
+    function addSearchStr($val) {
+        $return = sfManualEscape($val);
+        $return = "%" .$return. "%";
+        return $return;
+    }
+
+    //-- 範囲検索（○　~　○　まで）
+    function selectRange($from, $to, $column) {
+
+        // ある単位のみ検索($from = $to)
+        if(  $from == $to ) {
+            $this->setWhere( $column ." = ?" );
+            $return = array($from);
+        //　~$toまで検索
+        } elseif(  strlen($from) == 0 && strlen($to) > 0 ) {
+            $this->setWhere( $column ." <= ? ");
+            $return = array($to);
+        //　~$from以上を検索
+        } elseif(  strlen($from) > 0 && strlen($to) == 0 ) {
+            $this->setWhere( $column ." >= ? ");
+            $return = array($from);
+        //　$from~$toの検索
+        } else {
+            $this->setWhere( $column ." BETWEEN ? AND ?" );
+            $return = array($from, $to);
+        }
+        return $return;
+    }
+
+    //--　期間検索（○年○月○日か~○年○月○日まで）
+    function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column) {
+
+        // FROM
+        $date1 = $from_year . "/" . $from_month . "/" . $from_day;
+
+        // TO
+        $date2 = mktime (0, 0, 0, $to_month, $to_day,  $to_year);
+        $date2 = $date2 + 86400;
+        // SQL文のdate関数に与えるフォーマットは、yyyy/mm/ddで指定する。
+        $date2 = date('Y/m/d', $date2);
+
+        // 開始期間だけ指定の場合
+        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && ( $to_year == "" ) && ( $to_month == "" ) && ( $to_day == "" ) ) {
+            $this->setWhere( $column ." >= '" . $date1 . "'");
+        }
+
+        //　開始〜終了
+        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) &&
+            ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
+            $this->setWhere( $column ." >= '" . $date1 ."' AND ". $column . " < date('" . $date2 . "')" );
+        }
+
+        // 終了期間だけ指定の場合
+        if( ( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
+            $this->setWhere( $column ." < date('" . $date2 . "')");
+        }
+        return $return;
+    }
+
+    // checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合　例: AND ( sex = xxx OR sex = xxx OR sex = xxx  ) AND ...
+    function setItemTerm( $arr, $ItemStr ) {
+
+        foreach( $arr as $data ) {
+
+            if( count( $arr ) > 1 ) {
+                if( ! is_null( $data ) ) $item .= $ItemStr . " = ? OR ";
+            } else {
+                if( ! is_null( $data ) ) $item = $ItemStr . " = ?";
+            }
+            $return[] = $data;
+        }
+
+        if( count( $arr ) > 1 )  $item = "( " . rtrim( $item, " OR " ) . " )";
+        $this->setWhere( $item );
+        return $return;
+    }
+
+    //　NULL値が必要な場合
+    function setItemTermWithNull( $arr, $ItemStr ) {
+
+        $item = " ${ItemStr} IS NULL ";
+
+        if ( $arr ){
+            foreach( $arr as $data ) {
+                if ($data != "不明") {
+                    $item .= " OR ${ItemStr} = ?";
+                    $return[] = $data;
+                }
+            }
+        }
+
+        $item = "( ${item} ) ";
+        $this->setWhere( $item );
+        return $return;
+    }
+    // NULLもしくは''で検索する場合
+    function setItemTermWithNullAndSpace( $arr, $ItemStr ) {
+        $count = count($arr);
+        $item = " ${ItemStr} IS NULL OR ${ItemStr} = '' ";
+        $i = 1;
+        if ( $arr ){
+            foreach( $arr as $data ) {
+                if ($i == $count) break;
+                $item .= " OR ${ItemStr} = ?";
+                $return[] = $data;
+                $i ++;
+            }
+        }
+        $item = "( ${item} ) ";
+        $this->setWhere( $item );
+        return $return;
+    }
+
+
+
+    /* 複数のカラムでORで優先検索する場合　例：　AND ( item_flag1 = xxx OR item_flag2 = xxx OR item_flag3 = xxx  ) AND ...
+
+        配列の構造例　
+        if ( $_POST['show_site1'] ) $arrShowsite_1 = array( "column" => "show_site1",
+                                                            "value"  => $_POST['show_site1'] );
+
+    */
+    function setWhereByOR( $arrWhere ){
+
+        $count = count( $arrWhere );
+
+        for( $i = 0; $i < $count; $i++ ) {
+
+            if( isset( $arrWhere[$i]["value"] ) ) $statement .= $arrWhere[$i]["column"] ." = '" . addslashes( $arrWhere[$i]["value"] ) ."' OR "  ;
+        }
+
+        $statement = "( " . rtrim( $statement, " OR " ) . " )";
+
+        if( $this->where ) {
+
+            $this->where .= " AND " . $statement;
+
+        } else {
+
+            $this->where = "WHERE " . $statement;
+        }
+    }
+
+    function setWhere($where){
+        if ($where != "") {
+            if( $this->where ) {
+
+                $this->where .= " AND " . $where;
+
+            } else {
+
+                $this->where = "WHERE " . $where;
+            }
+        }
+    }
+
+    function setOrder($order){
+
+            $this->order =  "ORDER BY " . $order;
+
+    }
+
+    function setGroup( $group ) {
+
+        $this->group =  "GROUP BY " . $group;
+
+    }
+
+
+    function setLimitOffset( $limit, $offset ){
+
+        if ( is_numeric($limit) and is_numeric($offset) ){
+
+            $this->limit = " LIMIT " .$limit;
+            $this->offset = " OFFSET " .$offset;
+        }
+    }
+
+    function clearSql(){
+        $this->select = "";
+        $this->where = "";
+        $this->group = "";
+        $this->order = "";
+        $this->limit = "";
+        $this->offset = "";
+    }
+
+    function setSelect($sql) {
+        $this->select = $sql;
+    }
 }
 ?>