View | Details | Raw Unified | Return to bug 2809
Collapse All | Expand All

(-)a/C4/Search.pm (-20 / +23 lines)
Lines 1147-1161 sub buildQuery { Link Here
1147
                # Date of Publication
1147
                # Date of Publication
1148
                if ( $index eq 'yr' ) {
1148
                if ( $index eq 'yr' ) {
1149
                    $index .= ",st-numeric";
1149
                    $index .= ",st-numeric";
1150
                    $indexes_set++;
1150
#                    $indexes_set++;
1151
					$stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
1151
		    $stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
1152
                }
1152
                }
1153
1153
1154
                # Date of Acquisition
1154
                # Date of Acquisition
1155
                elsif ( $index eq 'acqdate' ) {
1155
                elsif ( $index eq 'acqdate' ) {
1156
                    $index .= ",st-date-normalized";
1156
                    $index .= ",st-date-normalized";
1157
                    $indexes_set++;
1157
#                    $indexes_set++;
1158
					$stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
1158
		    $stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
1159
                }
1159
                }
1160
                # ISBN,ISSN,Standard Number, don't need special treatment
1160
                # ISBN,ISSN,Standard Number, don't need special treatment
1161
                elsif ( $index eq 'nb' || $index eq 'ns' ) {
1161
                elsif ( $index eq 'nb' || $index eq 'ns' ) {
Lines 1336-1356 sub buildQuery { Link Here
1336
1336
1337
        # Regular old limits
1337
        # Regular old limits
1338
        else {
1338
        else {
1339
            $limit .= " and " if $limit || $query;
1339
	    if ($this_limit){
1340
            $limit      .= "$this_limit";
1340
		$limit .= " and " if $limit || $query;
1341
            $limit_cgi  .= "&limit=$this_limit";
1341
		$limit      .= "$this_limit";
1342
            if ($this_limit =~ /^branch:(.+)/) {
1342
		$limit_cgi  .= "&limit=$this_limit";
1343
                my $branchcode = $1;
1343
		if ($this_limit =~ /^branch:(.+)/) {
1344
                my $branchname = GetBranchName($branchcode);
1344
		    my $branchcode = $1;
1345
                if (defined $branchname) {
1345
		    my $branchname = GetBranchName($branchcode);
1346
                    $limit_desc .= " branch:$branchname";
1346
		    if (defined $branchname) {
1347
                } else {
1347
			$limit_desc .= " branch:$branchname";
1348
                    $limit_desc .= " $this_limit";
1348
		    } 
1349
                }
1349
		    else {
1350
            } else {
1350
			$limit_desc .= " $this_limit";
1351
                $limit_desc .= " $this_limit";
1351
		    }
1352
            }
1352
		} 
1353
        }
1353
		else {
1354
		    $limit_desc .= " $this_limit";
1355
		}
1356
	    }
1357
	}
1354
    }
1358
    }
1355
    if ($group_OR_limits) {
1359
    if ($group_OR_limits) {
1356
        $limit .= " and " if ( $query || $limit );
1360
        $limit .= " and " if ( $query || $limit );
1357
- 

Return to bug 2809