Editing (Record Number )

(modified on )

\n";
+      $params->{'letter'}->{'content'}=~s#
#
#g;
       $return .= "$params->{'letter'}->{'content'}\n";
       $return .= "\n
<?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>

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.1


From chrisc at catalyst.net.nz  Thu Mar 31 22:31:04 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 09:31:04 +1300
Subject: [Koha-patches] [PATCH] Bug 6025 : MT2889: Adds a script that
	re-create missing statistics from issues and old_issues tables
Message-ID: <1301603464-27634-1-git-send-email-chrisc@catalyst.net.nz>

From: Matthias Meusburger 

---
 misc/recreateIssueStatistics.pl |   71 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 misc/recreateIssueStatistics.pl

diff --git a/misc/recreateIssueStatistics.pl b/misc/recreateIssueStatistics.pl
new file mode 100644
index 0000000..a87d25b
--- /dev/null
+++ b/misc/recreateIssueStatistics.pl
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+# Copyright Biblibre 2010
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+#
+
+# Re-create statistics from issues and old_issues tables
+# (please note that this is not an accurate process)
+
+# If the issue is still in the issues table, we can re-create issues or renewals
+# If the issue is already in the old_issues table, we can re-create returns
+
+use strict;
+use warnings;
+use C4::Context;
+use C4::Items;
+use Data::Dumper;
+
+my $dbh = C4::Context->dbh;
+
+foreach my $table ('issues', 'old_issues') {
+
+    print "looking for missing statistics from the $table table\n";
+
+    my $query = "SELECT * from $table where itemnumber is not null";
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    while (my $hashref = $sth->fetchrow_hashref) {
+
+	my $ctnquery = "SELECT count(*) as cnt FROM statistics WHERE borrowernumber = ? AND itemnumber = ? AND datetime = ?";
+	my $substh = $dbh->prepare($ctnquery);
+	$substh->execute($hashref->{'borrowernumber'}, $hashref->{'itemnumber'}, $hashref->{'timestamp'});
+	my $count = $substh->fetchrow_hashref->{'cnt'};
+	if ($count == 0) {
+	    my $insert = "INSERT INTO statistics (datetime, branch, value, type, other, itemnumber, itemtype, borrowernumber) 
+				 VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
+	    $substh = $dbh->prepare($insert);
+
+	    my $type = ($table eq 'old_issues') ? 'return' : ($hashref->{'renewals'} ? 'renew' : 'issue') ;
+	    my $item = GetItem($hashref->{'itemnumber'});
+
+	    $substh->execute(
+		$hashref->{'timestamp'},
+		$hashref->{'branchcode'},
+		0,
+		$type,
+		'',
+		$hashref->{'itemnumber'},
+		$item->{'itype'},
+		$hashref->{'borrowernumber'}
+	    );
+	    print "timestamp: $hashref->{'timestamp'} branchcode: $hashref->{'branchcode'} type: $type itemnumber: $hashref->{'itemnumber'} itype: $item->{'itype'} borrowernumber: $hashref->{'borrowernumber'}\n";
+	}
+
+    }
+}
-- 
1.7.1


From chrisc at catalyst.net.nz  Thu Mar 31 22:41:55 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 09:41:55 +1300
Subject: [Koha-patches] [PATCH] Bug 6025 : MT2889,
	follow-up: Adds a script that re-create missing statistics from
	issues and old_issues tables
Message-ID: <1301604115-28145-1-git-send-email-chrisc@catalyst.net.nz>

From: Matthias Meusburger 

---
 misc/recreateIssueStatistics.pl |   93 ++++++++++++++++++++++++++++++++------
 1 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/misc/recreateIssueStatistics.pl b/misc/recreateIssueStatistics.pl
index a87d25b..de74265 100644
--- a/misc/recreateIssueStatistics.pl
+++ b/misc/recreateIssueStatistics.pl
@@ -19,10 +19,6 @@
 #
 
 # Re-create statistics from issues and old_issues tables
-# (please note that this is not an accurate process)
-
-# If the issue is still in the issues table, we can re-create issues or renewals
-# If the issue is already in the old_issues table, we can re-create returns
 
 use strict;
 use warnings;
@@ -32,40 +28,107 @@ use Data::Dumper;
 
 my $dbh = C4::Context->dbh;
 
+# Issues and renewals can be found in both issues and old_issues tables
 foreach my $table ('issues', 'old_issues') {
+    # Getting issues
+    print "looking for missing issues from $table\n";
+    my $query = "SELECT borrowernumber, branchcode, itemnumber, issuedate, renewals, lastreneweddate from $table where itemnumber is not null";
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    # Looking for missing issues
+    while (my $hashref = $sth->fetchrow_hashref) {
+	my $ctnquery = "SELECT count(*) as cnt FROM statistics WHERE borrowernumber = ? AND itemnumber = ? AND DATE(datetime) = ? AND type = 'issue'";
+	my $substh = $dbh->prepare($ctnquery);
+	$substh->execute($hashref->{'borrowernumber'}, $hashref->{'itemnumber'}, $hashref->{'issuedate'});
+	my $count = $substh->fetchrow_hashref->{'cnt'};
+	if ($count == 0) {
+	    # Inserting missing issue
+		my $insert = "INSERT INTO statistics (datetime, branch, value, type, other, itemnumber, itemtype, borrowernumber) 
+				     VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
+		$substh = $dbh->prepare($insert); 
+		my $item = GetItem($hashref->{'itemnumber'});
+
+		$substh->execute(
+		    $hashref->{'issuedate'},
+		    $hashref->{'branchcode'},
+		    0,
+		    'issue',
+		    '',
+		    $hashref->{'itemnumber'},
+		    $item->{'itype'},
+		    $hashref->{'borrowernumber'}
+		);
+		print "date: $hashref->{'issuedate'} branchcode: $hashref->{'branchcode'} type: issue itemnumber: $hashref->{'itemnumber'} itype: $item->{'itype'} borrowernumber: $hashref->{'borrowernumber'}\n";
+	    }
+
+	    # Looking for missing renewals
+	    if ($hashref->{'renewals'} && $hashref->{'renewals'} > 0 ) {
+		# This is the not-so accurate part :
+		# We assume that there are missing renewals, based on the last renewal date
+		# Maybe should this be deactivated by default ?
+		my $ctnquery = "SELECT count(*) as cnt FROM statistics WHERE borrowernumber = ? AND itemnumber = ? AND DATE(datetime) = ? AND type = 'renew'";
+		my $substh = $dbh->prepare($ctnquery);
+		$substh->execute($hashref->{'borrowernumber'}, $hashref->{'itemnumber'}, $hashref->{'lastreneweddate'});
+
+		my $missingrenewalscount = $hashref->{'renewals'} - $substh->fetchrow_hashref->{'cnt'};
+		print "We assume $missingrenewalscount renewals are missing. Creating them\n" if ($missingrenewalscount > 0);
+		for (my $i = 0; $i < $missingrenewalscount; $i++) {
 
-    print "looking for missing statistics from the $table table\n";
+		    # Inserting missing renewals
+		    my $insert = "INSERT INTO statistics (datetime, branch, value, type, other, itemnumber, itemtype, borrowernumber) 
+				     VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
+		    $substh = $dbh->prepare($insert); 
+		    my $item = GetItem($hashref->{'itemnumber'});
 
-    my $query = "SELECT * from $table where itemnumber is not null";
+		    $substh->execute(
+			$hashref->{'lastreneweddate'},
+			$hashref->{'branchcode'},
+			0,
+			'renew',
+			'',
+			$hashref->{'itemnumber'},
+			$item->{'itype'},
+			$hashref->{'borrowernumber'}
+			);
+		    print "date: $hashref->{'lastreneweddate'} branchcode: $hashref->{'branchcode'} type: renew itemnumber: $hashref->{'itemnumber'} itype: $item->{'itype'} borrowernumber: $hashref->{'borrowernumber'}\n";
 
+		}
+
+	    }
+    }
+}
+
+# Getting returns
+print "looking for missing returns from old_issues\n";
+my $query = "SELECT * from old_issues where itemnumber is not null";
     my $sth = $dbh->prepare($query);
     $sth->execute;
+# Looking for missing returns
     while (my $hashref = $sth->fetchrow_hashref) {
-
-	my $ctnquery = "SELECT count(*) as cnt FROM statistics WHERE borrowernumber = ? AND itemnumber = ? AND datetime = ?";
+    my $ctnquery = "SELECT count(*) as cnt FROM statistics WHERE borrowernumber = ? AND itemnumber = ? AND DATE(datetime) = ? AND type = 'return'";
 	my $substh = $dbh->prepare($ctnquery);
-	$substh->execute($hashref->{'borrowernumber'}, $hashref->{'itemnumber'}, $hashref->{'timestamp'});
+    $substh->execute($hashref->{'borrowernumber'}, $hashref->{'itemnumber'}, $hashref->{'returndate'});
 	my $count = $substh->fetchrow_hashref->{'cnt'};
 	if ($count == 0) {
+	# Inserting missing issue
 	    my $insert = "INSERT INTO statistics (datetime, branch, value, type, other, itemnumber, itemtype, borrowernumber) 
 				 VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
 	    $substh = $dbh->prepare($insert);
-
-	    my $type = ($table eq 'old_issues') ? 'return' : ($hashref->{'renewals'} ? 'renew' : 'issue') ;
 	    my $item = GetItem($hashref->{'itemnumber'});
 
 	    $substh->execute(
-		$hashref->{'timestamp'},
+		$hashref->{'returndate'},
 		$hashref->{'branchcode'},
 		0,
-		$type,
+		'return',
 		'',
 		$hashref->{'itemnumber'},
 		$item->{'itype'},
 		$hashref->{'borrowernumber'}
 	    );
-	    print "timestamp: $hashref->{'timestamp'} branchcode: $hashref->{'branchcode'} type: $type itemnumber: $hashref->{'itemnumber'} itype: $item->{'itype'} borrowernumber: $hashref->{'borrowernumber'}\n";
+	    print "date: $hashref->{'returndate'} branchcode: $hashref->{'branchcode'} type: return itemnumber: $hashref->{'itemnumber'} itype: $item->{'itype'} borrowernumber: $hashref->{'borrowernumber'}\n";
 	}
 
     }
-}
+
+
-- 
1.7.1


From chrisc at catalyst.net.nz  Thu Mar 31 22:49:47 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 09:49:47 +1300
Subject: [Koha-patches] [PATCH] Bug 6026 : export.pl : removing useless
	condition
Message-ID: <1301604587-28605-1-git-send-email-chrisc@catalyst.net.nz>

From: Henri-Damien LAURENT 

Some conditions added AND items.biblionumber=biblio/biblionumber
where JOIN USING (biblionumber) already added that.
---
 tools/export.pl |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/export.pl b/tools/export.pl
index 4d23d08..fc0c7be 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -94,28 +94,28 @@ if ($op eq "export") {
         $query .= " AND biblioitems.biblionumber <= ? ";
         push @sql_params, $EndingBiblionumber;    
     }
-    
-    if ( $branch ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND homebranch = ? ";
+
+    if ($branch) {
+        $query .= " AND homebranch = ? ";
         push @sql_params, $branch;
     }
-    
-    if ( $start_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber >= ? ";
+
+    if ($start_callnumber) {
+        $query .= " AND itemcallnumber <= ? ";
         push @sql_params, $start_callnumber;
     }
-    
-    if ( $end_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber <= ? ";
+
+    if ($end_callnumber) {
+        $query .= " AND itemcallnumber >= ? ";
         push @sql_params, $end_callnumber;
     }
-    if ( $start_accession ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND dateaccessioned >= ? ";
-        push @sql_params,$start_accession->output('iso');
+    if ($start_accession) {
+        $query .= " AND dateaccessioned >= ? ";
+        push @sql_params, $start_accession->output('iso');
     }
-    
-    if ( $end_accession ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND dateaccessioned <= ? ";
+
+    if ($end_accession) {
+        $query .= " AND dateaccessioned <= ? ";
         push @sql_params, $end_accession->output('iso');
     }
     
-- 
1.7.1


From chrisc at catalyst.net.nz  Thu Mar 31 23:00:33 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 10:00:33 +1300
Subject: [Koha-patches] [PATCH] Bug 6027 : MT3532: Deletes biblio record
	when there are no more items left for this biblio while batch
	item deleting
Message-ID: <1301605233-29020-1-git-send-email-chrisc@catalyst.net.nz>

From: Matthias Meusburger 

---
 .../prog/en/modules/tools/batchMod-del.tmpl        |    2 +-
 tools/batchMod.pl                                  |   56 +++++++++++--------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index 61e901b..183d330 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -145,7 +145,7 @@ for( x=0; x
 
 
-	 item(s) deleted.
+	 item(s) deleted.
 biblio(s) deleted.
 	
 	
 	     item(s) could not be deleted: 
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index d9a0b76..4947814 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -2,6 +2,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright Biblibre 2010
 #
 # This file is part of Koha.
 #
@@ -76,6 +77,7 @@ my $frameworkcode="";
 my $tagslib = &GetMarcStructure(1,$frameworkcode);
 
 my $deleted_items = 0;     # Numbers of deleted items
+my $deleted_biblios   = 0;    # Numbers of deleted biblios (when they have no more items)
 my $not_deleted_items = 0; # Numbers of items that could not be deleted
 my @not_deleted;           # List of the itemnumbers that could not be deleted
 
@@ -129,31 +131,36 @@ if ($op eq "action") {
 	}
 
 	# For each item
-	my $i = 1; 
-	foreach my $itemnumber(@itemnumbers){
-
-		$job->progress($i) if $runinbackground;
-		my $itemdata=GetItem($itemnumber);
-		if ($input->param("del")){
-			my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'});
-			if ($return == 1) {
-			    $deleted_items++;
-			} else {
-			    $not_deleted_items++;
-			    push @not_deleted, { biblionumber => $itemdata->{'biblionumber'}, itemnumber => $itemdata->{'itemnumber'}, barcode => $itemdata->{'barcode'}, title => $itemdata->{'title'}, $return => 1 };
-			}
-		} else {
-		    if ($something_to_modify) {
-			my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM');
-			my $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8');
-			my $localitem = TransformMarcToKoha( $dbh, $marcitem, "", 'items' );
-			my $localmarcitem=Item2Marc($itemdata);
-			UpdateMarcWith($marcitem,$localmarcitem);
-			eval{my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($localmarcitem,$itemdata->{biblionumber},$itemnumber)};
-		    }
+    	my $i = 1; 
+        foreach my $itemnumber(@itemnumbers){
+
+            $job->progress($i) if $runinbackground;
+            my $itemdata=GetItem($itemnumber);
+            if ($input->param("del")){
+                my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'});
+                if ($return == 1) {
+                    $deleted_items++;
+                } else {
+                    $not_deleted_items++;
+                    push @not_deleted, { biblionumber => $itemdata->{'biblionumber'}, itemnumber => $itemdata->{'itemnumber'}, barcode => $itemdata->{'barcode'}, title => $itemdata->{'title'}, $return => 1 };
+                }
+
+		# If there are no items left, we delete the biblio
+		my $icount = GetItemsCount($itemdata->{'biblionumber'});
+		if ($icount == 0) {
+		    DelBiblio($itemdata->{'biblionumber'});
+		    $deleted_biblios++;
 		}
-		$i++;
-	}
+
+            } else {
+            if ($values_to_modify||$values_to_blank) {
+                my $localmarcitem=Item2Marc($itemdata);
+                UpdateMarcWith($marcitem,$localmarcitem);
+                eval{my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($localmarcitem,$itemdata->{biblionumber},$itemnumber)};
+                }
+            }
+            $i++;
+        }
     }
 }
 #
@@ -401,6 +408,7 @@ if ($op eq "action") {
 
     $template->param(
 	not_deleted_items => $not_deleted_items,
+    deleted_biblios    => $deleted_biblios,
 	deleted_items => $deleted_items,
 	not_deleted_loop => \@not_deleted 
     );
-- 
1.7.1


From dearden at sarsf.org  Thu Mar 31 23:22:26 2011
From: dearden at sarsf.org (Doug Dearden)
Date: Thu, 31 Mar 2011 15:22:26 -0600
Subject: [Koha-patches] [PATCH] Bug 5738 Display 856u As Image
Message-ID: <1301606546-19051-1-git-send-email-dearden@sarsf.org>

Add an option to the OPAC to display the URI that is stored in the 856u field
as an image instead of a text link.  This would be implemented in the OPAC XSLT
style sheets for the Results and Details pages, and would require that the
corresponding OPAC XSLT option be set.

This enhancement is designed to enable the staff to catalog images, then have
them appear on the resulting pages in the OPAC when searching.  Clicking on the
image would open it full size.  If the image option is in use, then the default
link text would be disabled.  Custom text would still appear if entered in the
"URLLinkText" option.

Add system preference "Display856uAsImage" with options of Results page,
Details page, Both Results and Details pages, Neither Results or Details page.

Notes for documentation manager:
There are two system preferences added for this enhancement:
OPACDisplay856uAsImage and Display856uAsImage.  These appear on the OPAC and
Staff Client screens under the System Preferences.

The preference can be set to one of four options:

Both Details and Results pages
Details page only
Neither Details or Results pages
Results page only

In addition to this option being set, the corresponding XSLT option must be
turned on. Also, the corresponding 856q field must have a valid MIME image
extension (e.g., "jpg") or MIME image type (i.e. starting with "image/"), or the
generic indicator "img" entered in the field.

As of 14 March 2011 the UNIMARC xslt display files also require a "0" in the
second indicator location of the 856u field for the links to be activated.  This
is not true for the MARC21 display files.

When all of the requirements are met, an image file will be displayed instead of
the standard link text. Clicking on the image will open it in the same way as
clicking on the link text.

Rebased and three original patches squashed into one on 30 March 2011 by Jared
Camins-Esakov.

Signed-off-by: Jared Camins-Esakov 
Signed-off-by: Doug Dearden 
---
 C4/XSLT.pm                                         |    3 ++-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    2 ++
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 ++
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 ++
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    2 ++
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    2 ++
 ...m_preferences_full_optimal_for_install_only.sql |    2 ++
 ...m_preferences_full_optimal_for_install_only.sql |    2 ++
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    9 +++++++++
 .../en/modules/admin/preferences/staff_client.pref |    9 +++++++++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    5 +++++
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    5 +++++
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   20 +++++++++++---------
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    8 ++++++++
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    5 +++++
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    5 +++++
 17 files changed, 81 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 C4/XSLT.pm
 mode change 100644 => 100755 installer/data/mysql/de-DE/mandatory/sysprefs.sql
 mode change 100644 => 100755 installer/data/mysql/en/mandatory/sysprefs.sql
 mode change 100644 => 100755 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
 mode change 100644 => 100755 installer/data/mysql/it-IT/necessari/sysprefs.sql
 mode change 100644 => 100755 installer/data/mysql/pl-PL/mandatory/sysprefs.sql
 mode change 100644 => 100755 installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
 mode change 100644 => 100755 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
old mode 100644
new mode 100755
index f349376..4345f27
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -131,7 +131,8 @@ sub XSLTParse4Display {
     foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
                               DisplayOPACiconsXSLT URLLinkText viewISBD
                               OPACBaseURL TraceCompleteSubfields
-                              UseAuthoritiesForTracings TraceSubjectSubdivisions / )
+                              UseAuthoritiesForTracings TraceSubjectSubdivisions
+                              Display856uAsImage OPACDisplay856uAsImage / )
     {
         my $sp = C4::Context->preference( $syspref );
         next unless defined($sp);
diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
old mode 100644
new mode 100755
index 2e1069e..f501d15
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -298,3 +298,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
old mode 100644
new mode 100755
index 9f47292..900db81
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -298,3 +298,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
old mode 100644
new mode 100755
index c58f69c..a64d95b
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -300,3 +300,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql
old mode 100644
new mode 100755
index 3c3d3c8..8b9c0bf
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@ -285,3 +285,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
old mode 100644
new mode 100755
index 70ad079..9b66d49
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -297,3 +297,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
old mode 100644
new mode 100755
index 448e617..56e4b8f
--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -352,3 +352,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
old mode 100644
new mode 100755
index f8b1ea0..298966b
--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -377,3 +377,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index f2d6776..cd8bc4e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4166,6 +4166,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = 'XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice')");
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice')");
+    print "Upgrade to $DBversion done (Add 'Display856uAsImage' and 'OPACDisplay856uAsImage' syspref)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
old mode 100644
new mode 100755
index 78573fe..52c262b
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -163,6 +163,15 @@ OPAC:
             - pref: OPACNoResultsFound
               type: textarea
               class: code
+        -
+            - 'Display the URI in the 856u field as an image on: '
+            - pref: OPACDisplay856uAsImage
+              choices:
+                  OFF: "Neither Details or Results pages"
+                  Details: "Details page only"
+                  Results: "Results page only"
+                  Both: "Both Details and Results pages"
+            - 'Note: The corresponding OPACXSLT option must be turned on.'
     Features:
         -
             - pref: opacuserlogin
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
old mode 100644
new mode 100755
index b658954..abde94a
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -74,6 +74,15 @@ Staff Client:
                   yes: Show
                   no: "Don't show"
             - images for authorized values (such as lost statuses and locations) in search results.
+        -
+            - 'Display the URI in the 856u field as an image on: '
+            - pref: Display856uAsImage
+              choices:
+                  OFF: "Neither Details or Results pages"
+                  Details: "Details page only"
+                  Results: "Results page (for future use, Results XSLT not functional at this time)."
+                  Both: "Both Results and Details pages (for future use, Results XSLT not functional at this time)."
+            - 'Note: The corresponding XSLT option must be turned on.'
     Options:
         -
             - pref: viewMARC
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
old mode 100644
new mode 100755
index 9c1862e..49bdfd1
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -23,6 +23,7 @@
         
         
 
+        
         
         
         
@@ -457,8 +458,12 @@
         
         Online Resources: 
         
+                                   
                                    
                                     
+                                    
+                                        100
+                                    
                                     
                                         
                                         y3z
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
old mode 100644
new mode 100755
index bb542bc..fcfe65c
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -15,6 +15,7 @@
 
 
 
+  
   
   
   
@@ -356,11 +357,15 @@
     
       Online Resources: 
       
+        
         
           
             
           
           
+            
+              100
+            
             
               
                 y3z
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 224999c..464f21c 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -26,6 +26,7 @@
     ,complete-subfield
     
     
+    
         
         
         
@@ -511,29 +512,30 @@
             
         
 
+
         
         Online Resources: 
         
+            
             
             
                 _blank
             
             
+            
+                100
+                                                
             
                 
                     y3z
                 
             
-            
-                
-                
-                    
-                
-                
-                    Click here to access online
-                
-                
+            
+                
             
+            
+                Click here to access online
+            
             
             
             
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
old mode 100644
new mode 100755
index 0b53e22..75e60ac
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -23,6 +23,7 @@
     
     
     
+    
         
         
         
@@ -904,9 +905,13 @@
          
 			   Online Access: 
                             
+                            
                             
                                    
                                     
+                                     
+                                        100
+                                    
                                     
                                                                 
                                         y3z                    
@@ -928,6 +933,9 @@
                             
                                    
                                     
+                                    
+                                        100
+                                    
                                     
                                                                 
                                         y3z                    
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
old mode 100644
new mode 100755
index e4e5f67..2832b6b
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -15,6 +15,7 @@
 
 
 
+  
   
   
   
@@ -351,11 +352,15 @@
     
       Online Resources: 
       
+        
         
           
             
           
           
+            
+              100
+            
             
               
                 y3z
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
old mode 100644
new mode 100755
index cfb8823..831724c
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -18,6 +18,7 @@
 
 
 
+  
   
   
   
@@ -76,6 +77,7 @@
     
       
         
+        
           
             
               
@@ -83,6 +85,9 @@
                   
                 
                 
+                  
+                     100
+                  
                   
                                             
                       y3z                    
-- 
1.5.6.5


From chrisc at catalyst.net.nz  Thu Mar 31 23:27:42 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 10:27:42 +1300
Subject: [Koha-patches] [PATCH] Bug 6028 : MT3815: Quickfix for CSV export
	(9999 rows limitation)
Message-ID: <1301606862-30341-1-git-send-email-chrisc@catalyst.net.nz>

From: Matthias Meusburger 

---
 C4/Reports/Guided.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index 7231457..0da7c13 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -432,7 +432,7 @@ sub execute_query ($;$$$) {
         return;
     }
     $offset = 0    unless $offset;
-    $limit  = 9999 unless $limit;
+    $limit  = 999999 unless $limit;
     $debug and print STDERR "execute_query($sql, $offset, $limit)\n";
     if ($sql =~ /;?\W?(UPDATE|DELETE|DROP|INSERT|SHOW|CREATE)\W/i) {
         return (undef, {  sqlerr => $1} );
-- 
1.7.1


From chrisc at catalyst.net.nz  Thu Mar 31 23:56:52 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  1 Apr 2011 10:56:52 +1300
Subject: [Koha-patches] [PATCH] Bug 6029 : Date processinghas to be done on
	all dates
Message-ID: <1301608612-31870-1-git-send-email-chrisc@catalyst.net.nz>

From: Henri-Damien LAURENT 

---
 C4/Letters.pm |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 34e3686..fb956d2 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -523,17 +523,12 @@ sub parseletter {
     # TEMPORARY hack until the expirationdate column is added to reserves
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};
-
-        $values->{'expirationdate'} = C4::Dates->new(
-            sprintf(
-                '%04d-%02d-%02d',
-                Add_Delta_Days( @waitingdate, C4::Context->preference( 'ReservesMaxPickUpDelay' ) )
-            ),
-            'iso'
-        )->output();
+        $values->{'expirationdate'} = Add_Delta_Days( @waitingdate, C4::Context->preference('ReservesMaxPickUpDelay') );
+    }
+    for my $datefield (grep {$_ =~/date/} keys %$values){
+        # Format all date field in order to display date according to system 
+        $values->{$datefield}=C4::Dates->new($values->{$datefield})->output();
     }
-
-
     # and get all fields from the table
     my $columns = C4::Context->dbh->prepare("SHOW COLUMNS FROM $table");
     $columns->execute;
-- 
1.7.1


From gmcharlt at gmail.com  Fri Mar  4 00:24:19 2011
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 3 Mar 2011 18:24:19 -0500
Subject: [PATCH 03/11] [SIGNED-OFF]  bug 5579: fix moving items from bib to another
Message-ID: 

* Must signal both bibs to be reindexed

Signed-off-by: Galen Charlton 
Signed-off-by: Claire Hernandez 
---
 C4/Items.pm |   55 +++++++------------------------------------------------
 1 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 741ea4d..50e3760 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -2021,59 +2021,18 @@ sub MoveItemFromBiblio {
     $sth = $dbh->prepare("UPDATE items SET biblioitemnumber = ?, biblionumber = ? WHERE itemnumber = ? AND biblionumber = ?");
     my $return = $sth->execute($tobiblioitem, $tobiblio, $itemnumber, $frombiblio);
     if ($return == 1) {
-
-	# Getting framework
-	my $frameworkcode = GetFrameworkCode($frombiblio);
-
-	# Getting marc field for itemnumber
-	my ($itemtag, $itemsubfield) = GetMarcFromKohaField('items.itemnumber', $frameworkcode);
-
-	# Getting the record we want to move the item from
-	my $record = GetMarcBiblio($frombiblio);
-
-	# The item we want to move
-	my $item;
-
-	# For each item
-	foreach my $fielditem ($record->field($itemtag)){
-		# If it is the item we want to move
-		if ($fielditem->subfield($itemsubfield) == $itemnumber) {
-		    # We save it
-		    $item = $fielditem;
-		    # Then delete it from the record
-		    $record->delete_field($fielditem) 
-		}
-	}
-
-	# If we found an item (should always true, except in case of database-marcxml inconsistency)
-	if ($item) {
-
+        ModZebra( $tobiblio, "specialUpdate", "biblioserver", undef, undef );
+        ModZebra( $frombiblio, "specialUpdate", "biblioserver", undef, undef );
 	    # Checking if the item we want to move is in an order 
-	    my $order = GetOrderFromItemnumber($itemnumber);
+        my $order = GetOrderFromItemnumber($itemnumber);
 	    if ($order) {
-		# Replacing the biblionumber within the order if necessary
-		$order->{'biblionumber'} = $tobiblio;
+		    # Replacing the biblionumber within the order if necessary
+		    $order->{'biblionumber'} = $tobiblio;
 	        ModOrder($order);
 	    }
-
-	    # Saving the modification
-	    #ModBiblioMarc($record, $frombiblio, $frameworkcode);
-
-	    # Getting the record we want to move the item to
-	    #$record = GetMarcBiblio($tobiblio);
-
-	    # Inserting the previously saved item
-	    #$record->insert_fields_ordered($item);	
-
-	    # Saving the modification
-	    #ModBiblioMarc($record, $tobiblio, $frameworkcode);
-
-	} else {
-	    return undef;
+        return $tobiblio;
 	}
-    } else {
-	return undef;
-    }
+    return;
 }
 
 =head2 DelItemCheck
-- 
1.7.1



From gmcharlt at gmail.com  Fri Mar  4 00:29:32 2011
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 3 Mar 2011 18:29:32 -0500
Subject: [PATCH 04/11] [SIGNED-OFF] bug 5579: correctly signal when to reindex bibs
Message-ID: 

* when item changes
* when new item is added

Signed-off-by: Galen Charlton 
Signed-off-by: Claire Hernandez 
---
 C4/Items.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 50e3760..a866789 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -261,9 +261,9 @@ sub AddItem {
     $item->{'itemnumber'} = $itemnumber;
 
     # create MARC tag representing item and add to bib
-    my $new_item_marc = _marc_from_item_hash($item, $frameworkcode, $unlinked_item_subfields);
-    _add_item_field_to_biblio($new_item_marc, $item->{'biblionumber'}, $frameworkcode );
+    #my $new_item_marc = _marc_from_item_hash($item, $frameworkcode, $unlinked_item_subfields);
     #_add_item_field_to_biblio($new_item_marc, $item->{'biblionumber'}, $frameworkcode );
+    ModZebra( $item->{biblionumber}, "specialUpdate", "biblioserver", undef, undef );
    
     logaction("CATALOGUING", "ADD", $itemnumber, "item") if C4::Context->preference("CataloguingLog");
     
@@ -507,6 +507,7 @@ sub ModItem {
 
     # update biblio MARC XML
     my $whole_item = GetItem($itemnumber) or die "FAILED GetItem($itemnumber)";
+    ModZebra( $whole_item->{biblionumber}, "specialUpdate", "biblioserver", undef, undef );
 
     unless (defined $unlinked_item_subfields) {
         $unlinked_item_subfields = _parse_unlinked_item_subfields_from_xml($whole_item->{'more_subfields_xml'});
@@ -2109,7 +2110,6 @@ sub _koha_modify_item {
         $error.="ERROR in _koha_modify_item $query".$dbh->errstr;
         warn $error;
     }
-    ModZebra( $item->{biblionumber}, "specialUpdate", "biblioserver", undef, undef );
     return ($item->{'itemnumber'},$error);
 }
 
-- 
1.7.1



From gmcharlt at gmail.com  Fri Mar  4 00:41:42 2011
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 3 Mar 2011 18:41:42 -0500
Subject: [PATCH 05/11] [SIGNED-OFF] bug 5579: new routine to embed items in bib
Message-ID: 

Adds a new routine, C4::Biblio::EmbedItemsInMarcBiblio, to
embed the items in the bib record when necessary:

* cataloging/additem.pl
* rebuild_zebra.pl

Signed-off-by: Galen Charlton 
Signed-off-by: Claire Hernandez 
---
 C4/Biblio.pm                          |   33 +++++++++++++++++++++++++++++++++
 cataloguing/additem.pl                |    3 ++-
 misc/migration_tools/rebuild_zebra.pl |   24 +++++++++++-------------
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index d8add8b..4bbe794 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -2,6 +2,7 @@ package C4::Biblio;
 
 # Copyright 2000-2002 Katipo Communications
 # Copyright 2010 BibLibre
+# Copyright 2011 Equinox Software, Inc.
 #
 # This file is part of Koha.
 #
@@ -35,6 +36,7 @@ use C4::ClassSource;
 use C4::Charset;
 require C4::Heading;
 require C4::Serials;
+require C4::Items;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -2564,6 +2566,37 @@ sub GetNoZebraIndexes {
     return %indexes;
 }
 
+=head2 EmbedItemsInMarcBiblio
+
+    EmbedItemsInMarcBiblio($marc, $biblionumber);
+
+Given a MARC::Record object containing a bib record,
+modify it to include the items attached to it as 9XX
+per the bib's MARC framework.
+
+=cut
+
+sub EmbedItemsInMarcBiblio {
+    my ($marc, $biblionumber) = @_;
+
+    my ( $itemtag, $itemsubfield ) = GetMarcFromKohaField('items.itemnumber', GetFrameworkCode($biblionumber));
+    # delete any fields already in the record that use the item tag
+    foreach my $field ( $marc->field($itemtag) ) {
+        $marc->delete_field($field);
+    }
+
+    # ... and embed the current items
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("SELECT itemnumber FROM items WHERE biblionumber = ?");
+    $sth->execute($biblionumber);
+    my @item_fields;
+    while (my ($itemnumber) = $sth->fetchrow_array) {
+        my $item_marc = C4::Items::GetMarcItem($biblionumber, $itemnumber);
+        push @item_fields, $item_marc->field($itemtag);
+    }
+    $marc->insert_fields_ordered(@item_fields);
+}
+
 =head1 INTERNAL FUNCTIONS
 
 =head2 _DelBiblioNoZebra($biblionumber,$record,$server);
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index b2b1192..2c312f5 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -494,13 +494,14 @@ if ($op eq "additem") {
 
 # now, build existiing item list
 my $temp = GetMarcBiblio( $biblionumber );
-my @fields = $temp->fields();
 #my @fields = $record->fields();
 my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
 my @big_array;
 #---- finds where items.itemnumber is stored
 my (  $itemtagfield,   $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", $frameworkcode);
 my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", $frameworkcode);
+C4::Biblio::EmbedItemsInMarcBiblio($temp, $biblionumber);
+my @fields = $temp->fields();
 
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 74c73a1..5be01cf 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -320,26 +320,22 @@ sub export_marc_records_from_sth {
                           ? GetXmlBiblio( $record_number )
                           : GetAuthorityXML( $record_number );
             if ($record_type eq 'biblio'){
-                #CALL  sub ProcessItems
-                my @items=GetItemsInfo($record_number,'intra',30);
+                my @items = GetItemsInfo($record_number, 'intra');
                 if (@items){
-                    my $record=MARC::Record->new;
+                    my $record = MARC::Record->new;
                     my @itemsrecord;
                     foreach my $item (@items){
-                        my $record=Item2Marc($item, $record_number);                        
+                        my $record = Item2Marc($item, $record_number);                        
                         push @itemsrecord, $record->field($itemtag);
-                        #if xml then print itemfield as xml
-                        # and update marcxml
-                        # else push field
                     }
                     $record->insert_fields_ordered(@itemsrecord);
                     my $itemsxml=$record->as_xml_record();
-                    my $searchstring='\n';
-                    my $index=index($itemsxml,'\n',0);
-                    $itemsxml=substr($itemsxml,$index+length($searchstring));
-                    $searchstring='';
-                    $marcxml=substr($marcxml,0,index($marcxml,$searchstring));
-                    $marcxml.=$itemsxml;
+                    my $searchstring = '\n';
+                    my $index = index($itemsxml, '\n', 0);
+                    $itemsxml = substr($itemsxml, $index + length($searchstring));
+                    $searchstring = '';
+                    $marcxml = substr($marcxml, 0, index($marcxml, $searchstring));
+                    $marcxml .= $itemsxml;
                 }
             }
             if ( $marcxml ) {
@@ -469,6 +465,8 @@ sub get_raw_marc_record {
                 return;
             }
         }
+        # ITEM
+        C4::Biblio::EmbedItemsInMarcBiblio($marc, $record_number);
     } else {
         eval { $marc = GetAuthority($record_number); };
         if ($@) {
-- 
1.7.1



From gmcharlt at gmail.com  Fri Mar  4 01:09:35 2011
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 3 Mar 2011 19:09:35 -0500
Subject: [PATCH 06/11] [SIGNED-OFF] bug 5579: reduce processing to log item changes
Message-ID: 

* no need to record full bib MARC when logging
  change to an item record
* IDEA: set up a separate ItemLog syspref

Signed-off-by: Galen Charlton 
Signed-off-by: Claire Hernandez 
---
 C4/Items.pm |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index a866789..672ed95 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -33,6 +33,7 @@ use C4::Branch;
 require C4::Reserves;
 use C4::Charset;
 use C4::Acquisition;
+use Data::Dumper;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -509,15 +510,7 @@ sub ModItem {
     my $whole_item = GetItem($itemnumber) or die "FAILED GetItem($itemnumber)";
     ModZebra( $whole_item->{biblionumber}, "specialUpdate", "biblioserver", undef, undef );
 
-    unless (defined $unlinked_item_subfields) {
-        $unlinked_item_subfields = _parse_unlinked_item_subfields_from_xml($whole_item->{'more_subfields_xml'});
-    }
-    my $new_item_marc = _marc_from_item_hash($whole_item, $frameworkcode, $unlinked_item_subfields) 
-        or die "FAILED _marc_from_item_hash($whole_item, $frameworkcode)";
-    
-    #_replace_item_field_in_biblio($new_item_marc, $biblionumber, $itemnumber, $frameworkcode);
-	($new_item_marc       eq '0') and die "$new_item_marc is '0', not hashref";  # logaction line would crash anyway
-    logaction("CATALOGUING", "MODIFY", $itemnumber, $new_item_marc->as_formatted) if C4::Context->preference("CataloguingLog");
+    logaction("CATALOGUING", "MODIFY", $itemnumber, Dumper($item)) if C4::Context->preference("CataloguingLog");
 }
 
 =head2 ModItemTransfer
-- 
1.7.1





Type of Material	+ +
0 Form of material	-
01-04 Illustrations	(auto-filled from 300)"/>
5- Target Audience	@@ -119,7 +172,7 @@ - + @@ -175,7 +228,7 @@
06- Form of an item	@@ -246,7 +299,7 @@	11- Government Publication	-
13- Festschrift
15 Undefined
15 Undefined
16- Literary form
17- Biography

Patron Category	Item Type	Current Checkouts Allowed	Loan Period (day)	Fine Amount	Fine Charging Interval	Fine Grace period (day)	Suspension in Days (day)	Renewals Allowed (count)	Holds Allowed (count)	Rental Discount (%)
- All - - - -	- All - - - -	- Unlimited - - - -									- &categorycode=&branch=">Delete -
- -	- -										"/>

Due date	Title	Branch	Checked out on	Call no	Borrower	Price
65" style="text-align: right; font-weight:bold;">Totals:		+ + Renewal due date: " /> + /lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> + + + + Forgive fines on return: + + + + + Override Renewal Limit: + + + + +
	- -	+	&type=intra">, by - &itemnumber=#item">	" alt="" />		+ ()		Renewal Failed	0 - - " checked="checked" style="display: none;" /> - - " checked="checked" /> - - " /> - - - - - - - On Hold - - - Not Renewable - - +		+ + / + + + + + + + + + On Hold + Overdue + Not Renewable + -	Checkin Failed	" /> - " checked="checked" style="display: none;" /> +	" name="barcodes[]" value="" /> + ')">On Hold
Previous checkouts
Previous checkouts
109">Previous checkouts
	+		&type=intra">, by - &itemnumber=#item">		+ ()		Renewal Failed	0 - - " checked="checked" style="display: none;" /> - - " checked="checked" /> - - " /> - - - - - - - On Hold - - - Not Renewable - - - +		+ + / + + + + + + + + + On Hold + Overdue + Not Renewable + -	Checkin Failed	" /> - " checked="checked" style="display: none;" /> + +	" name="barcodes[]" value="" onclick="uncheck_sibling(this);" /> + ')">On Hold

Due date	Title	Item Type	Branch	Checked out on	Material
	+	&type=intra">, by - &itemnumber=#item">	" alt="" />	+ ()	">
Previous checkouts
	+ +	&type=intra">, by - &itemnumber=#item">	+ +	+ ()		">

Date	Description of charges	Print

	&itemnumber=">View item		- &accountno=">Reverse + &accountno=&accountlineid=">Reverse	- - &accountno=">Print - - &accountno=">Print - +	+ + &accountno=">Print + + &accountno=">Print +
Total due		Total due

Fines & Charges	Means of payment	Description	Part payment	Account Type	Notify id
+	" value="" /> + - " onChange="payfinechange(this.value,)"> + " value="" /> @@ -60,7 +96,29 @@ " value="" /> " value="" />	+ + + +	+ + " value="" /> +	+ + " name="partpaymentamount" value="" onKeyUp="partpaymentchange(this.value,,)" /> +
Sub Total					Sub Total
Total Due					Total Due

Editing (Record Number )

006 Fixed-length data elements--Additional material characteristics--General information

008 Fixed-length data elements--General information

006 Fixed-length data elements--Additional material characteristics--General information

008 Fixed-length data elements--General information

006 Fixed-length data elements--Additional material characteristics--General information

""

008 Fixed-length data elements--General information

""

006 Fixed-length data elements--Additional material characteristics--General information

""

008 Fixed-length data elements--General information

""

Patron has outstanding fines of .

Cannot Check In

ISBD View

MARC View

(Record no. )

(Record no. )

by ">

+

a @@ -182,13 +182,6 @@

Refine your search

Refine your search

Suggestion information

Default checkout and hold policy for all libraries

Checkout limit by patron category for all libraries

Holds policy by item type for all libraries

- Cannot check out! - Attention:

Cannot Check Out! + Attention:

Holds waiting:

Relatives issues

Default checkout and hold policy for all libraries

Checkout limit by patron category for all libraries

Holds policy by item type for all libraries

- Cannot check out! - Attention:

Cannot Check Out! + Attention:

Holds waiting:

Relatives issues

Hold Found: ">

Notes:

Hold for:

Transfer to:

Hold at

Offline Circulation

Offline Circulation

Top Lists

Reserves statistics

Default checkout and hold policy for all libraries

Checkout limit by patron category for all libraries

Holds policy by item type for all libraries

- Cannot check out! - Attention:

Cannot Check Out! + Attention:

Holds waiting:

Relatives issues

Saved Reports

Saved Reports

Saved Reports

Saved Reports

Global System Preferences

Basic Parameters

Patrons and Circulation

Catalog

Additional Parameters

Budgets

Add a budget

Add a budget

Funds

Add a Fund

MARC tag structure administration

MARC Record Subfields

Authority Record Tags

Authorized values management

Authorized Values

Why would I want to define authorized values for MARC tags?

Existing Values

- Edit authorized values

- Add a new Authorized Value Category

Add new Authorized Value Category

Add new Authorized Value

Setting Limits
-

Add a new Library/Branch
-