[Koha-cvs] koha C4/Breeding.pm koha-tmpl/opac-tmpl/css/en/... [rel_2_2]
Henri-Damien LAURENT
laurenthdl at alinto.com
Fri Oct 6 17:33:37 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Henri-Damien LAURENT <hdl> 06/10/06 15:33:37
Modified files:
C4 : Breeding.pm
koha-tmpl/opac-tmpl/css/en: opac-main.tmpl opac-search.tmpl
opac : opac-main.pl
Log message:
Adding automatic branch selection for connected user in OPAC IF SeachMyLibraryFirst is set to 1
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Breeding.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.16.2.14&r2=1.16.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.11.2.13&r2=1.11.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.16.2.11&r2=1.16.2.12
Patches:
Index: C4/Breeding.pm
===================================================================
RCS file: /sources/koha/koha/C4/Breeding.pm,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- C4/Breeding.pm 18 Mar 2005 08:57:04 -0000 1.7.2.1
+++ C4/Breeding.pm 6 Oct 2006 15:33:37 -0000 1.7.2.2
@@ -75,10 +75,12 @@
my @warnings = $marcrecord->warnings();
if (scalar($marcrecord->fields()) == 0) {
$notmarcrecord++;
+ print "===================NOT MARCRECORD================";
} else {
+ print "MARCRECORD";
my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,'');
- $oldbiblio->{title} = char_decode($oldbiblio->{title},$encoding);
- $oldbiblio->{author} = char_decode($oldbiblio->{author},$encoding);
+# $oldbiblio->{title} = char_decode($oldbiblio->{title},$encoding) ;#if (C4::Context->preference("TemplateEncoding") eq "iso-8859-1");
+# $oldbiblio->{author} = char_decode($oldbiblio->{author},$encoding);# if (C4::Context->preference("TemplateEncoding") eq "iso-8859-1");
# if isbn found and biblio does not exist, add it. If isbn found and biblio exists, overwrite or ignore depending on user choice
# drop every "special" char : spaces, - ...
$oldbiblio->{isbn} =~ s/ |-|\.//g,
@@ -87,13 +89,13 @@
$oldbiblio->{issn} = substr($oldbiblio->{issn},0,10);
# search if biblio exists
my $biblioitemnumber;
- if ($oldbiblio->{isbn}) {
- $searchisbn->execute($oldbiblio->{isbn});
- ($biblioitemnumber) = $searchisbn->fetchrow;
- } else {
- $searchissn->execute($oldbiblio->{issn});
- ($biblioitemnumber) = $searchissn->fetchrow;
- }
+# if ($oldbiblio->{isbn}) {
+# $searchisbn->execute($oldbiblio->{isbn});
+# ($biblioitemnumber) = $searchisbn->fetchrow;
+# } else {
+# $searchissn->execute($oldbiblio->{issn});
+# ($biblioitemnumber) = $searchissn->fetchrow;
+# }
if ($biblioitemnumber) {
$alreadyindb++;
} else {
Index: koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.14
retrieving revision 1.16.2.15
diff -u -b -r1.16.2.14 -r1.16.2.15
--- koha-tmpl/opac-tmpl/css/en/opac-main.tmpl 14 Jun 2006 15:43:39 -0000 1.16.2.14
+++ koha-tmpl/opac-tmpl/css/en/opac-main.tmpl 6 Oct 2006 15:33:37 -0000 1.16.2.15
@@ -47,7 +47,21 @@
<input type="hidden" name="and_or" value="and" />
<input type="hidden" name="excluding" value="" />
<input type="hidden" name="operator" value="contains" />
- Quick search : <input type="text" size="27" name="value" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
+ Quick search : <input type="text" size="27" name="value" tabindex="1" />
+ <!--TMPL_IF Name="mylibraryfirst"-->
+ <br />in Branch
+ <input type="hidden" name="marclist" value="items.holdingbranch" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ <input type="hidden" name="operator" value="=" />
+ <select name="value">
+ <option value="">Any Branch</option>
+ <!-- TMPL_LOOP name="branchloop" -->
+ <option value="<!-- TMPL_VAR name="value" -->" <!--TMPL_IF Name="selected"-->selected<!--/TMPL_IF-->> <!-- TMPL_VAR name="branchname" --> </option>
+ <!-- /TMPL_LOOP -->
+ </select>
+ <!-- /TMPL_IF -->
+ <input type="submit" value="OK" class="button" /><br />
</p>
<p>
<a href="/cgi-bin/koha/opac-search.pl" class="button">Advanced Search, More Options </a>
Index: koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.13
retrieving revision 1.11.2.14
diff -u -b -r1.11.2.13 -r1.11.2.14
--- koha-tmpl/opac-tmpl/css/en/opac-search.tmpl 20 Jun 2006 18:09:58 -0000 1.11.2.13
+++ koha-tmpl/opac-tmpl/css/en/opac-search.tmpl 6 Oct 2006 15:33:37 -0000 1.11.2.14
@@ -83,7 +83,13 @@
<input type="hidden" name="and_or" value="and" />
<input type="hidden" name="excluding" value="" />
<input type="hidden" name="operator" value="=" />
- <!-- TMPL_VAR name="CGIbranch" -->
+ <select name="value">
+ <option value="">Any Branch</option>
+ <!-- TMPL_LOOP name="branchloop" -->
+ <option value="<!-- TMPL_VAR name="value" -->" <!--TMPL_IF Name="selected"-->selected<!--/TMPL_IF-->> <!-- TMPL_VAR name="branchname" -->
+ </option>
+ <!-- /TMPL_LOOP -->
+ </select>
</p>
</div>
<div id="bloc20">
Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16.2.11
retrieving revision 1.16.2.12
diff -u -b -r1.16.2.11 -r1.16.2.12
--- opac/opac-main.pl 11 Sep 2006 01:27:54 -0000 1.16.2.11
+++ opac/opac-main.pl 6 Oct 2006 15:33:37 -0000 1.16.2.12
@@ -63,6 +63,26 @@
if($languages_count > 1){
$template->param(languages => \@options);
}
+if (C4::Context->preference("SearchMyLibraryFirst")){
+ if (C4::Context->userenv){
+ my @branches;
+ my @select_branch;
+ my %select_branches;
+ my $branches = getallbranches();
+ my @branchloop;
+ foreach my $thisbranch (keys %$branches) {
+ warn "branch".C4::Context->userenv->{branch}. 'mabranche : '.$thisbranch." egalite :".($thisbranch eq C4::Context->userenv->{branch});
+ my %row =('value' => $thisbranch,
+ 'branchname' => $branches->{$thisbranch}->{'branchname'},
+ );
+ $row{'selected'} = 1 if ($thisbranch eq C4::Context->userenv->{branch});
+ push @branchloop, \%row;
+ }
+ $template->param("mylibraryfirst"=>1,"branchloop"=>\@branchloop);
+ } else {
+ $template->param("mylibraryfirst"=>0)
+ }
+}
$template->param(itemtypeloop => \@itemtypeloop,
branchloop=>\@branchloop,
suggestion => C4::Context->preference("suggestion"),
More information about the Koha-cvs
mailing list