Changeset 21444 for branches/version-2_12-dev/data/class/SC_SelectSql.php

Timestamp:

2012/02/06 21:27:04 (12 years ago)

Author:

Seasoft

Message:

#1613 (ソース整形・ソースコメントの改善)

• 無意味なスペースを削除

File:

• branches/version-2_12-dev/data/class/SC_SelectSql.php (modified) (11 diffs)

branches/version-2_12-dev/data/class/SC_SelectSql.php

@@ -44 +44 @@
 
     //-- SQL分生成
-    function getSql( $mode = "" ){
+    function getSql( $mode = ""){
         $this->sql = $this->select ." ". $this->where ." ". $this->group ." ";
 
@@ -68 +68 @@
         // ある単位のみ検索($from = $to)
         if ($from == $to) {
-            $this->setWhere( $column ." = ?" );
+            $this->setWhere( $column ." = ?");
             $return = array($from);
         //　~$toまで検索
@@ -80 +80 @@
         //　$from~$toの検索
         } else {
-            $this->setWhere( $column ." BETWEEN ? AND ?" );
+            $this->setWhere( $column ." BETWEEN ? AND ?");
             $return = array($from, $to);
         }
@@ -102 +102 @@
 
         // 開始期間だけ指定の場合
-        if (( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && ( $to_year == "" ) && ( $to_month == "" ) && ( $to_day == "" )) {
+        if (( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && ( $to_year == "" ) && ( $to_month == "" ) && ( $to_day == "")) {
             $this->setWhere( $column .' >= ?');
             $return[] = $date1;
@@ -108 +108 @@
 
         //　開始～終了
-        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) &&
-            ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
-            $this->setWhere( $column . ' >= ? AND ' . $column . ' < date(?)' );
+        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "") &&
+            ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" )) {
+            $this->setWhere( $column . ' >= ? AND ' . $column . ' < date(?)');
             $return[] = $date1;
             $return[] = $date2;
@@ -116 +116 @@
 
         // 終了期間だけ指定の場合
-        if (( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" )) {
+        if (( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "")) {
             $this->setWhere( $column . ' < date(?)');
             $return[] = $date2;
@@ -124 +124 @@
     }
 
-    // checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合　例: AND ( sex = xxx OR sex = xxx OR sex = xxx  ) AND ...
-    function setItemTerm( $arr, $ItemStr ) {
+    // 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 ";
+            if (count( $arr) > 1) {
+                if( ! is_null( $data )) $item .= $ItemStr . " = ? OR ";
             } else {
-                if( ! is_null( $data ) ) $item = $ItemStr . " = ?";
+                if( ! is_null( $data )) $item = $ItemStr . " = ?";
             }
             $return[] = $data;
         }
 
-        if( count( $arr ) > 1 )  $item = "( " . rtrim( $item, " OR " ) . " )";
-        $this->setWhere( $item );
+        if( count( $arr ) > 1 )  $item = "( " . rtrim( $item, " OR " ) . ")";
+        $this->setWhere( $item);
         return $return;
     }
 
     //　NULL値が必要な場合
-    function setItemTermWithNull( $arr, $ItemStr ) {
+    function setItemTermWithNull( $arr, $ItemStr) {
 
         $item = " ${ItemStr} IS NULL ";
@@ -156 +156 @@
         }
 
-        $item = "( ${item} ) ";
-        $this->setWhere( $item );
+        $item = "( ${item}) ";
+        $this->setWhere( $item);
         return $return;
     }
     // NULLもしくは''で検索する場合
-    function setItemTermWithNullAndSpace( $arr, $ItemStr ) {
+    function setItemTermWithNullAndSpace( $arr, $ItemStr) {
         $count = count($arr);
         $item = " ${ItemStr} IS NULL OR ${ItemStr} = '' ";
@@ -173 +173 @@
             }
         }
-        $item = "( ${item} ) ";
-        $this->setWhere( $item );
-        return $return;
-    }
-
-    /* 複数のカラムでORで優先検索する場合　例：　AND ( item_flag1 = xxx OR item_flag2 = xxx OR item_flag3 = xxx  ) AND ...
+        $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'] );
+        if ( $_POST['show_site1']) $arrShowsite_1 = array( 'column' => "show_site1",
+                                                            'value'  => $_POST['show_site1']);
 
     */
-    function setWhereByOR( $arrWhere ){
-
-        $count = count( $arrWhere );
+    function setWhereByOR( $arrWhere){
+
+        $count = count( $arrWhere);
 
         for ($i = 0; $i < $count; $i++) {
 
-            if( isset( $arrWhere[$i]['value'] ) ) $statement .= $arrWhere[$i]['column'] ." = " . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) ." OR "  ;
-        }
-
-        $statement = "( " . rtrim( $statement, " OR " ) . " )";
+            if( isset( $arrWhere[$i]['value'] )) $statement .= $arrWhere[$i]['column'] ." = " . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) ." OR "  ;
+        }
+
+        $statement = "( " . rtrim( $statement, " OR " ) . ")";
 
         if ($this->where) {
@@ -225 +225 @@
     }
 
-    function setGroup( $group ) {
+    function setGroup( $group) {
 
         $this->group =  "GROUP BY " . $group;
@@ -231 +231 @@
     }
 
-    function setLimitOffset( $limit, $offset ){
+    function setLimitOffset( $limit, $offset){
 
         if (is_numeric($limit) and is_numeric($offset)) {