[Koha-cvs] koha/C4 Biblio.pm Bull.pm Koha.pm Search.pm [dev_week]
Joshua Ferraro
jmf at kados.org
Fri Sep 29 18:07:47 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/09/29 16:07:47
Modified files:
C4 : Biblio.pm Bull.pm Koha.pm Search.pm
Log message:
Synch latest changes to dev_week
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.29&r2=1.115.2.51.2.30
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.22.2.1&r2=1.6.2.22.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.4&r2=1.22.2.4.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.25&r2=1.99.2.11.2.26
Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.51.2.29
retrieving revision 1.115.2.51.2.30
diff -u -b -r1.115.2.51.2.29 -r1.115.2.51.2.30
--- Biblio.pm 24 Sep 2006 23:59:29 -0000 1.115.2.51.2.29
+++ Biblio.pm 29 Sep 2006 16:07:47 -0000 1.115.2.51.2.30
@@ -1351,7 +1351,7 @@
$record->insert_fields_ordered($tag);
- }else {
+ } else {
$record->insert_fields_ordered( $tagfield, " ", " ", $tagsubfield => $value );
}
}
@@ -3140,8 +3140,11 @@
=cut
-# $Id: Biblio.pm,v 1.115.2.51.2.29 2006/09/24 23:59:29 kados Exp $
+# $Id: Biblio.pm,v 1.115.2.51.2.30 2006/09/29 16:07:47 kados Exp $
# $Log: Biblio.pm,v $
+# Revision 1.115.2.51.2.30 2006/09/29 16:07:47 kados
+# Synch latest changes to dev_week
+#
# Revision 1.115.2.51.2.29 2006/09/24 23:59:29 kados
# turned on warnings, did some cleaning based on warns. Will turn off
# before release.
Index: Bull.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Bull.pm,v
retrieving revision 1.6.2.22.2.1
retrieving revision 1.6.2.22.2.2
diff -u -b -r1.6.2.22.2.1 -r1.6.2.22.2.2
--- Bull.pm 11 Jul 2006 13:44:20 -0000 1.6.2.22.2.1
+++ Bull.pm 29 Sep 2006 16:07:47 -0000 1.6.2.22.2.2
@@ -587,7 +587,7 @@
$marcrecord->insert_fields_ordered($newField);
}
}
- NEWnewitem($dbh,$marcrecord,$bibid);
+ AddItem($dbh,$marcrecord,$bibid);
return 1;
}
return (0, at errors);
Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.22.2.4.2.4
retrieving revision 1.22.2.4.2.5
diff -u -b -r1.22.2.4.2.4 -r1.22.2.4.2.5
--- Koha.pm 24 Sep 2006 20:15:43 -0000 1.22.2.4.2.4
+++ Koha.pm 29 Sep 2006 16:07:47 -0000 1.22.2.4.2.5
@@ -701,12 +701,12 @@
tags => ['650'],
subfield => 'a',
},
- {
- link_value => 'su-na',
- label_value => 'People and Organizations',
- tags => ['600', '610', '611'],
- subfield => 'a',
- },
+# {
+# link_value => 'su-na',
+# label_value => 'People and Organizations',
+# tags => ['600', '610', '611'],
+# subfield => 'a',
+# },
{
link_value => 'su-geo',
label_value => 'Places',
@@ -755,7 +755,7 @@
{value =>"1=31 <i", label => " Publication/Copyright Date: Newest to Oldest"},
{value =>"1=31 >i", label => " Publication/Copyright Date: Oldest to Newest"},
{value =>"1=32 >i", label => " Acquisition Date: Newest to Oldest"},
- {value =>"1=32 >i", label => " Acquisition Date: Oldest to Newest"},
+ {value =>"1=32 <i", label => " Acquisition Date: Oldest to Newest"},
{value =>"1=36 <i", label => "Title (A-Z)"},
{value =>"1=36 >i", label => "Title (Z-A)"},
];
Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.25
retrieving revision 1.99.2.11.2.26
diff -u -b -r1.99.2.11.2.25 -r1.99.2.11.2.26
--- Search.pm 24 Sep 2006 20:00:51 -0000 1.99.2.11.2.25
+++ Search.pm 29 Sep 2006 16:07:47 -0000 1.99.2.11.2.26
@@ -39,7 +39,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.25 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.26 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -2792,7 +2792,7 @@
$facet_label_value = substr($one_facet,0,20)."..." unless length($facet_label_value)<=20;
# well, if it's a branch, label by the name, not the code
if ($link_value =~/branch/) {
- warn "branch";
+ #warn "branch";
$facet_label_value = $branches->{$one_facet}->{'branchname'};
}
@@ -2884,7 +2884,7 @@
}
};
if ($@) {
- warn "prob ".$@;
+ warn "prob with query $query_to_use ".$@;
}
#warn "after query";
# concatenate the sort_by limits and pass them to the results object
@@ -3103,7 +3103,7 @@
#$weighted_query .= " or any,ext,r4=$operand"; # index as exact
$weighted_query .= " or kw,wrdl,r5=$operand"; # index as exact
$weighted_query .= " or wrd,fuzzy,r9=$operand";
- #$weighted_query .= " or wrd=$stemmed_operand" if $stemming;
+ $weighted_query .= " or wrd=$stemmed_operand" if $stemming;
}
}
elsif ($index =~ /au/) {
@@ -3209,7 +3209,7 @@
$human_search_desc =~ s/ / /g;
$human_search_desc =~s/^ //g;
my $koha_query = $query;
- #warn "QUERY:".$koha_query;
+ warn "QUERY:".$koha_query;
#warn "SEARCHDESC:".$human_search_desc;
#warn "FEDERATED QUERY:".$federated_query;
return (undef,$human_search_desc,$koha_query,$federated_query);
More information about the Koha-cvs
mailing list