[Stack-cvs] stack-1-0/scripts stackDatabase.php,1.16.2.2,1.16.2.3

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12379/scripts

Modified Files:
      Tag: frontend_dev
	stackDatabase.php 
Log Message:


Index: stackDatabase.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C2 -d -r1.16.2.2 -r1.16.2.3
*** stackDatabase.php	15 Jun 2005 20:07:09 -0000	1.16.2.2
--- stackDatabase.php	15 Jun 2005 20:33:14 -0000	1.16.2.3
***************
*** 119,126 ****
          if (is_array($filter)) {
              if (array_key_exists('kw',$filter)) {
!                 $filter_kw   = $filter['kw'];
              }
              if (array_key_exists('name',$filter)) {
!                 $filter_name = $filter['name'];
              }
          }    
--- 119,126 ----
          if (is_array($filter)) {
              if (array_key_exists('kw',$filter)) {
!                 $filter_kw   = trim($filter['kw']);
              }
              if (array_key_exists('name',$filter)) {
!                 $filter_name = trim($filter['name']);
              }
          }    
***************
*** 169,176 ****
              $dispQ = TRUE;
              if ('' != $filter_kw) {
!               $dispQ = strpos($qkeywords,$filter_kw);
!             }
!             if ('' != $filter_name) {
!               $dispQ = $dispQ OR strpos($qname,$filter_name);
              }
  
--- 169,179 ----
              $dispQ = TRUE;
              if ('' != $filter_kw) {
!                 if ('' != $filter_name) {
!                   $dispQ = max(strpos($qkeywords,$filter_kw),strpos($qname,$filter_name));
!                 } else {
!                   $dispQ = strpos($qkeywords,$filter_kw);
!                 }
!             } else if ('' != $filter_name) {
!                   $dispQ = strpos($qname,$filter_name);
              }