[Koha-patches] [PATCH 08/17] MT 2285 : enhancement for patronSearch

[Michael Hafen]

There is extra text from a merge conflict here.  Better clean that up.
Also check 10/17 and 11/17 for the same.

On Fri, 2010-02-05 at 14:01 +0100, Henri-Damien LAURENT wrote:
> ---
>  C4/SQLHelper.pm                                    |   14 ++++++++++++++
>  .../intranet-tmpl/prog/en/css/staff-global.css     |    6 ++++++
>  2 files changed, 20 insertions(+), 0 deletions(-)
> 
> diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm
> index 4db8c49..a761f3a 100644
> --- a/C4/SQLHelper.pm
> +++ b/C4/SQLHelper.pm
> @@ -118,7 +118,11 @@ sub SearchInTable{
>  		#Order by desc by default
>  		my @orders;
>  		foreach my $order (@$orderby){
> +<<<<<<< HEAD:C4/SQLHelper.pm
>  			push @orders,map{ "$_".($order->{$_}? " DESC " : "") } keys %$order; 
> +=======
> +			push @orders,map{ "$_".($$order{$_}? " DESC " : "") } keys %$order; 
> +>>>>>>> MT 2285 : enhancement for patronSearch:C4/SQLHelper.pm
>  		}
>  		$sql.= do { local $"=', '; 
>  				qq{ ORDER BY @orders} 
> @@ -425,12 +429,17 @@ sub _Process_Operands{
>  	if ($field=~/(?<!zip)code|(?<!card)number/ && $searchtype ne "exact"){
>  		push @tmpkeys,(" $field= '' ","$field IS NULL");
>  	}
> +<<<<<<< HEAD:C4/SQLHelper.pm
>  	if ($columns->{$col_field}->{Type}=~/varchar|text/i){
> +=======
> +	if ($$columns{$col_field}{Type}=~/varchar|text/i){
> +>>>>>>> MT 2285 : enhancement for patronSearch:C4/SQLHelper.pm
>  		my @localvaluesextended;
>  		if ($searchtype eq "contain"){
>  			push @tmpkeys,(" $field LIKE ? ");
>  			push @localvaluesextended,("\%$operand\%") ;
>  		}
> +<<<<<<< HEAD:C4/SQLHelper.pm
>  		if ($searchtype eq "field_start_with"){
>  			push @tmpkeys,("$field LIKE ?");
>  			push @localvaluesextended, ("$operand\%") ;
> @@ -438,6 +447,11 @@ sub _Process_Operands{
>  		if ($searchtype eq "start_with"){
>  			push @tmpkeys,("$field LIKE ?","$field LIKE ?");
>  			push @localvaluesextended, ("$operand\%", " $operand\%") ;
> +=======
> +		if ($searchtype eq "start_with"){
> +			push @tmpkeys,(" $field LIKE ? ","$field LIKE ?");
> +			push @localvaluesextended, ("\% $operand\%","$operand\%") ;
> +>>>>>>> MT 2285 : enhancement for patronSearch:C4/SQLHelper.pm
>  		}
>  		push @values, at localvaluesextended;
>  	}
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> index 0be3df7..22636ab 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> @@ -519,6 +519,12 @@ div.yui-b fieldset.brief {
>  	padding : .4em .7em;
>  }
>  
> +label {  
> +	float: left;  
> +	width: 12em;  
> +	margin-right: 1em;  
> +	text-align: left;
> +}
>  div.yui-b fieldset.brief ol {
>  	font-size : 85%;
>  	margin : 0;


-- 
Michael Hafen
Systems Analyst and Programmer
Washington County School District
Utah, USA

for Koha checkout
http://development.washk12.org/gitweb/
or
git://development.washk12.org/koha