Saved Reports

[% bibliotitle |html %] · Please note:

<?xml version="1.0" encoding="ISO-8859-1" ?>
+<xml version="1.0" encoding="UTF-8">;
 <GetAuthorityRecords>
+  <record>
+    <?xml version="1.0" encoding="UTF-8"?>
   <record
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/ standards/marcxml/schema/MARC21slim.xsd"
     xmlns="http://www.loc.gov/MARC21/slim">
-    <leader>00126nx  j2200073   4500 </leader>
+      <leader>00182     2200085   4500</leader>
     <controlfield tag="001">1</controlfield>
-    <datafield tag="250" ind1=" " ind2=" ">
-      <subfield code="a">TECHNIQUE</subfield>
+      <datafield tag="200" ind1=" " ind2=" ">
+        <subfield code="a">Hugo</subfield>
+        <subfield code="b">Victor</subfield>
     </datafield>
-    <datafield tag="100" ind1=" " ind2=" ">
-      <subfield code="a">20071210afrey50      ba0</subfield>
-    </datafield>
-    <datafield tag="152" ind1=" " ind2=" ">
-      <subfield code="b">NC</subfield>
-    </datafield>
-  </record>
-  <record
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/ standards/marcxml/schema/MARC21slim.xsd"
-    xmlns="http://www.loc.gov/MARC21/slim">
-    <leader>00130nx  j2200073   4500 </leader>
-    <controlfield tag="001">2</controlfield>
-    <datafield tag="250" ind1=" " ind2=" ">
-      <subfield code="a">CHEMIN DE FER</subfield>
+      <datafield tag="801" ind1=" " ind2=" ">
+        <subfield code="a">France</subfield>
+        <subfield code="b">Nimes</subfield>
+        <subfield code="c">2010/04/13</subfield>
     </datafield>
     <datafield tag="100" ind1=" " ind2=" ">
-      <subfield code="a">20071210afrey50      ba0</subfield>
+        <subfield code="a">20100413     50                    </subfield>
     </datafield>
     <datafield tag="152" ind1=" " ind2=" ">
-      <subfield code="b">NC</subfield>
+        <subfield code="b">NP</subfield>
     </datafield>
   </record>
-  <record>RecordNotFound</record>
+  </record>
+  <record>
+    <code>RecordNotFound</code>
+  </record>
+  <record>
+    <code>RecordNotFound</code>
+  </record>
 </GetAuthorityRecords>
 
 [% ELSIF ( LookupPatron ) %]

diff --git a/opac/ilsdi.pl b/opac/ilsdi.pl
index 56058f0..48fd7ba 100755
--- a/opac/ilsdi.pl
+++ b/opac/ilsdi.pl
@@ -233,7 +233,6 @@ print CGI::header('-type'=>'text/xml', '-charset'=>'utf-8');
 print XMLout(
     $out,
     noattr        => 1,
-    noescape      => 1,
     nosort        => 1,
     xmldecl       => '',
     RootName      => $service,
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 01:27:20 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 11:27:20 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 5881 : CSV export : deal
	with control fields to avoid an error (C4/Record.pm)
Message-ID: <1305242840-21328-1-git-send-email-chrisc@catalyst.net.nz>

From: Paul Poulain 

Signed-off-by: Chris Cormack 
---
 C4/Record.pm |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/C4/Record.pm b/C4/Record.pm
index c5727f3..b0640ca 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -462,26 +462,37 @@ sub marcrecord2csv {
 		}
 	    }
 	    push (@fieldstab, join($subfieldseparator, @tmpfields));  		
-	# Or a field
-	} else {
-	    my @fields = ($record->field($marcfield));
-	    my $authvalues = GetKohaAuthorisedValuesFromField($marcfield, undef, $frameworkcode, undef);
-
-	    my @valuesarray;
-	    foreach (@fields) {
-		my $value;
-
-		# Getting authorised value
-		$value = defined $authvalues->{$_->as_string} ? $authvalues->{$_->as_string} : $_->as_string;
-
-		# Field processing
-		eval $fieldprocessing if ($fieldprocessing);
+   	    # Or a field
 
-		push @valuesarray, $value;
-	    }
-	    push (@fieldstab, join($fieldseparator, @valuesarray)); 
-	 }
-    };
+        } else {
+            my @fields = ( $record->field($marcfield) );
+            my $authvalues = GetKohaAuthorisedValuesFromField( $marcfield, undef, $frameworkcode, undef );
+
+            my @valuesarray;
+            foreach (@fields) {
+                my $value;
+
+               # If it is a control field
+               if ($_->is_control_field) {
+                   $value = defined $authvalues->{$_->as_string} ? $authvalues->{$_->as_string} : $_->as_string;
+               } else {
+                   # If it is a field, we gather all subfields, joined by the subfield separator
+                   my @subvaluesarray;
+                   my @subfields = $_->subfields;
+                   foreach my $subfield (@subfields) {
+                       push (@subvaluesarray, defined $authvalues->{$subfield->[1]} ? $authvalues->{$subfield->[1]} : $subfield->[1]);
+                   }
+                   $value = join ($subfieldseparator, @subvaluesarray);
+               }
+
+                # Field processing
+                eval $fieldprocessing if ($fieldprocessing);
+
+                push @valuesarray, $value;
+            }
+            push( @fieldstab, join( $fieldseparator, @valuesarray ) );
+        }
+    }
 
     $csv->combine(@fieldstab);
     $output .= $csv->string() . "\n";
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 01:29:44 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 11:29:44 +1200
Subject: [Koha-patches] [Signed off] [PATCH] Bug 5889: Follow-up for message
	name translation
Message-ID: <1305242984-21550-1-git-send-email-chrisc@catalyst.net.nz>

From: Katrin Fischer 

Some sample files had Item_DUE instead of Item_Due.
In these cases the Item Due notices was shown as 'Unknown'
in the message preferences table.

Signed-off-by: Chris Cormack 
---
 .../optional/sample_notices_message_attributes.sql |    4 ++--
 .../sample_notices_message_attributes.sql          |    2 +-
 .../sample_notices_message_attributes.sql          |   10 +++++-----
 .../optional/sample_notices_message_attributes.sql |    2 +-
 .../optional/sample_notices_message_attributes.sql |    2 +-
 .../optional/sample_notices_message_attributes.sql |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql
index b505486..8499d3d 100644
--- a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql
@@ -1,8 +1,8 @@
 insert into `message_attributes`
 (`message_attribute_id`, message_name, `takes_days`)
 values
-(1, 'Item_DUE', 0),
+(1, 'Item_Due', 0),
 (2, 'Advance_Notice', 1),
 (4, 'Hold_Filled', 0),
 (5, 'Item_Check_in', 0),
-(6, 'Item_Checkout', 0);
\ No newline at end of file
+(6, 'Item_Checkout', 0);
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
index 8e919e9..a7a6032 100644
--- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
@@ -1,7 +1,7 @@
 insert into `message_attributes`
 (`message_attribute_id`, message_name, `takes_days`)
 values
-(1, 'Item_DUE', 0),
+(1, 'Item_Due', 0),
 (2, 'Advance_Notice', 1),
 (4, 'Hold_Filled', 0),
 (5, 'Item_Check_in', 0),
diff --git a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql
index 231af9c..a96b2e1 100644
--- a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql
@@ -3,10 +3,10 @@ SET FOREIGN_KEY_CHECKS=0;
 insert into `message_attributes`
 (`message_attribute_id`, message_name, `takes_days`)
 values
-(1, 'Item DUE', 0),
-(2, 'Advance Notice', 1),
-(4, 'Hold Filled', 0),
-(5, 'Item Check-in', 0),
-(6, 'Item Checkout', 0);
+(1, 'Item_Due', 0),
+(2, 'Advance_Notice', 1),
+(4, 'Hold_Filled', 0),
+(5, 'Item_Check_in', 0),
+(6, 'Item_Checkout', 0);
 
 SET FOREIGN_KEY_CHECKS=1;
diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql b/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql
index 8e919e9..a7a6032 100644
--- a/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql
@@ -1,7 +1,7 @@
 insert into `message_attributes`
 (`message_attribute_id`, message_name, `takes_days`)
 values
-(1, 'Item_DUE', 0),
+(1, 'Item_Due', 0),
 (2, 'Advance_Notice', 1),
 (4, 'Hold_Filled', 0),
 (5, 'Item_Check_in', 0),
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql
index c9d9bd1..94c7897 100644
--- a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql
@@ -3,7 +3,7 @@ truncate message_attributes;
 insert into `message_attributes`
 (`message_attribute_id`, message_name, `takes_days`)
 values
-(1, 'Item_DUE',                    0),
+(1, 'Item_Due',                    0),
 (2, 'Advance_Notice',              1),
 (4, 'Hold_Filled',                 0),
 (5, 'Item_Check_in',               0),
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql
index 75e2793..53eeeac 100644
--- a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql
@@ -3,7 +3,7 @@ truncate message_attributes;
 insert into `message_attributes`
 (`message_attribute_id`, `message_name`, `takes_days`)
 values
-(1, 'Item_DUE'              , 0),
+(1, 'Item_Due'              , 0),
 (2, 'Advance_Notice'        , 1),
 (4, 'Hold_Filled'           , 0),
 (5, 'Item_Check_in'         , 0),
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 02:43:58 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 12:43:58 +1200
Subject: [Koha-patches] [PATCH] Bug 5995 : MT2892: Fix security issue in CAS
	intranet login
Message-ID: <1305247438-23613-1-git-send-email-chrisc@catalyst.net.nz>

From: Matthias Meusburger 

Users could log in intranet using their cardnumber, with superlibrarian
rights.

Signed-off-by: Chris Cormack 
---
 C4/Auth.pm |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index a31161e..b416449 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -736,7 +736,9 @@ sub checkauth {
 		    $userid = $retuserid;
 		    $info{'invalidCasLogin'} = 1 unless ($return);
         	} else {
-		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
+		    my $retuserid;
+		    ( $return, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
+		    $userid = $retuserid if ($retuserid ne '');
 		}
 		if ($return) {
                _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
@@ -762,20 +764,21 @@ sub checkauth {
                 	";
                 	my $sth = $dbh->prepare("$select where userid=?");
                 	$sth->execute($userid);
-					unless ($sth->rows) {
-                		$debug and print STDERR "AUTH_1: no rows for userid='$userid'\n";
-						$sth = $dbh->prepare("$select where cardnumber=?");
-                   		$sth->execute($cardnumber);
-						unless ($sth->rows) {
-                			$debug and print STDERR "AUTH_2a: no rows for cardnumber='$cardnumber'\n";
-                    		$sth->execute($userid);
-							unless ($sth->rows) {
-                				$debug and print STDERR "AUTH_2b: no rows for userid='$userid' AS cardnumber\n";
-							}
-						}
-					}
+			unless ($sth->rows) {
+		    	    $debug and print STDERR "AUTH_1: no rows for userid='$userid'\n";
+		    	    $sth = $dbh->prepare("$select where cardnumber=?");
+		       	    $sth->execute($cardnumber);
+
+		    	    unless ($sth->rows) {
+				$debug and print STDERR "AUTH_2a: no rows for cardnumber='$cardnumber'\n";
+				$sth->execute($userid);
+				unless ($sth->rows) {
+				    $debug and print STDERR "AUTH_2b: no rows for userid='$userid' AS cardnumber\n";
+				}
+			    }
+			}
                 	if ($sth->rows) {
-                    	($borrowernumber, $firstname, $surname, $userflags,
+			    ($borrowernumber, $firstname, $surname, $userflags,
                     		$branchcode, $branchname, $branchprinter, $emailaddress) = $sth->fetchrow;
 						$debug and print STDERR "AUTH_3 results: " .
 							"$cardnumber,$borrowernumber,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress\n";
@@ -1413,7 +1416,7 @@ sub checkpw {
 
             C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
-            return 1, $cardnumber;
+            return 1, $userid;
         }
     }
     $sth =
@@ -1577,7 +1580,7 @@ sub haspermission {
     my ($userid, $flagsrequired) = @_;
     my $sth = C4::Context->dbh->prepare("SELECT flags FROM borrowers WHERE userid=?");
     $sth->execute($userid);
-    my $flags = getuserflags( $sth->fetchrow(), $userid );
+    my $flags = getuserflags($sth->fetchrow(), $userid);
     if ( $userid eq C4::Context->config('user') ) {
         # Super User Account from /etc/koha.conf
         $flags->{'superlibrarian'} = 1;
@@ -1586,7 +1589,9 @@ sub haspermission {
         # Demo user that can do "anything" (demo=1 in /etc/koha.conf)
         $flags->{'superlibrarian'} = 1;
     }
+
     return $flags if $flags->{superlibrarian};
+
     foreach my $module ( keys %$flagsrequired ) {
         my $subperm = $flagsrequired->{$module};
         if ($subperm eq '*') {
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 04:03:09 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 14:03:09 +1200
Subject: [Koha-patches] [PATCH] Bug 5860 - Attempted follow up patch to fix
	itemstocknumberindex
Message-ID: <1305252189-26441-1-git-send-email-chrisc@catalyst.net.nz>

---
 installer/data/mysql/updatedatabase.pl |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 52951e7..07bffb5 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4217,7 +4217,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
 $DBversion = '3.03.00.042';
 if (C4::Context->preference("Version") < TransformToNum($DBversion) && $original_version < TransformToNum("3.02.06.001")) {
-    $dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;");
+    my $sth = $dbh->prepare("SELECT index_name FROM information_schema.statistics  WHERE index_name ='itemsstocknumberidx'");
+    $sth->execute();
+    if (my $rows = $sth->fetchrows_hashref()){
+	$dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;");
+    }
+    else {
+    	$dbh->do("ALTER TABLE `items` DROP INDEX `itemstocknumberidx`;");
+    }
     $dbh->do("ALTER TABLE items ADD INDEX itemstocknumberidx (stocknumber);");
     print "Upgrade to $DBversion done (Change items.stocknumber to be not unique)\n";
     SetVersion ($DBversion);
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 04:10:48 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 14:10:48 +1200
Subject: [Koha-patches] [Signed off] [PATCH] Add unit tests to ensure bug
	5683 doesn't reappear
Message-ID: <1305252649-26914-1-git-send-email-chrisc@catalyst.net.nz>

From: Jared Camins-Esakov 

Signed-off-by: Jared Camins-Esakov 
Signed-off-by: Chris Cormack 
---
 t/db_dependent/Biblio.t |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t
index 6012f5f..dd827f0 100755
--- a/t/db_dependent/Biblio.t
+++ b/t/db_dependent/Biblio.t
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 6;
+use Test::More tests => 9;
 use MARC::Record;
 use C4::Biblio;
 
@@ -34,6 +34,40 @@ my $itemdata = &GetBiblioItemData($biblioitemnumber);
 is($itemdata->{title},$title,'First test of GetBiblioItemData to get same result of previous two GetBiblioData tests.');
 is($itemdata->{isbn},$isbn,'Second test checking it returns the correct isbn.');
 
+my $success = 0;
+$field = MARC::Field->new(
+        655, ' ', ' ',
+        'a' => 'Auction catalogs',
+        '9' => '1'
+        );
+eval {
+    $marc_record->append_fields($field);
+    $success = ModBiblio($marc_record,$biblionumber,'');
+} or do {
+    diag($@);
+    $success = 0;
+};
+ok($success, "ModBiblio handles authority-linked 655");
+
+eval {
+    $field->delete_subfields('a');
+    $marc_record->append_fields($field);
+    $success = ModBiblio($marc_record,$biblionumber,'');
+} or do {
+    diag($@);
+    $success = 0;
+};
+ok($success, "ModBiblio handles 655 with authority link but no heading");
+
+eval {
+    $field->delete_subfields('9');
+    $marc_record->append_fields($field);
+    $success = ModBiblio($marc_record,$biblionumber,'');
+} or do {
+    diag($@);
+    $success = 0;
+};
+ok($success, "ModBiblio handles 655 with no subfields");
 
 # clean up after ourselves
 DelBiblio($biblionumber);
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri May 13 04:10:49 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 13 May 2011 14:10:49 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 5683 follow-up: calls to
	ModBiblio can still fail
In-Reply-To: <1305252649-26914-1-git-send-email-chrisc@catalyst.net.nz>
References: <1305252649-26914-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1305252649-26914-2-git-send-email-chrisc@catalyst.net.nz>

From: Jared Camins-Esakov 

Because C4::Charset directly manipulates the MARC::Record object, bad data has
to be cleaned in ModBiblio before the call into C4::Charset. The corrupted
records can also break the Zebra index. After this fix has been applied, it
would probably be a good idea to run the misc/maintenance/touch_all_biblios.pl
script to ensure that this problem has been cleared up.

Signed-off-by: Jared Camins-Esakov 
Signed-off-by: Chris Cormack 
---
 C4/Biblio.pm |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index c9590c2..016b53d 100755
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -299,6 +299,16 @@ sub ModBiblio {
         logaction( "CATALOGUING", "MODIFY", $biblionumber, "BEFORE=>" . $newrecord->as_formatted );
     }
 
+    # Cleaning up invalid fields must be done early or SetUTF8Flag is liable to
+    # throw an exception which probably won't be handled.
+    foreach my $field ($record->fields()) {
+        if (! $field->is_control_field()) {
+            if (scalar($field->subfields()) == 0 || (scalar($field->subfields()) == 1 && $field->subfield('9'))) {
+                $record->delete_field($field);
+            }
+        }
+    }
+
     SetUTF8Flag($record);
     my $dbh = C4::Context->dbh;
 
@@ -306,14 +316,6 @@ sub ModBiblio {
 
     _strip_item_fields($record, $frameworkcode);
 
-    foreach my $field ($record->fields()) {
-        if (! $field->is_control_field()) {
-            if (scalar($field->subfields()) == 0) {
-                $record->delete_fields($field);
-            }
-        }
-    }
-
     # update biblionumber and biblioitemnumber in MARC
     # FIXME - this is assuming a 1 to 1 relationship between
     # biblios and biblioitems
-- 
1.7.4.1


From chris at bigballofwax.co.nz  Fri May 13 09:21:56 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Fri, 13 May 2011 19:21:56 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6320 - Provide language
	filter selection in adv an id inside a div
Message-ID: <1305271316-9328-1-git-send-email-chris@bigballofwax.co.nz>

From: Tomas Cohen Arazi 

Basically, put the language filter selection fieldset inside a  with its
own id so it can be hidden through OPACUserCSS variable.

Signed-off-by: Chris Cormack 
---
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
index 1c9381d..e882bb8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -145,6 +145,7 @@
     

Filter	Date:
	Author:
	Keyword:

Sex	Gender	diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt index 6c4f0c3..cb09184 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt @@ -51,7 +51,7 @@ Card Number:	[% cardnumber %]
DoB:	[% IF ( dateofbirth ) %][% dateofbirth %][% ELSE %] [% END %]
Sex:	[% IF ( sex ) %][% sex %][% ELSE %] [% END %]

[% resultsloo.cardnumber %]	[% resultsloo.surname %], [% resultsloo.firstname %]	[% resultsloo.branchcode %]	,[% resultsloo.borrowernumber %]); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% resultsloo.subscriptionid %]&borrowernumber=[% resultsloo.borrowernumber %]&op=add">Add
Add

" name="order_by" value="" /> ">[% order_b.name %]	+
[% order_b.name %]		[% IF ( loo.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]	[% IF ( loo.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]	[% loo.reservefee %]	[% IF ( loo.messaging_prefs ) %] [% IF ( messaging_preference.Item_Due ) %]Item Due -- 1.7.2.3 From magnus at enger.priv.no Sat May 28 23:09:55 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Sat, 28 May 2011 23:09:55 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 3397 - Deleting item record leaves a hole in patron's reading history Message-ID: <1306616995-3183-1-git-send-email-magnus@enger.priv.no> From: Owen Leonard Excluding entries in old_issues which have a NULL itemnumber Signed-off-by: Magnus Enger --- C4/Members.pm \| 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index e03b40b..3185686 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -1115,7 +1115,7 @@ sub GetAllIssues { LEFT JOIN items on items.itemnumber=old_issues.itemnumber LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber - WHERE borrowernumber=? + WHERE borrowernumber=? AND old_issues.itemnumber IS NOT NULL order by $order"; if ( $limit != 0 ) { $query .= " limit $limit"; -- 1.7.4.1 From magnus at enger.priv.no Sun May 29 00:59:33 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Sun, 29 May 2011 00:59:33 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5714 - Unescaped ampersands in OPAC facets Message-ID: <1306623573-5121-1-git-send-email-magnus@enger.priv.no> From: Owen Leonard In the OPAC the "query_cgi" variable passed to the template outputs a string like this: idx=kw&q=thing The ampersand is unescaped. Adding an "\|html" filter to the variable. Also correcting some TT markup which added a new validation error (an unopened ). Signed-off-by: Magnus Enger --- .../opac-tmpl/prog/en/includes/opac-facets.inc \| 7 ++++--- .../opac-tmpl/prog/en/modules/opac-results.tt \| 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index eac00aa..4931283 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -2,8 +2,9 @@ [% IF ( facets_loop ) %] Refine your search +[% query_cgi %] - Availability [% IF ( available ) %]Showing only available items. Show all items[% ELSE %]Limit to currently available items.[% END %] + Availability [% IF ( available ) %]Showing only available items. Show all items[% ELSE %]Limit to currently available items.[% END %] [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]) [% END %] @@ -18,8 +19,8 @@ [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] [% END %] - [% FOREACH facet IN facets_loo.facets %] [% facet.facet_label_value %] [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %] [% END %][% IF ( facets_loo.expandable ) %] - Show More + [% FOREACH facet IN facets_loo.facets %] [% facet.facet_label_value %] [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %] [% END %][% IF ( facets_loo.expandable ) %] + Show More [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index e08e31b..f371db1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -499,7 +499,7 @@ $(document).ready(function(){ [% ELSIF ( loop.first ) %]Log in to add tags. [% END %] [% END %] - [% IF ( SEARCH_RESULT.TagLoop ) %] + [% IF ( SEARCH_RESULT.TagLoop.size ) %] [% END %] [% END %] [% END %][% END %] -- 1.7.4.1 From Katrin.Fischer.83 at web.de Sun May 29 23:04:34 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Sun, 29 May 2011 23:04:34 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6353: Erroneous prefixes before the singleBranchMode preference removed Message-ID: <1306703074-15317-1-git-send-email-Katrin.Fischer.83@web.de> From: Janusz Kaczmarek Patch resent due to errors in formating in previous e-mail Signed-off-by: Katrin Fischer Checked: - library facet - library limit on advanced search - library shown in item level hold table --- .../opac-tmpl/prog/en/includes/opac-facets.inc \| 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt \| 2 +- .../opac-tmpl/prog/en/modules/opac-results.tt \| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index eac00aa..17eb7fc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -14,7 +14,7 @@ [% IF ( facets_loo.type_label_Topics ) %]Topics[% END %] [% IF ( facets_loo.type_label_Places ) %]Places[% END %] [% IF ( facets_loo.type_label_Series ) %]Series[% END %] -[% UNLESS ( facets_loo.singleBranchMode ) %] +[% UNLESS ( singleBranchMode ) %] [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index 4480338..25e9a3a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -452,7 +452,7 @@	Item Type	Barcode	Home Library	Last Location

Saved Reports

Filter

Example Response

Defining [% IF ( branch ) %]overdue actions for [% branch %][% ELSE %]default overdue actions[% END %]

- [% IF ( BIBLIO_RESULT.print_basket ) %] + [% IF ( print_basket ) %] [% BIBLIO_RESULT.title |html %] [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] @@ -301,7 +301,7 @@ function placeHold () {

Refine your search

System Preferences

Koha Development Team

Contributing Companies

Contributing Companies and Institutions

Refine your search

" value="" /> ">[% total_b.name %]
[% total_b.name %]

" value="" /> ">[% total_b.name %]
[% total_b.name %]

Saved Reports

Filter

No saved reports match your criteria.

There are no saved reports.

Filter

Example Response

Defining [% IF ( branch ) %]overdue actions for [% branch %][% ELSE %]default overdue actions[% END %]

- [% IF ( BIBLIO_RESULT.print_basket ) %] + [% IF ( print_basket ) %] [% BIBLIO_RESULT.title |html %] [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] @@ -301,7 +301,7 @@ function placeHold () {

Refine your search

Refine your search

System Preferences

Koha Development Team

Contributing Companies

Contributing Companies and Institutions

Koha Development Team

Contributing Companies

Contributing Companies and Institutions