From pianohacker at gmail.com  Wed Jun  1 02:11:55 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Tue, 31 May 2011 18:11:55 -0600
Subject: [Koha-patches] [PATCH] Bug 5918 : Use the default messaging
	preferences if the user does not select any
Message-ID: <1306887115-10076-1-git-send-email-pianohacker@gmail.com>

From: Chris Cormack <chrisc at catalyst.net.nz>

Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
---
 C4/Form/MessagingPreferences.pm                    |   21 +++++++++++++------
 .../prog/en/modules/members/memberentrygen.tt      |    3 ++
 members/memberentry.pl                             |    9 +++++--
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm
index 808719f..4bc742d 100644
--- a/C4/Form/MessagingPreferences.pm
+++ b/C4/Form/MessagingPreferences.pm
@@ -54,7 +54,7 @@ the same thing in staff and OPAC.
 
 =head2 handle_form_action
 
-    C4::Form::MessagingPreferences::handle_form_action($input, { categorycode => 'CPL' }, $template);
+    C4::Form::MessagingPreferences::handle_form_action($input, { categorycode => 'CPL' }, $template, $insert);
 
 Processes CGI parameters and updates the target patron or patron category's
 preferences.
@@ -64,17 +64,16 @@ C<$input> is the CGI query object.
 C<$target_params> is a hashref containing either a C<categorycode> key or a C<borrowernumber> key 
 identifying the patron or patron category whose messaging preferences are to be updated.
 
-C<$template> is the HTML::Template::Pro object for the response; this routine
+C<$template> is the Template::Toolkit object for the response; this routine
 adds a settings_updated template variable.
 
 =cut
 
 sub handle_form_action {
-    my ($query, $target_params, $template) = @_;
+    my ($query, $target_params, $template, $insert, $categorycode) = @_;
     my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
-
     # TODO: If a "NONE" box and another are checked somehow (javascript failed), we should pay attention to the "NONE" box
-    
+    my $prefs_set = 0;
     OPTION: foreach my $option ( @$messaging_options ) {
         my $updater = { %{ $target_params }, 
                         message_attribute_id    => $option->{'message_attribute_id'} };
@@ -96,8 +95,16 @@ sub handle_form_action {
         }
 
         C4::Members::Messaging::SetMessagingPreference( $updater );
-    }
 
+	if ($query->param( $option->{'message_attribute_id'})){
+	    $prefs_set = 1;
+	}
+    }
+    if (! $prefs_set && $insert){
+        # this is new borrower, and we have no preferences set, use the defaults
+	$target_params->{categorycode} = $categorycode;
+        C4::Members::Messaging::SetMessagingPreferencesFromDefaults( $target_params );
+    }
     # show the success message
     $template->param( settings_updated => 1 );
 }
@@ -112,7 +119,7 @@ and fills the corresponding template variables.
 C<$target_params> is a hashref containing either a C<categorycode> key or a C<borrowernumber> key 
 identifying the patron or patron category.
 
-C<$template> is the HTML::Template::Pro object for the response.
+C<$template> is the Template::Toolkit object for the response.
 
 =cut
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index a4361cd..3c2db31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1072,6 +1072,9 @@
     [% END %]
     <input type="hidden" name="setting_messaging_prefs" value="1" />
     <legend>Patron messaging preferences</legend>
+    [% IF type_only %]
+        <i>If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved</i>
+    [% END %]
     [% INCLUDE 'messaging-preference-form.inc' %]
     [% IF ( SMSSendDriver ) %]
         <p><label for="SMSnumber">SMS number:</label> 
diff --git a/members/memberentry.pl b/members/memberentry.pl
index a8e764c..61c3c2c 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -105,14 +105,17 @@ $template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
 $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
 ( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
 my $categorycode  = $input->param('categorycode') || $borrower_data->{'categorycode'};
-my $category_type = $input->param('category_type');
+my $category_type = $input->param('category_type') || '';
+if ($category_type){
+    $template->{VARS}->{'type_only'} = 1;
+}
 my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type.
 unless ($category_type or !($categorycode)){
     my $borrowercategory = GetBorrowercategory($categorycode);
     $category_type    = $borrowercategory->{'category_type'};
     my $category_name = $borrowercategory->{'description'}; 
     $template->param("categoryname"=>$category_name);
-}
+ }
 $category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
 
 # if a add or modify is requested => check validity of data.
@@ -334,7 +337,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
             C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
         }
         if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) {
-            C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template);
+            C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template, 1, $newdata{'categorycode'});
         }
 	} elsif ($op eq 'save'){ 
 		if ($NoUpdateLogin) {
-- 
1.7.4.1


From Katrin.Fischer.83 at web.de  Wed Jun  1 07:32:50 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Wed,  1 Jun 2011 07:32:50 +0200
Subject: [Koha-patches] =?utf-8?b?W1BBVENIXSBbU0lHTkVELU9GRl0gKGJ1ZyAjMzky?=
	=?utf-8?q?4_MT2500=29_fix_useDaysMode_use?=
Message-ID: <1306906370-1482-1-git-send-email-Katrin.Fischer.83@web.de>

From: Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>

This fix system preference choices, and delete some useless code.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fix is for fr-FR sql file. All other langages correctly include all 3
possible options for useDaysMode.
The patch also includes a database update.
---
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    4 ++--
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 kohaversion.pl                                     |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

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
index 185c74b..205281c 100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -120,7 +120,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('timeout', '30600', 'Ce param?tre d?finit la dur?e d''inactivit? au del? de laquelle l''utilisateur (professionnel ou opac) est automatiquement d?connect?', '', 'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransfersMaxDaysWarning', '3', 'D?lai maximum au del? duquel un transfert sera consid?r? comme ayant rencontr? un probl?me', '', 'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('uppercasesurnames', '0', 'Force les noms de famille ? ?tre en majuscule', NULL, 'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode', 'Calendar', 'Comment calculer les dates de retour : ''Calendar'' signifie que les dates de retour sauteront les jours ferm?s. ''Days'' ignore le calendrier', 'Calendar|Days', 'Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode', 'Calendar', 'Comment calculer les dates de retour : ''Calendar'' signifie que les dates de retour sauteront les jours ferm?s. ''Days'' ignore le calendrier', 'Calendar|Days|Datedue', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('virtualshelves', '1', 'Si ce param?tre est activ?, les adh?rents (identifi?s) peuvent cr?er des ?tag?res virtuelles', '', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950AuthorAuthFields', '701,702,700', 'Ce param?tre permet de remplir automatiquement le champ 200$f (s''il est vide) avec le champ 700$a. Utile pour l''affichage, mais pas vraiment rigoureux du point de vue de la norme UNIMARC.', '', '');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950NormalizeAuthor', '0', 'Si activ?, les autorit?s auteur servent ? remplir le champ 200$f s''il est vide (param?tre sp?cifique ? l''UNIMARC', NULL, NULL);
@@ -312,4 +312,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 52951e7..17074f4 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4332,6 +4332,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+	$dbh->do("UPDATE systempreferences SET options = 'Calendar|Days|Datedue' WHERE variable = 'useDaysMode'");
+	
+    print "Upgrade to $DBversion done (upgrade useDaysMode syspref)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/kohaversion.pl b/kohaversion.pl
index c3b86a9..a780d8e 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.05.00.001';
+    our $VERSION = '3.05.00.XXX';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
-- 
1.7.4.1


From fridolyn.somers at progilone.fr  Wed Jun  1 10:44:05 2011
From: fridolyn.somers at progilone.fr (Fridolyn SOMERS)
Date: Wed,  1 Jun 2011 10:44:05 +0200
Subject: [Koha-patches] [PATCH] BUG4319 waiting items cannot be reserved
Message-ID: <1306917845-5761-1-git-send-email-fridolyn.somers@progilone.fr>

---
 C4/Search.pm |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index ab7cb59..c3cff65 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1671,7 +1671,7 @@ sub searchResults {
 		    ($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
                 }
 
-                # item is withdrawn, lost or damaged
+                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
                 if (   $item->{wthdrawn}
                     || $item->{itemlost}
                     || $item->{damaged}
@@ -1686,6 +1686,15 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
+                    
+                    # can place hold on item ?
+                    if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
+                      && !$item->{itemlost}
+                      && !$item->{withdrawn}
+                    ) {
+                        $can_place_holds = 1;
+                    }
+                    
                     $other_count++;
 
                     my $key = $prefix . $item->{status};
-- 
1.7.1


From M.de.Rooy at rijksmuseum.nl  Wed Jun  1 14:07:52 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Wed, 1 Jun 2011 12:07:52 +0000
Subject: [Koha-patches] [PATCH] Bug 4839: Follow-up patch for installing pref
In-Reply-To: <1306929954-14961-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1306929954-14961-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA312D1F17@S-MAIL-1B.rijksmuseum.intra>

Installs syspref MARCAuthorityControlField008.

Rebased June 1, 2011 for master.
---
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    3 ++-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    3 ++-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    1 +
 .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql   |    1 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 ++-
 ...m_preferences_full_optimal_for_install_only.sql |    3 ++-
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 9 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
index c7c885d..b62292d 100755
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -311,4 +311,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index f98b053..a205bfd 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -312,3 +312,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
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
index 185c74b..883bd8a 100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -312,4 +312,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql
index fca0cfb..358ea27 100755
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@ -299,3 +299,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
index b1c6fb5..5ced4cd 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
@@ -320,3 +320,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES (
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
 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 ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index c39e231..a29a837 100755
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -310,4 +310,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
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
index a7c6a10..1f23aaf 100755
--- 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
@@ -365,4 +365,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
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
index f370766..f71ac85 100755
--- 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
@@ -391,3 +391,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 52951e7..28a6ebd 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4332,6 +4332,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }

+$DBversion = "3.05.00.XXX"; #FIXME
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea')");
+    print "Upgrade to $DBversion done (Add syspref MARCAuthorityControlField008)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS

 =head2 DropAllForeignKeys($table)
--
1.6.0.6

From oleonard at myacpl.org  Wed Jun  1 15:10:00 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  1 Jun 2011 09:10:00 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BUG4319 waiting items cannot be
	reserved
Message-ID: <1306933800-31420-1-git-send-email-oleonard@myacpl.org>

From: Fridolyn SOMERS <fridolyn.somers at progilone.fr>


Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 C4/Search.pm |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index ab7cb59..c3cff65 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1671,7 +1671,7 @@ sub searchResults {
 		    ($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
                 }
 
-                # item is withdrawn, lost or damaged
+                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
                 if (   $item->{wthdrawn}
                     || $item->{itemlost}
                     || $item->{damaged}
@@ -1686,6 +1686,15 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
+                    
+                    # can place hold on item ?
+                    if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
+                      && !$item->{itemlost}
+                      && !$item->{withdrawn}
+                    ) {
+                        $can_place_holds = 1;
+                    }
+                    
                     $other_count++;
 
                     my $key = $prefix . $item->{status};
-- 
1.7.3


From nengard at bywatersolutions.com  Wed Jun  1 06:08:50 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed,  1 Jun 2011 00:08:50 -0400
Subject: [Koha-patches] [PATCH] bug 6442 change opacnav wording so it's more
	accurate
Message-ID: <1306901330-2028-1-git-send-email-nengard@bywatersolutions.com>


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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
index 7f92cd6..71c9426 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -138,7 +138,7 @@ OPAC:
               type: textarea
               class: code
         -
-            - "Show the following HTML on the left hand column of all pages on the OPAC (generally navigation links):"
+            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
             - pref: OpacNav
               type: textarea
               class: code
-- 
1.7.2.3


From oleonard at myacpl.org  Wed Jun  1 15:39:11 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  1 Jun 2011 09:39:11 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6437: Added div with id
	yui-main around advsearch form
Message-ID: <1306935551-31799-1-git-send-email-oleonard@myacpl.org>

From: Elliott Davis <tdavis at uttyler.edu>

Testing: Make sure div shows up directly above form

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |    4 ++--
 1 files changed, 2 insertions(+), 2 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 e882bb8..216ce8e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -6,7 +6,7 @@
 <body id="advsearch"><div id="doc3" class="yui-t7">
 <div id="bd">
 [% INCLUDE 'masthead.inc' %]
-
+<div id="yui-main">
 <form action="/cgi-bin/koha/opac-search.pl" method="get">
     <div class="yui-g">
 [% IF ( if_expanded_options_actually_worked ) %]
@@ -286,7 +286,7 @@
 
 <!-- /SEARCH BUTTONS --></div></div>
 </form>
-
+</div>
 <script type="text/javascript" language="javascript">
     /* This function allows to display a new field to search.
     */
-- 
1.7.3


From f.demians at tamil.fr  Wed Jun  1 21:37:32 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed,  1 Jun 2011 21:37:32 +0200
Subject: [Koha-patches] [PATCH] [3.4] Bug 6444 Corrects encoding problems in
	subscription-add.pl
Message-ID: <1306957053-28253-1-git-send-email-f.demians@tamil.fr>

From: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>

When searching for a vendor, if the vendor has accented character in its
name, the vendor's name that's added in the form of subscription-add.pl
is encoded incorrectly.

[2011.06.01] F. Demians. Port it to 3.4
---
 .../prog/en/modules/serials/acqui-search-result.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
index b92aafb..2a29f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
@@ -6,7 +6,7 @@
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = unescape(name);
+  opener.document.f.aqbooksellername.value = name;
   window.close();
 }
 </script>
@@ -33,7 +33,7 @@ function GetIt(aqbooksellerid,name)
         <tr>
         [% END %]
 			<td>[% loop_supplier.name %]</td>
-			<td><a href="#" onclick="GetIt([% loop_supplier.aqbooksellerid %],'[% loop_supplier.name |url %]')">Choose</a></td>
+			<td><a href="#" onclick="GetIt([% loop_supplier.aqbooksellerid %],$(this).parent().prev().text())">Choose</a></td>
 		</tr>
 	[% END %]
 </table>
-- 
1.7.5.1


From f.demians at tamil.fr  Wed Jun  1 21:37:33 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed,  1 Jun 2011 21:37:33 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] [3.2] Bug 6444 Corrects
	encoding problems in subscription-add.pl
In-Reply-To: <1306957053-28253-1-git-send-email-f.demians@tamil.fr>
References: <1306957053-28253-1-git-send-email-f.demians@tamil.fr>
Message-ID: <1306957053-28253-2-git-send-email-f.demians@tamil.fr>

From: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>

When searching for a vendor, if the vendor has accented character in its name,
the vendor's name that's added in the form of subscription-add.pl is encoded
incorrectly.

[2011.06.01] F. Demians. I confirm the bug and the solution

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../en/modules/serials/acqui-search-result.tmpl    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index f5a1577..689d307 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -6,7 +6,7 @@
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = unescape(name);
+  opener.document.f.aqbooksellername.value = name;
   window.close();
 }
 </script>
@@ -33,7 +33,7 @@ function GetIt(aqbooksellerid,name)
         <tr>
         <!-- /TMPL_UNLESS -->
 			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Choose</a></td>
+			<td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,$(this).parent().prev().text())">Choose</a></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
-- 
1.7.5.1


From srdjan at catalyst.net.nz  Thu Jun  2 04:29:14 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  2 Jun 2011 14:29:14 +1200
Subject: [Koha-patches] [PATCH] bug_6190: BorrowerUnwantedField syspref and
	removing fields from the patron entry
In-Reply-To: <bug 6190>
References: <bug 6190>
Message-ID: <1306981754-20337-1-git-send-email-srdjan@catalyst.net.nz>

---
 admin/systempreferences.pl                         |    1 +
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    3 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    3 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    1 +
 .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql   |   18 +++-
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../prog/en/modules/admin/preferences/patrons.pref |    5 +
 .../prog/en/modules/help/members/memberentry.tt    |    1 +
 .../prog/en/modules/members/memberentrygen.tt      |  111 +++++++++++++++++++-
 members/memberentry.pl                             |    7 ++
 xt/syspref.t                                       |    1 +
 15 files changed, 157 insertions(+), 9 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 87ecac4..39a81e6 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -223,6 +223,7 @@ $tabsysprefs{intranetreadinghistory}       = "Patrons";
 $tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
 $tabsysprefs{memberofinstitution}          = "Patrons";
 $tabsysprefs{BorrowerMandatoryField}       = "Patrons";
+$tabsysprefs{BorrowerUnwantedField}        = "Patrons";
 $tabsysprefs{borrowerRelationship}         = "Patrons";
 $tabsysprefs{BorrowersTitles}              = "Patrons";
 $tabsysprefs{patronimages}                 = "Patrons";
diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
index c7c885d..59c2972 100755
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -20,6 +20,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','Vater|Mutter','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
@@ -311,4 +312,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index f98b053..139ba38 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -20,6 +20,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
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
index 185c74b..df52093 100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -19,6 +19,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutomaticItemReturn', '1', 'Ce param??tre permet de faire les retours vers le site propri??taire automatiquement', '', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum', '1', 'Si ce param??tre est activ??, le num??ro des adh??rents est automatiquement calcul??. Ne sera pas activ?? si vous avez des cartes pr??-imprim??es.', '', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField', '', 'Liste les champs obligatoires dans la grille de saisie des adh??rents (s??par??s par | ou ,)', 'cardnumber|surname|address', 'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship', '', 'Liste les relations entre les garants et leurs garantis (separ??es par | ou ,)', 'P??re|M??re|grand-parent|Tuteur l??gal|Autre\r\n', 'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog', '0', 'Activer ce param??tre pour enregistrer les actions sur les lecteurs', '', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersTitles', '', 'Liste les titres de politesse (s??par??s par | ou ,)', 'M|Mme|Mlle', 'free');
@@ -312,4 +313,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql
index fca0cfb..acf995d 100755
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@ -35,6 +35,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`,
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BiblioAddsAuthorities','1','','Se ON, aggiungendo un nuovo record bibliografico il sistema controlla se ci sono i  records di authority corrispondenti per i campi collegati con l???authority. Se non ci sono, gli equivalenti rcords di autority sono creati al volo.','YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BiblioDefaultView','normal','normal|marc|isbd','Per scegliere la visualizzazione di default della scheda dettagliata  nel catalogo; scegliere tra normal, marc o isbd.','Choice');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowerMandatoryField','city|surname|cardnumber','','Per decidere quali campi sono obbligatori nell\'account di un utente.','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('borrowerRelationship','father|mother','','Definisce la relazione valida tra garante e garanzia (separali  con | o ,)','free');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowersLog','0','','Se ON, logga le azioni di modifica/creazione/cancellazione sui dati utente.','YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowersTitles','Sig|Sig.ra|Sig.na','','Definisce i titoli appropriati per gli utenti','free');
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
index b1c6fb5..975a3e4 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
@@ -41,6 +41,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','far|mor','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
@@ -48,6 +49,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casServerUrl', 'https://localhost:8443/cas', 'URL of the cas server', '', 'Free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('checkdigit','none','If ON, enable checks on patron cardnumber: none or \"Katipo\" style checks','none|katipo','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('COinSinOPACResults', 1, 'If ON, use COinS in OPAC search results page.  NOTE: this can slow down search response time significantly','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
@@ -55,6 +57,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice');
@@ -118,6 +121,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnBeforeExpiry',0,'If ON, checkout will be prevented if returndate is after patron card expiry',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnLog',1,'If ON, enables the circulation (returns) log',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('reviewson',1,'If ON, enables patron reviews of bibliographic records in the OPAC','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewer',1,'If ON, name of reviewer will be shown above comments in OPAC','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SpecifyDueDate',1,'Define whether to display \"Specify Due Date\" form in Circulation','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionHistory','simplified','Define the display preference for serials issue history in OPAC','simplified|full','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionLog',1,'If ON, enables subscriptions log',NULL,'YesNo');
@@ -126,6 +130,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('timeout',12000000,'Inactivity timeout for cookies authentication (in seconds)',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransfersMaxDaysWarning',3,'Define the days before a transfer is suspected of having a problem',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode','Calendar','Choose the method for calculating due date: select Calendar to use the holidays module, and Days to ignore the holidays module','Calendar|Days|Datedue','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseControlNumber',0,'If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('virtualshelves',1,'If ON, enables Lists management','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950AuthorAuthFields','701,702,700','Define the MARC biblio fields for Personal Name Authorities to fill biblio.author',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950NormalizeAuthor',0,'If ON, Personal Name Authorities will replace authors in biblio.author','','YesNo');
@@ -159,6 +164,9 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 -- need AddressType to distinguish between US and other, telephone numbers, maori stuff, sex, nationality, etc.
 -- LDAP ? required fields?
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WebBasedSelfCheck',0,'If ON, enables the web-based self-check system',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SelfCheckTimeout',120,'Define the number of seconds before the Web-based Self Checkout times out a patron','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AllowSelfCheckReturns',0,'If enabled, patrons may return items through the Web-based Self Checkout','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SelfCheckHelpMessage','','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchResults',20,'Specify the maximum number of results to display on a page of results',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACnumSearchResults',20,'Specify the maximum number of results to display on a page of results',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('defaultSortField',NULL,'Specify the default field used for sorting','relevance|popularity|call_number|pubdate|acqdate|title|author','Choice');
@@ -172,8 +180,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('emailLibrarianWhenHoldIsPlaced',0,'If ON, emails the librarian whenever a hold is placed',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numReturnedItemsToShow','20','Number of returned items to show on the check-in page',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines).  Requires accruefines cronjob.','off|test|production','Choice');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts','10','free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ceilingDueDate','','If set, date due will not be past this date.  Enter date according to the dateformat System Preference',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat|libsuite8','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free');
@@ -285,6 +291,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo');
 INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','<li><a  href="http://worldcat.org/search?q={TITLE}" target="_blank">Andre bibliotek (WorldCat)</a></li>\n<li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Andre databaser (Google Scholar)</a></li>\n<li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Nettbutikker (Bookfinder.com)</a></li>','Skriv inn HTML som vil vises i \'Flere s??k\'-menyen i detaljvisningen i OPACen.  Bruk {TITLE}, {AUTHOR} eller {ISBN} som variabler i URLer. La feltet v??re tomt for ?? skru av \'Flere s??k\'-menyen.','70|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');
 INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo');
@@ -320,3 +327,10 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES (
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
 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');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index c39e231..5b658eb 100755
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -20,6 +20,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
@@ -310,4 +311,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
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
index a7c6a10..735b9ca 100755
--- 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
@@ -35,6 +35,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo');
@@ -365,4 +366,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
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
index f370766..7a33660 100755
--- 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
@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 52951e7..b31c4d0 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4332,6 +4332,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free')");
+    print "Upgrade to $DBversion done (BorrowerUnwantedField syspref)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index ac3e1d2..6bfa0df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -32,6 +32,11 @@ Patrons:
            class: multi
          - (separate columns with |)
      -
+         - "The following database columns will not appear on the patron entry screen:"
+         - pref: BorrowerUnwantedField
+           class: multi
+         - (separate columns with |)
+     -
          - "Guarantors can be the following of those they guarantee:"
          - pref: borrowerRelationship
            class: multi
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
index b832f4c..9dcaf60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
@@ -22,6 +22,7 @@
 	<li>Enter the identifying information regarding your patron
 <ul>
 	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
+	<li>Unwanted fields are defined in the BorrowerUnwantedField system preference</li>
 	<li>Salutation is populated by the BorrowersTitles system preference</li>
 </ul>
 </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 3c2db31..e3feee3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -169,6 +169,7 @@
 		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
 		<ol>
 		[% UNLESS ( I ) %]
+        [% UNLESS notitle %]
 		[% IF ( title_cgipopup ) %]
             <li>
             [% IF ( mandatorytitle ) %]
@@ -182,6 +183,8 @@
             </li>
 		[% END %]
         [% END %]
+		[% END %]
+        [% UNLESS nosurname %]
 		<li>
 		[% IF ( mandatorysurname ) %]
 		<label for="surname" class="required">
@@ -196,7 +199,9 @@
 		[% END %]
 		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
 		</li>
+        [% END %]
 		[% UNLESS ( I ) %]
+        [% UNLESS nofirstname %]
             <li>
                 [% IF ( mandatoryfirstname ) %]
                 <label for="firstname" class="required">
@@ -207,6 +212,8 @@
                 <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
                 [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
             </li>
+        [% END %]
+        [% UNLESS nodateofbirth %]
             <li>
                 [% IF ( mandatorydateofbirth ) %]
                 <label for="dateofbirth" class="required">
@@ -235,6 +242,8 @@
         [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
             </li>
+        [% END %]
+        [% UNLESS noinitials %]
             <li>
                 [% IF ( mandatoryinitials ) %]
                     <label for="initials" class="required">
@@ -246,6 +255,8 @@
                 [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
+        [% END %]
+        [% UNLESS noothernames %]
 		<li>
 			[% IF ( mandatoryothernames ) %]
 			<label for="othernames" class="required">
@@ -257,7 +268,9 @@
 [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
 		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
 		</li>
+        [% END %]
     [% UNLESS ( I ) %]
+        [% UNLESS nosex %]
 		<li class="radio">
 		
 		[% IF ( female ) %]
@@ -276,6 +289,7 @@
 				<label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
 [% END %]
        	</li>
+        [% END %]
     [% END %]
 		</ol>
 	</fieldset>
@@ -310,6 +324,7 @@
  [% END %]
      <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
  </li>
+        [% UNLESS nocontactname %]
  <li>
      <label for="contactname">Surname: </label>
      [% IF ( guarantorid ) %]
@@ -319,6 +334,8 @@
      <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
      [% END %]
  </li>
+        [% END %]
+        [% UNLESS nocontactfirstname %]
  <li>
      <label for="contactfirstname">First name: </label>
      [% IF ( guarantorid ) %]
@@ -328,6 +345,7 @@
      <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
      [% END %]
  </li>
+        [% END %]
  [% IF ( relshiploop ) %]
  <li>
      <label for="relationship">Relationship: </label>
@@ -357,8 +375,10 @@
     </fieldset>
 
 [% END %]
+[% UNLESS noaddress && nocity && nostate %]
 <fieldset class="rows">
     <legend>Main address</legend><ol>
+        [% UNLESS nostreetnumber %]
     <li>
       [% IF ( mandatorystreetnumber ) %]
       <label for="streetnumber" class="required">
@@ -369,6 +389,8 @@
       <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS nostreettype %]
     [% IF ( road_cgipopup ) %]
       <li>
       [% IF ( mandatorystreettype ) %]
@@ -381,6 +403,8 @@
 	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
       </li>
     [% END %] 
+        [% END %]
+        [% UNLESS noaddress %]
     <li>
       [% IF ( mandatoryaddress ) %]
       <label for="address" class="required">
@@ -391,6 +415,8 @@
       <input type="text" id="address" name="address" size="35" value="[% address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS noaddress2 %]
     <li>
       [% IF ( mandatoryaddress2 ) %]
       <label for="address2" class="required">
@@ -401,6 +427,8 @@
       <input type="text" id="address2" name="address2" size="35" value="[% address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
     </li>  
+        [% END %]
+        [% UNLESS nocity %]
     <li>
       [% IF ( mandatorycity ) %]
         <label for="city" class="required">
@@ -425,6 +453,8 @@
         [% END %]
 	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS nostate %]
     <li> 
       [% IF ( mandatorystate ) %]
         <label for="state" class="required">
@@ -435,6 +465,8 @@
       <input type="text" name="state" id="state" size="20" value="[% state %]" />
 	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS nozipcode %]
     <li> 
       [% IF ( mandatoryzipcode ) %]
         <label for="zipcode" class="required">
@@ -445,7 +477,8 @@
       <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
     </li>
-    
+        [% END %]
+        [% UNLESS nocountry %]
     <li> 
       [% IF ( mandatorycountry ) %]
         <label for="country" class="required">
@@ -456,11 +489,13 @@
       <input type="text" name="country" id="country" size="20" value="[% country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
     </li>    
-  
+        [% END %]
 	</ol>
     </fieldset>
+[% END # nostreet && nocity etc group%]
   <fieldset class="rows" id="memberentry_contact">
     <legend>Contact</legend><ol>
+        [% UNLESS nophone %]
       <li>
       [% IF ( mandatoryphone ) %] 
       <label for="phone" class="required">
@@ -472,6 +507,8 @@
 	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
+        [% END %]
+        [% UNLESS nophonepro %]
     <li>
       [% IF ( mandatoryphonepro ) %]
       <label for="phonepro" class="required">
@@ -482,6 +519,8 @@
       <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS nomobile %]
     <li>
       [% IF ( mandatorymobile ) %]
       <label for="mobile" class="required">
@@ -492,6 +531,8 @@
       <input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS noemail %]
     <li>
       [% IF ( mandatoryemail ) %]
       <label for="email" class="required">
@@ -503,6 +544,8 @@
 	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
+        [% END %]
+        [% UNLESS noemailpro %]
     <li>
       [% IF ( mandatoryemailpro ) %] 
       <label for="emailpro" class="required">
@@ -513,6 +556,8 @@
       <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
+        [% UNLESS nofax %]
     <li>
       [% IF ( mandatoryfax ) %]
       <label for="fax" class="required">
@@ -523,6 +568,7 @@
       <input type="text" id="fax" name="fax" value="[% fax %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
 	</ol>
   </fieldset>
 
@@ -531,8 +577,10 @@
 [% END %]
 [% IF ( step_6 ) %]
 
+    [% UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
 		<fieldset class="rows" id="memberentry_address">
 		<legend>Alternate address</legend><ol>
+        [% UNLESS noB_address %]
 			<li>
 				[% IF ( mandatoryB_address ) %]
 					<label for="B_address" class="required">
@@ -543,6 +591,8 @@
 				<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_address2 %]
 			<li>
 				[% IF ( mandatoryB_address2 ) %]
 					<label for="B_address2" class="required">
@@ -553,6 +603,8 @@
 				<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_city %]
 			<li>
 				[% IF ( mandatoryB_city ) %]
 					<label for="B_city" class="required" >
@@ -563,6 +615,8 @@
 				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
 	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_state %]
 			<li>
 				[% IF ( mandatoryB_state ) %]
 					<label for="B_state" class="required" >
@@ -573,6 +627,8 @@
 				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
 	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_zipcode %]
 			<li>
 				[% IF ( mandatoryB_zipcode ) %]
 					<label for="B_zipcode" class="required">
@@ -583,6 +639,8 @@
 				<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_country %]
 			<li>
 				[% IF ( mandatoryB_country ) %]
 					<label for="B_country" class="required">
@@ -593,6 +651,8 @@
 				<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noB_phone %]
             <li>
                 [% IF ( mandatoryB_phone ) %]
                 <label for="B_phone" class="required">
@@ -603,6 +663,8 @@
                 <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
                 [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
             </li>
+        [% END %]
+        [% UNLESS noB_email %]
 			<li> 
         [% IF ( mandatoryB_email ) %]
           <label for="B_email" class="required">
@@ -612,6 +674,8 @@
         Email: </label>
         <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
+        [% END %]
+        [% UNLESS nocontactnote %]
             <li>
                 [% IF ( mandatorycontactnote ) %]
                 <label for="contactnote" class="required">
@@ -622,12 +686,16 @@
                 <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
         [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
             </li>
+        [% END %]
 			</ol>
 		</fieldset>
+    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
 [% END %]		
 [% IF ( step_2 ) %]
+    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactphone %]
 		<fieldset class="rows" id="memberentry_altaddress">       
 		    <legend>Alternate Contact</legend><ol>
+        [% UNLESS noaltcontactsurname %]
 			<li>
 			    [% IF ( mandatoryaltcontactsurname ) %]
 				<label for="altcontactsurname" class="required">
@@ -638,6 +706,8 @@
 				<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactfirstname %]
 			<li>
 			    [% IF ( mandatoryaltcontactfirstname ) %]
 				<label for="altcontactfirstname" class="required">
@@ -648,6 +718,8 @@
 				<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactaddress1 %]
 			<li>
 			    [% IF ( mandatoryaltcontactaddress1 ) %]
 				<label for="altcontactaddress1" class="required">
@@ -658,6 +730,8 @@
 				<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
 				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactaddress2 %]
 			<li>
 			    [% IF ( mandatoryaltcontactaddress2 ) %]
 				<label for="altcontactaddress2" class="required">
@@ -668,6 +742,8 @@
 				<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
 				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactaddress3 %]
 			<li>
 			    [% IF ( mandatoryaltcontactaddress3 ) %]
 				<label for="altcontactaddress3" class="required">
@@ -678,6 +754,8 @@
 				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
 				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactstate %]
 			<li>
 			    [% IF ( mandatoryaltcontactstate ) %]
 				<label for="altcontactstate" class="required">
@@ -688,6 +766,8 @@
 				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
 				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactzipcode %]
 			<li>
 			    [% IF ( mandatoryaltcontactzipcode ) %]
 				<label for="altcontactzipcode" class="required">
@@ -698,6 +778,8 @@
 				<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="5" />
 				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
+        [% UNLESS noaltcontactcountry %]
 			<li>
 			    [% IF ( mandatoryaltcontactcountry ) %]
 				<label for="altcontactcountry" class="required">
@@ -708,6 +790,8 @@
 				<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="20" />
 				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
 			</li>			
+        [% END %]
+        [% UNLESS noaltcontactphone %]
 			<li>
 			    [% IF ( mandatoryaltcontactphone ) %]
 				<label for="altcontactphone" class="required">
@@ -718,8 +802,10 @@
 				<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
 				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
 			</li>
+        [% END %]
             </ol>
         </fieldset>
+    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
 
 
   [% IF ( I ) %]
@@ -746,6 +832,7 @@
 
   <fieldset class="rows" id="memberentry_library_management">
     <legend>Library Management</legend><ol>
+        [% UNLESS nocardnumber %]
    <li> [% IF ( mandatorycardnumber ) %]
       <label for="cardnumber" class="required">
     [% ELSE %]
@@ -754,6 +841,8 @@
     Card number: </label>
     <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% cardnumber %][% END %]" />
 	  [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
+        [% END %]
+        [% UNLESS nobranchcode %]
     <li>
       [% IF ( mandatorybranchcode ) %]
         <label for="branchcode" class="required">
@@ -764,6 +853,7 @@
       [% CGIbranch %]
 	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
     </li>
+        [% END %]
     <li>
         <label for="categorycode">Category: </label>
         <select id="categorycode" name="categorycode">
@@ -789,6 +879,7 @@
        [% END %]
        </select>
     </li>
+        [% UNLESS nosort1 %]
     <li>
       [% IF ( mandatorysort1 ) %]
         <label for="sort1" class="required">
@@ -803,6 +894,8 @@
 	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
       [% END %]   
     </li>
+        [% END %]
+        [% UNLESS nosort2 %]
     <li>
     [% IF ( mandatorysort2 ) %]
     <label for="sort2" class="required">
@@ -817,10 +910,12 @@
 	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
     [% END %] 
     </li>
+        [% END %]
 	</ol>
   </fieldset>
 	<fieldset class="rows" id="memberentry_subscription">
 	<legend>Library set-up</legend><ol>
+        [% UNLESS nodateenrolled %]
 		<li>
 			[% IF ( mandatorydateenrolled ) %]
 			<label for="dateenrolled" class="required">
@@ -843,6 +938,8 @@
 		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 		</li>
+        [% END %]
+        [% UNLESS nodateexpiry %]
 		<li>
 			[% IF ( mandatorydateexpiry ) %]
 			<label for="dateexpiry" class="required">
@@ -865,6 +962,8 @@
 		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 		</li>
+        [% END %]
+        [% UNLESS noopacnote %]
 		<li>
 			[% IF ( mandatoryopacnote ) %]
 				<label for="opacnote" class="required">
@@ -876,6 +975,8 @@
 			<div class="hint">This message appears on this patron's user page in the OPAC</div>
 	  [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
 		</li>
+        [% END %]
+        [% UNLESS noborrowernotes %]
 		<li>
 			[% IF ( mandatoryborrowernotes ) %]	
 				<label for="borrowernotes" class="required">
@@ -887,10 +988,12 @@
 			<div class="hint">This message displays when checking out to this patron</div>
 	  [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
 		</li>
+        [% END %]
 		</ol>
 	</fieldset>
 	<fieldset class="rows" id="memberentry_userid">
 		<legend>OPAC/Staff Login</legend><ol>
+        [% UNLESS nouserid %]
 		<li>
 			[% IF ( mandatoryuserid ) %]
 			<label for="userid" class="required">
@@ -937,7 +1040,9 @@
 			[% END %]
 	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
 [% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
-		</li></ol>
+		</li>
+        [% END %]
+    </ol>
 		</fieldset>
 		<!--this zones are not necessary in modif mode -->
 		[% UNLESS ( opadd ) %]
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 61c3c2c..517ec7c 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -100,6 +100,13 @@ my @field_check=split(/\|/,$check_BorrowerMandatoryField);
 foreach (@field_check) {
 	$template->param( "mandatory$_" => 1);    
 }
+# function to designate unwanted fields
+my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
+ at field_check=split(/\|/,$check_BorrowerUnwantedField);
+foreach (@field_check) {
+    next unless m/\w/o;
+	$template->param( "no$_" => 1);    
+}
 $template->param( "add" => 1 ) if ( $op eq 'add' );
 $template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
 $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
diff --git a/xt/syspref.t b/xt/syspref.t
index 1b7c438..7b1fb76 100755
--- a/xt/syspref.t
+++ b/xt/syspref.t
@@ -33,6 +33,7 @@ my @trans_syspref_files = qw(
     uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
     ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
     pl-PL/mandatory/sysprefs.sql
+    nb-NO/1-Obligatorisk/sysprefs.sql
 );
 
 ok(
-- 
1.6.5


From robin at catalyst.net.nz  Thu Jun  2 06:29:11 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  2 Jun 2011 16:29:11 +1200
Subject: [Koha-patches] [PATCH] Bug 5602: Changes to account for the version
	update.
Message-ID: <1306988951-22210-1-git-send-email-robin@catalyst.net.nz>

This is intended to apply on top of the previous 5602 patch.
---
 debian/README.build       |   10 +++++-----
 debian/build-git-snapshot |    7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/README.build b/debian/README.build
index 32a0f5d..9d33726 100644
--- a/debian/README.build
+++ b/debian/README.build
@@ -1,4 +1,5 @@
-In order to build .deb packages, following debian packages need to be present (installed):
+In order to build .deb packages, following debian packages need to be present
+(installed): 
 devscripts
 pbuilder
 dh-make
@@ -7,7 +8,6 @@ fakeroot
 As root (or sudo) execute:
 pbuilder create
 
-Executing build-git-snapshot without any arguments will leave package and the rest in some pbuilder dir, eg. /var/cache/pbuilder/result
-It is highly recommended that --buildresult option is used.
-
-The script requires sudo.
+Executing build-git-snapshot without any arguments will leave package and the
+rest in some pbuilder dir, eg. /var/cache/pbuilder/result It is highly
+recommended that --buildresult option is used.
diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index c3140e7..295b5fa 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -17,7 +17,8 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Written by Robin Sheat <robin at catalyst.net.nz>
+# Written by Robin Sheat <robin at catalyst.net.nz> and
+#   Srdjan Jankovic <srdjan at catalyst.net.nz>
 # Based on an sh version by Lars Wirzenius.
 
 use strict;
@@ -29,7 +30,7 @@ use POSIX qw/strftime/;
 my $buildresult;
 my $distribution='squeeze-dev';
 my $git_checks='all';
-my $version='3.3-1~git';
+my $version='3.5-1~git';
 my $auto_version=1;
 my $need_help;
 my $debug;
@@ -99,7 +100,7 @@ Options:
         tracked files with untracked changes will cause an error), and 'none'
         (checking git status is skipped totally.) Default is 'all'.
     --version, -v
-        the version string for the resulting package. Default is '3.3-1~git'.
+        the version string for the resulting package. Default is '3.5-1~git'.
     --(no)autoversion
         whether or not to use the date and git commit ID in the version value.
         Default is to include it.
-- 
1.7.4.1


From colin.campbell at ptfs-europe.com  Thu Jun  2 12:36:54 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu,  2 Jun 2011 11:36:54 +0100
Subject: [Koha-patches] [Signed Off] Bug 6444 Corrects encoding problems in
	subscription-add.pl
Message-ID: <1307011014-11667-1-git-send-email-colin.campbell@ptfs-europe.com>

From: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>

When searching for a vendor, if the vendor has accented character in its
name, the vendor's name that's added in the form of subscription-add.pl
is encoded incorrectly.

[2011.06.01] F. Demians. Port it to 3.4

Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
---
 .../prog/en/modules/serials/acqui-search-result.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
index b92aafb..2a29f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
@@ -6,7 +6,7 @@
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = unescape(name);
+  opener.document.f.aqbooksellername.value = name;
   window.close();
 }
 </script>
@@ -33,7 +33,7 @@ function GetIt(aqbooksellerid,name)
         <tr>
         [% END %]
 			<td>[% loop_supplier.name %]</td>
-			<td><a href="#" onclick="GetIt([% loop_supplier.aqbooksellerid %],'[% loop_supplier.name |url %]')">Choose</a></td>
+			<td><a href="#" onclick="GetIt([% loop_supplier.aqbooksellerid %],$(this).parent().prev().text())">Choose</a></td>
 		</tr>
 	[% END %]
 </table>
-- 
1.7.5.2


From colin.campbell at ptfs-europe.com  Thu Jun  2 13:31:27 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu,  2 Jun 2011 12:31:27 +0100
Subject: [Koha-patches] [PATCH] Bug 6335 Set branch in sip session
Message-ID: <1307014287-11954-1-git-send-email-colin.campbell@ptfs-europe.com>

The server returns its branch as the institution in the config file
However in transactions it will default to the homebranch of the
sip user which may not be consistent with that. Needs to set branch
in the session if there is a value in config otherwise statistics and
behaviour can be wrong (esp in discharge)
---
 C4/SIP/Sip/MsgType.pm |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm
index 508a06b..6c6d75a 100644
--- a/C4/SIP/Sip/MsgType.pm
+++ b/C4/SIP/Sip/MsgType.pm
@@ -817,7 +817,7 @@ sub login_core ($$$) {
 		$server->{sip_username} = $uid;
 		$server->{sip_password} = $pwd;
 
-		my $auth_status = api_auth($uid,$pwd);
+		my $auth_status = api_auth($uid,$pwd,$inst);
 		if (!$auth_status or $auth_status !~ /^ok$/i) {
 			syslog("LOG_WARNING", "api_auth failed for SIP terminal '%s' of '%s': %s",
 						$uid, $inst, ($auth_status||'unknown'));
@@ -1585,17 +1585,17 @@ sub patron_status_string {
     return $patron_status;
 }
 
-sub api_auth($$) {
-	# AUTH
-	my ($username,$password) = (shift,shift);
-	$ENV{REMOTE_USER} = $username;
-	my $query = CGI->new();
-	$query->param(userid   => $username);
-	$query->param(password => $password);
-	my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, "intranet");
-	# print STDERR "check_api_auth returns " . ($status || 'undef') . "\n";
-	# print "api_auth userenv = " . &dump_userenv;
-	return $status;
+sub api_auth {
+    my ($username,$password, $branch) = @_;
+    $ENV{REMOTE_USER} = $username;
+    my $query = CGI->new();
+    $query->param(userid   => $username);
+    $query->param(password => $password);
+    if ($branch) {
+        $query->param(branch => $branch);
+    }
+    my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, 'intranet');
+    return $status;
 }
 
 1;
-- 
1.7.5.2


From cnighswonger at foundations.edu  Thu Jun  2 19:37:51 2011
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 2 Jun 2011 13:37:51 -0400
Subject: [Koha-patches] Proposed patch for bug number 6321 relative to
 Koha 3.2.X
In-Reply-To: <04BC999E-A9A7-45F8-98F5-AC5030A97169@pusc.it>
References: <04BC999E-A9A7-45F8-98F5-AC5030A97169@pusc.it>
Message-ID: <BANLkTim2XkzgLRwcZ9JBhGt=GUvJz-SA6w@mail.gmail.com>

Hi Stefano,

Please submit this work in the form of a git formated patch so that it
can be tested and signed off on.

Thanks for the good work!

Kind Regards,
Chris


On Fri, May 13, 2011 at 5:59 AM, Stefano Bargioni <bargioni at pusc.it> wrote:
> In C4/Serials.pm
>
> line 2136 must be changed into:
> ? my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 124, 0, 0);
>
> add at line 2299:
> ? ? ? ?if ( $subscription->{periodicity} == 13 ) {
> ? ? ? ? ? ?for ( my $i = 0 ; $i < @irreg ; $i++ ) {
> ? ? ? ? ? ? ? ?if ( $irreg[$i] == ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 ) ) {
> ? ? ? ? ? ? ? ? ? ?( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
> ? ? ? ? ? ? ? ? ? ?$tmpmonth = ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 );
> ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ?}
> ? ? ? ? ? ?@resultdate = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
> ? ? ? ?}
>
> In en/modules/serials/subscription-add.tmpl add at line 1236:
>
> ? ? ? ? ? ? ? ?<!-- TMPL_IF name="periodicity13" -->
> ? ? ? ? ? ? ? ? ? ?<option value="13" selected="selected">1/4 months (3/year)</option>
> ? ? ? ? ? ? ? ?<!-- TMPL_ELSE -->
> ? ? ? ? ? ? ? ? ? ?<option value="13">1/4 months (3/year)</option>
> ? ? ? ? ? ? ? ?<!-- /TMPL_IF -->
>
> Add a translation for "1/4 month (3/year)" in po files for two lines of subscription-add.tmpl.
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>

From magnus at enger.priv.no  Thu Jun  2 21:37:40 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu,  2 Jun 2011 21:37:40 +0200
Subject: [Koha-patches] [PATCH 2/2] Bug 6450 - No check in/check out
	messages in message_queue
Message-ID: <1307043460-4936-1-git-send-email-magnus@enger.priv.no>

Huge thanks to Katrin Fischer for spotting what was the trouble here!
---
 C4/Circulation.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a2db4c..6cca9e9 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2613,8 +2613,8 @@ sub SendCirculationAlert {
     my ($type, $item, $borrower, $branch) =
         ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch});
     my %message_name = (
-        CHECKIN  => 'Item Check-in',
-        CHECKOUT => 'Item Checkout',
+        CHECKIN  => 'Item_Check_in',
+        CHECKOUT => 'Item_Checkout',
     );
     my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
         borrowernumber => $borrower->{borrowernumber},
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri Jun  3 03:06:19 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  3 Jun 2011 13:06:19 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6450 - No check in/check
	out messages in message_queue
Message-ID: <1307063179-25403-1-git-send-email-chrisc@catalyst.net.nz>

From: Magnus Enger <magnus at enger.priv.no>

Huge thanks to Katrin Fischer for spotting what was the trouble here!

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 C4/Circulation.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a2db4c..6cca9e9 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2613,8 +2613,8 @@ sub SendCirculationAlert {
     my ($type, $item, $borrower, $branch) =
         ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch});
     my %message_name = (
-        CHECKIN  => 'Item Check-in',
-        CHECKOUT => 'Item Checkout',
+        CHECKIN  => 'Item_Check_in',
+        CHECKOUT => 'Item_Checkout',
     );
     my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
         borrowernumber => $borrower->{borrowernumber},
-- 
1.7.4.1


From chrisc at catalyst.net.nz  Fri Jun  3 03:11:01 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri,  3 Jun 2011 13:11:01 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] bug 6442 change opacnav wording
	so it's more accurate
Message-ID: <1307063461-25727-1-git-send-email-chrisc@catalyst.net.nz>

From: Nicole C. Engard <nengard at bywatersolutions.com>

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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
index 7f92cd6..71c9426 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -138,7 +138,7 @@ OPAC:
               type: textarea
               class: code
         -
-            - "Show the following HTML on the left hand column of all pages on the OPAC (generally navigation links):"
+            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
             - pref: OpacNav
               type: textarea
               class: code
-- 
1.7.4.1


From pianohacker at gmail.com  Fri Jun  3 03:51:40 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Thu,  2 Jun 2011 19:51:40 -0600
Subject: [Koha-patches] [PATCH 1/2] Bug 4222 - allow nonpublicnote to be a
	mapped DB column
Message-ID: <1307065901-11397-1-git-send-email-pianohacker@gmail.com>

From: Robin Sheat <robin at catalyst.net.nz>

This means that it's possible (and easy) to put non-public notes
(usually 952$x) on a template, same as public notes. It creates a
mapping between the 952$x field and the new database column.

Note that when this is applied, it will only work on newly saved records.

It is possible this will need to be altered to allow for UNIMARC etc. if
they use 952 differently.

Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
---
 catalogue/detail.pl                                |    8 ++++++++
 catalogue/moredetail.pl                            |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../prog/en/modules/catalogue/detail.tt            |    4 +++-
 .../prog/en/modules/catalogue/moredetail.tt        |    1 +
 5 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 03271b4..9abc3e4 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -224,6 +224,13 @@ foreach my $item (@items) {
         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
     }
 
+    foreach my $f (qw( itemnotes nonpublicnote )) {
+        if ($item->{$f}) {
+            $item->{$f} =~ s|\n|<br />|g;
+            $itemfields{$f} = 1;
+        }
+    }
+
     push @itemloop, $item;
 }
 
@@ -242,6 +249,7 @@ $template->param(
 	itemdata_copynumber => $itemfields{copynumber},
 	volinfo				=> $itemfields{enumchron},
     itemdata_itemnotes  => $itemfields{itemnotes},
+	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
     holdcount           => $holdcount,
 	C4::Search::enabled_staff_search_views,
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index d848188..364c26c 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -145,6 +145,7 @@ foreach my $item (@items){
     } else {
         $item->{'issue'}= 0;
     }
+    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
 }
 $template->param(count => $data->{'count'},
 	subscriptionsnumber => $subscriptionsnumber,
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 52951e7..d6bc16c 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4332,6 +4332,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = '3.05.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT");
+    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
+    print "Upgrade to $DBversion done (Make nonpublicnote easier to use)\n";
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index a019733..8a57aff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -246,7 +246,8 @@ function verify_images() {
                 [% IF ( volinfo ) %]<th>Publication Details</th>[% END %]
                 [% IF ( itemdata_uri ) %]<th>url</th>[% END %]
                 [% IF ( itemdata_copynumber ) %]<th>Copy No.</th>[% END %]
-                [% IF ( itemdata_itemnotes ) %]<th>Public notes</th>[% END %]
+                [% IF ( itemdata_itemnotes ) %]<th>Public Notes</th>[% END %]
+                [% IF ( itemdata_nonpublicnote ) %]<th>Non-public Notes</th>[% END %]
 		[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
             </tr>
             [% FOREACH itemloo IN itemloop %]
@@ -370,6 +371,7 @@ function verify_images() {
 					<td class="copynumber">[% itemloo.copynumber %]</td>
 				[% END %]
                 [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
+                [% IF ( itemdata_nonpublicnote ) %]<td><div class="itemnotes">[% itemloo.nonpublicnote %]</div></td>[% END %]
                 [% IF ( itemloo.type ) %]
                     <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% itemloo.biblioitemnumber %]&amp;item=[% itemloo.itemtype %]">Fix Itemtype</a></td>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 86c8a3f..c9dac79 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -173,6 +173,7 @@
                 [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
 		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
                 <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
+                <li><span class="label">Non-public Note:<span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>
             <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
             <li><span class="label">Public Note:</span>
                 [% IF ( CAN_user_editcatalogue_edit_items ) %]
-- 
1.7.4.1


From pianohacker at gmail.com  Fri Jun  3 03:51:41 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Thu,  2 Jun 2011 19:51:41 -0600
Subject: [Koha-patches] [PATCH 2/2] Bug 4222 - Also add non-public note to
	checkin/out screens
In-Reply-To: <1307065901-11397-1-git-send-email-pianohacker@gmail.com>
References: <1307065901-11397-1-git-send-email-pianohacker@gmail.com>
Message-ID: <1307065901-11397-2-git-send-email-pianohacker@gmail.com>

---
 circ/returns.pl                                    |    1 +
 .../prog/en/modules/catalogue/moredetail.tt        |    2 +-
 .../prog/en/modules/circ/circulation.tt            |    8 ++++----
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index d7fad0c..20f2f4f 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -572,6 +572,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
         $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
         $ri{itemtype}         = $biblio->{'itemtype'};
         $ri{itemnote}         = $biblio->{'itemnotes'};
+        $ri{nonpublicnote}    = $biblio->{'nonpublicnote'};
         $ri{ccode}            = $biblio->{'ccode'};
         $ri{itemnumber}       = $biblio->{'itemnumber'};
         $ri{barcode}          = $bar_code;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index c9dac79..51648c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -173,7 +173,7 @@
                 [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
 		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
                 <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
-                <li><span class="label">Non-public Note:<span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>
+                <li><span class="label">Non-public Note:</span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>
             <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
             <li><span class="label">Public Note:</span>
                 [% IF ( CAN_user_editcatalogue_edit_items ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index afa6ec5..fdbd4d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -702,7 +702,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
         [% todayissue.dd %]
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %][% IF ( todayissue.nonpublicnote ) %]- <span class="circ-hlt">[% todayissue.nonpublicnote %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
         <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
         <td>[% todayissue.checkoutdate %]</td>
         [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
@@ -774,7 +774,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
         [% previssue.dd %]
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
         <td>
             [% previssue.itemtype %]
         </td>
@@ -880,7 +880,7 @@ No patron matched <span class="ex">[% message %]</span>
     [% END %]
         [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
             [% relissue.dd %]</td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %][% IF ( relissue.nonpublicnote ) %]- <span class="circ-hlt">[% relissue.nonpublicnote %]</span>[% END %]  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
         <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
         <td>[% relissue.displaydate %]</td>
         <td>[% relissue.itemcallnumber %]</td>
@@ -900,7 +900,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
         [% relprevissue.dd %]
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %]  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
         <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
         <td>[% relprevissue.displaydate %]</td>
         <td>[% relprevissue.itemcallnumber %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 620f770..ffdeec4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -420,7 +420,8 @@ function Dopop(link) {
                 </a>
             [% ELSE %]Not checked out[% END %]</td>
             <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
-            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
+            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]<br /></span>[% END %]
+            [% IF ( riloo.nonpublicnote ) %]<span class="circ-hlt">[% riloo.nonpublicnote %]</span>[% END %]
             </td>
            </tr>
         [% END %]
-- 
1.7.4.1


From oleonard at myacpl.org  Fri Jun  3 14:16:00 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  3 Jun 2011 08:16:00 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 6446,
	batch item deletion interface problems
Message-ID: <1307103360-2840-1-git-send-email-oleonard@myacpl.org>

Scoping error in T:T variable caused incorrect column display
in batch delete and batch edit interfaces.
After applying this patch header cells should align correctly
with content and checkbox column should appear.
---
 .../prog/en/modules/tools/batchMod-del.tt          |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 21013f5..5aed1ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -91,7 +91,7 @@ for( x=0; x<allColumns.length; x++ ){
 			</tr>
 		    </thead>
 		    <tbody>
-		    [% FOREACH item_loo IN item_loop %] <tr> [% IF ( item_loo.show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% END %]
+		    [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% END %]
 		    <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td>
 			[% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> 
 					[% END %] </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 461b6bc..05fa978 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -85,7 +85,7 @@ for( x=0; x<allColumns.length; x++ ){
     </tr>
       </thead>
       <tbody>
-            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( item_loo.show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% ELSE %]<td>&nbsp;</td>[% END %]
+            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% ELSE %]<td>&nbsp;</td>[% END %]
                 <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td>
                 [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> 
         [% END %] </tr>
-- 
1.7.3


From nengard at bywatersolutions.com  Thu Jun  2 08:30:22 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu,  2 Jun 2011 02:30:22 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 6446,
	batch item deletion interface problems
Message-ID: <1306996222-6669-1-git-send-email-nengard@bywatersolutions.com>

From: Owen Leonard <oleonard at myacpl.org>

Scoping error in T:T variable caused incorrect column display
in batch delete and batch edit interfaces.
After applying this patch header cells should align correctly
with content and checkbox column should appear.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/tools/batchMod-del.tt          |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 21013f5..5aed1ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -91,7 +91,7 @@ for( x=0; x<allColumns.length; x++ ){
 			</tr>
 		    </thead>
 		    <tbody>
-		    [% FOREACH item_loo IN item_loop %] <tr> [% IF ( item_loo.show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% END %]
+		    [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% END %]
 		    <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td>
 			[% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> 
 					[% END %] </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 461b6bc..05fa978 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -85,7 +85,7 @@ for( x=0; x<allColumns.length; x++ ){
     </tr>
       </thead>
       <tbody>
-            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( item_loo.show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% ELSE %]<td>&nbsp;</td>[% END %]
+            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot Edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% ELSE %]<td>&nbsp;</td>[% END %]
                 <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td>
                 [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> 
         [% END %] </tr>
-- 
1.7.2.3


From chris at bigballofwax.co.nz  Sat Jun  4 12:00:31 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Sat,  4 Jun 2011 22:00:31 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6181: Remove CGI Scolling
	lists from C4::Budgets
Message-ID: <1307181631-19673-1-git-send-email-chris@bigballofwax.co.nz>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

As noted on bug 766 more cases of usage of
CGI::scrolling_list were imported into C4::Budgets
Even if we were not trying to remove usage of this
the C4 modules are not the place to generate markup
Most of these routines are noise as they are not used in
any current code but cause confusion and increase
maintenance overhead. They are removed

The sort dropboxes on order create are the only
references in current templates to these routines
they have been replaced by a select list generated
by the markup.
They can probably be removed too but their existence
although the option that causes them to be displayed
seems unlikely to be set. I've left them pending
resolution of some of the inconsistencies and
confusions surrounding Budgts

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 C4/Budgets.pm                                      |   93 ++++----------------
 acqui/addorderiso2709.pl                           |   12 ++--
 acqui/fetch_sort_dropbox.pl                        |   65 --------------
 acqui/neworderempty.pl                             |   16 ++--
 admin/aqbudgetperiods.pl                           |    2 -
 admin/aqbudgets.pl                                 |    3 -
 admin/aqplan.pl                                    |    2 -
 .../prog/en/modules/acqui/addorderiso2709.tt       |   29 +++++--
 .../prog/en/modules/acqui/neworderempty.tt         |   24 ++++-
 9 files changed, 75 insertions(+), 171 deletions(-)
 delete mode 100755 acqui/fetch_sort_dropbox.pl

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index d2010d0..4b41b12 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -50,10 +50,7 @@ BEGIN {
         &AddBudgetPeriod
 	    &DelBudgetPeriod
 
-	    &GetBudgetPeriodsDropbox
-        &GetBudgetSortDropbox
         &GetAuthvalueDropbox
-        &GetBudgetPermDropbox
 
         &ModBudgetPlan
 
@@ -335,24 +332,6 @@ sub GetBudgetOrdered {
 }
 
 # -------------------------------------------------------------------
-sub GetBudgetPermDropbox {
-	my ($perm) = @_;
-	my %labels;
-	$labels{'0'} = 'None';
-	$labels{'1'} = 'Owner';
-	$labels{'2'} = 'Library';
-	my $radio = CGI::scrolling_list(
-		-id       => 'budget_permission',
-		-name      => 'budget_permission',
-		-values    => [ '0', '1', '2' ],
-		-default   => $perm,
-		-labels    => \%labels,
-		-size    => 1,
-	);
-	return $radio;
-}
-
-# -------------------------------------------------------------------
 sub GetBudgetAuthCats  {
     my ($budget_period_id) = shift;
     # now, populate the auth_cats_loop used in the budget planning button
@@ -374,61 +353,27 @@ sub GetBudgetAuthCats  {
 
 # -------------------------------------------------------------------
 sub GetAuthvalueDropbox {
-	my ( $name, $authcat, $default ) = @_;
-	my @authorised_values;
-	my %authorised_lib;
-	my $value;
-	my $dbh = C4::Context->dbh;
-	my $sth = $dbh->prepare(
-		"SELECT authorised_value,lib
-            FROM authorised_values
-            WHERE category = ?
-            ORDER BY  lib"
-	);
-	$sth->execute( $authcat );
-
-	push @authorised_values, '';
-	while (my ($value, $lib) = $sth->fetchrow_array) {
-		push @authorised_values, $value;
-		$authorised_lib{$value} = $lib;
-	}
-
-    return 0 if keys(%authorised_lib) == 0;
-
-    my $budget_authvalue_dropbox = CGI::scrolling_list(
-        -values   => \@authorised_values,
-        -labels   => \%authorised_lib,
-        -default  => $default,
-        -override => 1,
-        -size     => 1,
-        -multiple => 0,
-        -name     => $name,
-        -id       => $name,
+    my ( $authcat, $default ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare(
+        'SELECT authorised_value,lib FROM authorised_values
+        WHERE category = ? ORDER BY lib'
     );
+    $sth->execute( $authcat );
+    my $option_list = [];
+    my @authorised_values = ( q{} );
+    while (my ($value, $lib) = $sth->fetchrow_array) {
+        push @{$option_list}, {
+            value => $value,
+            label => $lib,
+            default => ($default eq $value),
+        };
+    }
 
-    return $budget_authvalue_dropbox
-}
-
-# -------------------------------------------------------------------
-sub GetBudgetPeriodsDropbox {
-    my ($budget_period_id) = @_;
-	my %labels;
-	my @values;
-	my ($active, $periods) = GetBudgetPeriods();
-	foreach my $r (@$periods) {
-		$labels{"$r->{budget_period_id}"} = $r->{budget_period_description};
-		push @values, $r->{budget_period_id};
-	}
-
-	# if no buget_id is passed then its an add
-	my $budget_period_dropbox = CGI::scrolling_list(
-		-name    => 'budget_period_id',
-		-values  => \@values,
-		-default => $budget_period_id ? $budget_period_id :  $active,
-		-size    => 1,
-		-labels  => \%labels,
-	);
-	return $budget_period_dropbox;
+    if ( @{$option_list} ) {
+        return $option_list;
+    }
+    return;
 }
 
 # -------------------------------------------------------------------
diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index c46263a..0b9d860 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -281,12 +281,12 @@ $template->param( budget_loop    => $budget_loop,);
 my $CGIsort1;
 if ($budget) {    # its a mod ..
     if ( defined $budget->{'sort1_authcat'} ) {    # with custom  Asort* planning values
-        $CGIsort1 = GetAuthvalueDropbox( 'sort1', $budget->{'sort1_authcat'}, $data->{'sort1'} );
+        $CGIsort1 = GetAuthvalueDropbox(  $budget->{'sort1_authcat'}, $data->{'sort1'} );
     }
 } elsif ( scalar(@$budgets) ) {
-    $CGIsort1 = GetAuthvalueDropbox( 'sort1', @$budgets[0]->{'sort1_authcat'}, '' );
+    $CGIsort1 = GetAuthvalueDropbox(  @$budgets[0]->{'sort1_authcat'}, '' );
 } else {
-    $CGIsort1 = GetAuthvalueDropbox( 'sort1', '', '' );
+    $CGIsort1 = GetAuthvalueDropbox(  '', '' );
 }
 
 # if CGIsort is successfully fetched, the use it
@@ -300,12 +300,12 @@ if ($CGIsort1) {
 my $CGIsort2;
 if ($budget) {
     if ( defined $budget->{'sort2_authcat'} ) {
-        $CGIsort2 = GetAuthvalueDropbox( 'sort2', $budget->{'sort2_authcat'}, $data->{'sort2'} );
+        $CGIsort2 = GetAuthvalueDropbox(  $budget->{'sort2_authcat'}, $data->{'sort2'} );
     }
 } elsif ( scalar(@$budgets) ) {
-    $CGIsort2 = GetAuthvalueDropbox( 'sort2', @$budgets[0]->{sort2_authcat}, '' );
+    $CGIsort2 = GetAuthvalueDropbox(  @$budgets[0]->{sort2_authcat}, '' );
 } else {
-    $CGIsort2 = GetAuthvalueDropbox( 'sort2', '', '' );
+    $CGIsort2 = GetAuthvalueDropbox( '', '' );
 }
 
 if ($CGIsort2) {
diff --git a/acqui/fetch_sort_dropbox.pl b/acqui/fetch_sort_dropbox.pl
deleted file mode 100755
index 21d3c61..0000000
--- a/acqui/fetch_sort_dropbox.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2008-2009 BibLibre SARL
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use C4::Budgets;
-
-=head1 NAME
-
-fetch_sort_dropbox
-
-=cut
-
-my $input = new CGI;
-
-my $budget_id = $input->param('budget_id');
-my $sort_id   = $input->param('sort');
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "acqui/ajax.tmpl", # FIXME: REMOVE TMPL DEP?
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired => {editcatalogue => 'edit_catalogue'},
-        debug => 0,
-    }
-);
-
-my $sort_dropbox;
-my $budget = GetBudget($budget_id);
-
-if ( $sort_id == 1 ) {
-    $sort_dropbox = GetAuthvalueDropbox( 'sort1', $budget->{'sort1_authcat'}, '' );
-} elsif ( $sort_id == 2 ) {
-    $sort_dropbox = GetAuthvalueDropbox( 'sort2', $budget->{'sort2_authcat'}, '' );
-}
-
-#strip off select tags ;/
-$sort_dropbox =~ s/^\<select.*?\"\>//;
-$sort_dropbox =~ s/\<\/select\>$//;
-chomp $sort_dropbox;
-
-$template->param( return => $sort_dropbox );
-output_html_with_http_headers $input, $cookie, $template->output;
-1;
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 386dda7..eb92ba2 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -278,12 +278,12 @@ if ($close) {
 my $CGIsort1;
 if ($budget) {    # its a mod ..
     if ( defined $budget->{'sort1_authcat'} ) {    # with custom  Asort* planning values
-        $CGIsort1 = GetAuthvalueDropbox( 'sort1', $budget->{'sort1_authcat'}, $data->{'sort1'} );
+        $CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
     }
-} elsif(scalar(@$budgets)){
-    $CGIsort1 = GetAuthvalueDropbox( 'sort1', @$budgets[0]->{'sort1_authcat'}, '' );
+} elsif(@{$budgets}){
+    $CGIsort1 = GetAuthvalueDropbox(  @$budgets[0]->{'sort1_authcat'}, '' );
 }else{
-    $CGIsort1 = GetAuthvalueDropbox( 'sort1','', '' );
+    $CGIsort1 = GetAuthvalueDropbox( '', '' );
 }
 
 # if CGIsort is successfully fetched, the use it
@@ -297,12 +297,12 @@ if ($CGIsort1) {
 my $CGIsort2;
 if ($budget) {
     if ( defined $budget->{'sort2_authcat'} ) {
-        $CGIsort2 = GetAuthvalueDropbox( 'sort2', $budget->{'sort2_authcat'}, $data->{'sort2'} );
+        $CGIsort2 = GetAuthvalueDropbox(  $budget->{'sort2_authcat'}, $data->{'sort2'} );
     }
-} elsif(scalar(@$budgets)) {
-    $CGIsort2 = GetAuthvalueDropbox( 'sort2', @$budgets[0]->{sort2_authcat}, '' );
+} elsif(@{$budgets}) {
+    $CGIsort2 = GetAuthvalueDropbox(  @$budgets[0]->{sort2_authcat}, '' );
 }else{
-    $CGIsort2 = GetAuthvalueDropbox( 'sort2','', '' );
+    $CGIsort2 = GetAuthvalueDropbox( '', '' );
 }
 
 if ($CGIsort2) {
diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 724c7e5..e74935e 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -188,10 +188,8 @@ elsif ( $op eq 'delete_confirmed' ) {
         $budgetperiod->{budget_active} = 1;
         push( @period_loop, $budgetperiod );
     }
-    my $budget_period_dropbox = GetBudgetPeriodsDropbox();
 
     $template->param(
-        budget_period_dropbox => $budget_period_dropbox,
         period_loop           => \@period_loop,
 		pagination_bar		  => pagination_bar("aqbudgetperiods.pl",getnbpages(scalar(@$results),$pagesize),$page),
     );
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index e34f2cc..79c7b13 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -73,7 +73,6 @@ my $script_name               = "/cgi-bin/koha/admin/aqbudgets.pl";
 my $budget_hash               = $input->Vars;
 my $budget_id                 = $$budget_hash{budget_id};
 my $budget_permission         = $input->param('budget_permission');
-my $budget_period_dropbox     = $input->param('budget_period_dropbox');
 my $filter_budgetbranch       = $input->param('filter_budgetbranch');
 #filtering non budget keys
 delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
@@ -225,9 +224,7 @@ if ($op eq 'add_form') {
         }
     }
     my $branches = GetBranches();
-    my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} );
     $template->param(
-        budget_period_dropbox     => $budget_period_dropbox,
         budget_id                 => $budget_id,
         %$period,
     );
diff --git a/admin/aqplan.pl b/admin/aqplan.pl
index 8b68d51..81418ff 100755
--- a/admin/aqplan.pl
+++ b/admin/aqplan.pl
@@ -74,14 +74,12 @@ my $budget_period_startdate   = $period->{'budget_period_startdate'};
 my $budget_period_enddate     = $period->{'budget_period_enddate'};
 my $budget_period_locked      = $period->{'budget_period_locked'};
 my $budget_period_description = $period->{'budget_period_description'};
-my $budget_period_dropbox     = GetBudgetPeriodsDropbox($budget_period_id );
 
 
 $template->param(
     budget_period_id          => $budget_period_id,
     budget_period_locked      => $budget_period_locked,
     budget_period_description => $budget_period_description,
-    budget_period_dropbox     => $budget_period_dropbox,
     auth_cats_loop            => $auth_cats_loop,
 );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 04d0c58..dd864cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -184,21 +184,36 @@
                         <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                             <label for="sort1">Planning value1: </label>
 
-                            [% IF ( CGIsort1 ) %]
-                                [% CGIsort1 %]
+                            [% IF CGIsort1 %]
+                                <select id="sort1" size="1" name="sort1">
+                                [% FOREACH sort_opt IN CGIsort1 %]
+                                    [% IF sort_opt.default %]
+                                        <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                                    [% ELSE %]
+                                        <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                                    [% END %]
+                                [% END %]
+                                </select>
                             [% ELSE %]
-
                                 <input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
                             [% END %]
                         </li>
                         <li>
                             <label for="sort2">Planning value2: </label>
 
-                            [% IF ( CGIsort2 ) %]
-                                [% CGIsort2 %]
-                            [% ELSE %]
-                                <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
+                        [% IF CGIsort2 %]
+                            <select id="sort2" size="1" name="sort1">
+                            [% FOREACH sort_opt IN CGIsort2 %]
+                                [% IF sort_opt.default %]
+                                    <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                                [% ELSE %]
+                                    <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                                [% END %]
                             [% END %]
+                            </select>
+                        [% ELSE %]
+                             <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
+                        [% END %]
                         </li>
                         <li>
                             
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index d6c8459..03c8863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -412,8 +412,16 @@ $(document).ready(function()
             <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                 <label for="sort1">Statistic 1: </label>
 
-                [% IF ( CGIsort1 ) %]
-                    [% CGIsort1 %]
+                [% IF CGIsort1 %]
+                    <select id="sort1" size="1" name="sort1">
+                    [% FOREACH sort_opt IN CGIsort1 %]
+                       [% IF sort_opt.default %]
+                          <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                        [% ELSE %]
+                          <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                        [% END %]
+                    [% END %]
+                    </select>
                 [% ELSE %]
 
                     <input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
@@ -422,8 +430,16 @@ $(document).ready(function()
             <li>
                 <label for="sort2">Statistic 2: </label>
 
-                [% IF ( CGIsort2 ) %]
-                    [% CGIsort2 %]
+                [% IF CGIsort2 %]
+                    <select id="sort2" size="1" name="sort1">
+                    [% FOREACH sort_opt IN CGIsort2 %]
+                       [% IF sort_opt.default %]
+                          <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                        [% ELSE %]
+                          <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                        [% END %]
+                    [% END %]
+                    </select>
                 [% ELSE %]
                     <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
                 [% END %]
-- 
1.7.2.2


From magnus at enger.priv.no  Sat Jun  4 19:52:40 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Sat,  4 Jun 2011 19:52:40 +0200
Subject: [Koha-patches] [PATCH] Needless call to C4::Context->dbh in
	C4::Templates::themelanguage()
Message-ID: <1307209960-2753-1-git-send-email-magnus@enger.priv.no>

As far as I can tell, $dbh is never used again in the scope in which it is
created. This patch simply removes the line.
---
 C4/Templates.pm |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 8939be5..4368492 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -191,7 +191,6 @@ sub themelanguage {
         $lang = $languages[0] || 'en';
     }
     my $theme = 'prog'; # in the event of theme failure default to 'prog' -fbcit
-    my $dbh = C4::Context->dbh;
     my @themes;
     if ( $interface eq "intranet" ) {
         @themes = split " ", C4::Context->preference("template");
-- 
1.7.4.1


From januszop at gmail.com  Sun Jun  5 01:19:22 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Sun,  5 Jun 2011 02:19:22 +0300
Subject: [Koha-patches] [PATCH] Bug 6460 - No log generated if Action set to
	All or Modify or Delete
Message-ID: <1307229562-3792-1-git-send-email-januszop@gmail.com>

---
 C4/Log.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Log.pm b/C4/Log.pm
index 822cda5..fa258f2 100644
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -221,9 +221,9 @@ sub GetLogs {
     	$query .= " AND module IN (".join(",",map {"?"} @$modules).") ";
 	push(@parameters,@$modules);
     }
-    if($action && scalar(@$action)) {
-    	$query .= " AND action IN (".join(",",map {"?"} @$action).") ";
-	push(@parameters,@$action);
+    if($action->[0]) {
+    	$query .= " AND action LIKE ? ";
+	push(@parameters,"%".$action->[0]."%");
     }
     if($object) {
     	$query .= " AND object = ? ";
-- 
1.7.2.5


From januszop at gmail.com  Sun Jun  5 01:57:01 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Sun,  5 Jun 2011 02:57:01 +0300
Subject: [Koha-patches] [PATCH] Bug 6461 - BiblioDefaultView has no impact
	on how record are displayed when going from results list
Message-ID: <1307231821-4840-1-git-send-email-januszop@gmail.com>

---
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 7d881f9..0fb550b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -410,9 +410,9 @@ $(document).ready(function(){
 				[% IF ( OPACXSLTResultsDisplay ) %]
                 [% SEARCH_RESULT.XSLTResultsRecord %]
 				[% ELSE %]
-				[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
+				[% IF ( BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% ELSE %]
-                                [% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
+                                [% IF ( BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% ELSE %]<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% END %]
                                 [% END %]
-- 
1.7.2.5


From januszop at gmail.com  Sun Jun  5 02:28:18 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Sun,  5 Jun 2011 03:28:18 +0300
Subject: [Koha-patches] [PATCH] Bug 6462 - Authority type is not displayed
	in OPAC
Message-ID: <1307233698-5822-1-git-send-email-januszop@gmail.com>

---
 .../en/modules/opac-authoritiessearchresultlist.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 4da5455..7fb7f49 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -51,7 +51,7 @@
 					<td>[% resul.summary %]</td>
 
 						<td>
-					[% resul.authtypetext %]
+					[% authtypetext %]
 						</td>
 					[% UNLESS ( resul.isEDITORS ) %]
 						<td>
-- 
1.7.2.5


From chris at bigballofwax.co.nz  Sun Jun  5 08:29:57 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Sun,  5 Jun 2011 18:29:57 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6462 - Authority type is
	not displayed in OPAC
Message-ID: <1307255397-21373-1-git-send-email-chris@bigballofwax.co.nz>

From: Janusz Kaczmarek <januszop at gmail.com>

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 .../en/modules/opac-authoritiessearchresultlist.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index b8c597f..203cf7f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -51,7 +51,7 @@
 					<td>[% resul.summary %]</td>
 
 						<td>
-					[% resul.authtypetext %]
+					[% authtypetext %]
 						</td>
 					[% UNLESS ( resul.isEDITORS ) %]
 						<td>
-- 
1.7.2.2


From chris at bigballofwax.co.nz  Sun Jun  5 08:33:52 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Sun,  5 Jun 2011 18:33:52 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6461 - BiblioDefaultView
	has no impact on how record are displayed when going from
	results list
Message-ID: <1307255632-21518-1-git-send-email-chris@bigballofwax.co.nz>

From: Janusz Kaczmarek <januszop at gmail.com>

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 f371db1..c1a0f8c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -410,9 +410,9 @@ $(document).ready(function(){
 				[% IF ( OPACXSLTResultsDisplay ) %]
                 [% SEARCH_RESULT.XSLTResultsRecord %]
 				[% ELSE %]
-				[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
+				[% IF ( BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% ELSE %]
-                                [% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
+                                [% IF ( BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% ELSE %]<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
                                 [% END %]
                                 [% END %]
-- 
1.7.2.2


From januszop at gmail.com  Sun Jun  5 18:38:07 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Sun,  5 Jun 2011 19:38:07 +0300
Subject: [Koha-patches] [PATCH] Bug 6463 - Authorities browsing error when
	using auth. plugins
Message-ID: <1307291887-22388-1-git-send-email-januszop@gmail.com>

---
 .../modules/authorities/searchresultlist-auth.tt   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index cda1191..ba22e9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -31,7 +31,7 @@ function jumpfull(page)
                     [% IF ( number.highlight ) %]
                         [% number.number %]
                     [% ELSE %]
-                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% number.authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% number.index %]&amp;tagid=[% number.tagid %]&amp;orderby=[% number.orderby %]">
+                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index %]&amp;tagid=[% tagid %]&amp;orderby=[% orderby %]">
                             [% number.number %]</a>
                     [% END %]
                 [% END %]
@@ -72,7 +72,7 @@ function jumpfull(page)
                         <td>
                           [% IF ( resul.repets ) %]
                             [% FOREACH repet IN resul.repets %]
-                              <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% repet.authid %]&amp;index=[% repet.index %]&amp;repet=[% repet.repet %]')" title="[% repet.value %]">[% repet.repet %]</a>
+                              <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% resul.authid %]&amp;index=[% repet.index %]&amp;repet=[% repet.repet %]')" title="[% repet.value %]">[% repet.repet %]</a>
                             [% END %]
                           [% ELSE %]
                             <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% resul.authid %]&amp;index=[% index %]')">choose</a>
@@ -94,7 +94,7 @@ function jumpfull(page)
                     [% IF ( number.highlight ) %]
                         [% number.number %]
                     [% ELSE %]
-                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% number.authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% number.index %]&amp;tagid=[% number.tagid %]&amp;orderby=[% number.orderby %]">
+                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index %]&amp;tagid=[% tagid %]&amp;orderby=[% orderby %]">
                             [% number.number %]</a>
                     [% END %]
                 [% END %]
-- 
1.7.2.5


From f.demians at tamil.fr  Sun Jun  5 20:52:56 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sun,  5 Jun 2011 20:52:56 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6463 - Authorities browsing
	error when using auth. plugins
Message-ID: <1307299976-30997-1-git-send-email-f.demians@tamil.fr>

From: Janusz Kaczmarek <januszop at gmail.com>

[2011.06.05] I confirm the solution. On my test UNIMARC installation, I haven't
an error 500 but I have a wrong result pages navigation bar which doesn't limit
search result on the selected authority type.

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../modules/authorities/searchresultlist-auth.tt   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index cda1191..ba22e9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -31,7 +31,7 @@ function jumpfull(page)
                     [% IF ( number.highlight ) %]
                         [% number.number %]
                     [% ELSE %]
-                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% number.authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% number.index %]&amp;tagid=[% number.tagid %]&amp;orderby=[% number.orderby %]">
+                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index %]&amp;tagid=[% tagid %]&amp;orderby=[% orderby %]">
                             [% number.number %]</a>
                     [% END %]
                 [% END %]
@@ -72,7 +72,7 @@ function jumpfull(page)
                         <td>
                           [% IF ( resul.repets ) %]
                             [% FOREACH repet IN resul.repets %]
-                              <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% repet.authid %]&amp;index=[% repet.index %]&amp;repet=[% repet.repet %]')" title="[% repet.value %]">[% repet.repet %]</a>
+                              <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% resul.authid %]&amp;index=[% repet.index %]&amp;repet=[% repet.repet %]')" title="[% repet.value %]">[% repet.repet %]</a>
                             [% END %]
                           [% ELSE %]
                             <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=[% resul.authid %]&amp;index=[% index %]')">choose</a>
@@ -94,7 +94,7 @@ function jumpfull(page)
                     [% IF ( number.highlight ) %]
                         [% number.number %]
                     [% ELSE %]
-                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% number.authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% number.index %]&amp;tagid=[% number.tagid %]&amp;orderby=[% number.orderby %]">
+                        <a href="auth_finder.pl?startfrom=[% number.startfrom %]&amp;authtypecode=[% authtypecode %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term %]=[% searchdat.val %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index %]&amp;tagid=[% tagid %]&amp;orderby=[% orderby %]">
                             [% number.number %]</a>
                     [% END %]
                 [% END %]
-- 
1.7.5.1


From januszop at gmail.com  Mon Jun  6 00:11:03 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Mon,  6 Jun 2011 01:11:03 +0300
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_6465_-_Errors_in_UNIMARC?=
	=?utf-8?q?_plugins_for_fixed_length_fields_=28for_=7C_and_space=29?=
	=?utf-8?b?IChUOjpUIGlzc3VlKQ==?=
Message-ID: <1307311863-29501-1-git-send-email-januszop@gmail.com>

---
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +++++--
 cataloguing/value_builder/unimarc_field_105.pl     |   37 ++++++++------
 cataloguing/value_builder/unimarc_field_110.pl     |   26 ++++++---
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++++++++------
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 ++++++---
 cataloguing/value_builder/unimarc_field_116.pl     |   31 +++++++----
 cataloguing/value_builder/unimarc_field_117.pl     |   20 ++++++--
 cataloguing/value_builder/unimarc_field_120.pl     |   21 ++++++--
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 ++++-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +++++--
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +++-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +++-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++++++++------
 cataloguing/value_builder/unimarc_leader.pl        |   19 +++++--
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 ++--
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +++---
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 ++++++++++----------
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 ++++++------
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +++---
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +++---
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++++++------
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 31 files changed, 340 insertions(+), 212 deletions(-)

diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 5477856..bc7742a 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -67,6 +67,14 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index  = $input->param('index');
@@ -90,14 +98,14 @@ sub plugin {
         my @today = Date::Calc::Today();
         $f1 = $today[0] . sprintf('%02s',$today[1]) . sprintf('%02s',$today[2]);
     }
-    my $f2  = substr( $result, 8,  1 );
+    my $f2  = wrapper( substr( $result, 8,  1 ) );
     my $f3  = substr( $result, 9,  4 );
     $f3='' if $f3 eq '    '; # empty publication year if only spaces, otherwise it's hard to fill the field
     my $f4  = substr( $result, 13, 4 );
     $f4='' if $f4 eq '    ';
-    my $f5  = substr( $result, 17, 1 );
-    my $f6  = substr( $result, 18, 1 );
-    my $f7  = substr( $result, 19, 1 );
+    my $f5  = wrapper( substr( $result, 17, 1 ) );
+    my $f6  = wrapper( substr( $result, 18, 1 ) );
+    my $f7  = wrapper( substr( $result, 19, 1 ) );
     my $f8  = substr( $result, 20, 1 );
     my $f9  = substr( $result, 21, 1 );
     my $f10 = substr( $result, 22, 3 );
@@ -105,7 +113,7 @@ sub plugin {
     my $f12 = substr( $result, 26, 2 );
     my $f13 = substr( $result, 28, 2 );
     my $f14 = substr( $result, 30, 4 );
-    my $f15 = substr( $result, 34, 2 );
+    my $f15 = wrapper( substr( $result, 34, 2 ) );
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index d87afb4..69a8259 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -63,6 +63,13 @@ sub plugin_javascript {
     return ($field_number,$res);
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index= $input->param('index');
@@ -79,21 +86,21 @@ sub plugin {
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
-
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-
-	my $f9  = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-        my $f11 = substr($result,10,1);
-        my $f12 = substr($result,11,1);
-        my $f13 = substr($result,12,1);
+ 	my $f1 = wrapper( substr($result,0,1) );
+ 	my $f2 = wrapper( substr($result,1,1) );
+ 	my $f3 = wrapper( substr($result,2,1) );
+ 	my $f4 = wrapper( substr($result,3,1) );
+
+	my $f5 = wrapper( substr($result,4,1) );
+	my $f6 = wrapper( substr($result,5,1) );
+	my $f7 = wrapper( substr($result,6,1) );
+	my $f8 = wrapper( substr($result,7,1) );
+
+	my $f9  = wrapper( substr($result,8,1) );
+	my $f10 = wrapper( substr($result,9,1) );
+        my $f11 = wrapper( substr($result,10,1) );
+        my $f12 = wrapper( substr($result,11,1) );
+        my $f13 = wrapper( substr($result,12,1) );
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 848a53a..5d6f1a9 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -62,6 +62,14 @@ sub plugin_javascript {
 
     return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,15 +84,15 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
- 	my $f5 = substr($result,4,3);
- 	my $f6 = substr($result,7,1);
- 	my $f7 = substr($result,8,1);
- 	my $f8 = substr($result,9,1);
- 	my $f9 = substr($result,10,1);
+ 	my $f1 = wrapper( substr($result,0,1) );
+ 	my $f2 = wrapper( substr($result,1,1) );
+ 	my $f3 = wrapper( substr($result,2,1) );
+ 	my $f4 = wrapper( substr($result,3,1) );
+ 	my $f5 = substr($result,4,3) );
+ 	my $f6 = wrapper( substr($result,7,1) );
+ 	my $f7 = wrapper( substr($result,8,1) );
+ 	my $f8 = wrapper( substr($result,9,1) );
+ 	my $f9 = wrapper( substr($result,10,1) );
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 6144771..2cfd3a3 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -69,6 +69,13 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -86,24 +93,24 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
+    my $f1  = wrapper( substr( $result, 0,  1 ) );
     my $f2  = substr( $result, 1,  3 );
-    my $f3  = substr( $result, 4,  1 );
-    my $f4  = substr( $result, 5,  1 );
-    my $f5  = substr( $result, 6,  1 );
-    my $f6  = substr( $result, 7,  1 );
-    my $f7  = substr( $result, 8,  1 );
-    my $f8  = substr( $result, 9,  1 );
-    my $f9  = substr( $result, 10, 1 );
-    my $f10 = substr( $result, 11, 1 );
-    my $f11 = substr( $result, 12, 1 );
-    my $f12 = substr( $result, 13, 1 );
-    my $f13 = substr( $result, 14, 1 );
-    my $f14 = substr( $result, 15, 1 );
-    my $f15 = substr( $result, 16, 1 );
-    my $f16 = substr( $result, 17, 1 );
-    my $f17 = substr( $result, 18, 1 );
-    my $f18 = substr( $result, 19, 1 );
+    my $f3  = wrapper( substr( $result, 4,  1 ) );
+    my $f4  = wrapper( substr( $result, 5,  1 ) );
+    my $f5  = wrapper( substr( $result, 6,  1 ) );
+    my $f6  = wrapper( substr( $result, 7,  1 ) );
+    my $f7  = wrapper( substr( $result, 8,  1 ) );
+    my $f8  = wrapper( substr( $result, 9,  1 ) );
+    my $f9  = wrapper( substr( $result, 10, 1 ) );
+    my $f10 = wrapper( substr( $result, 11, 1 ) );
+    my $f11 = wrapper( substr( $result, 12, 1 ) );
+    my $f12 = wrapper( substr( $result, 13, 1 ) );
+    my $f13 = wrapper( substr( $result, 14, 1 ) );
+    my $f14 = wrapper( substr( $result, 15, 1 ) );
+    my $f15 = wrapper( substr( $result, 16, 1 ) );
+    my $f16 = wrapper( substr( $result, 17, 1 ) );
+    my $f17 = wrapper( substr( $result, 18, 1 ) );
+    my $f18 = wrapper( substr( $result, 19, 1 ) );
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 7582e74..af8f26c 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -63,6 +63,13 @@ function Clic$field_number() {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -80,15 +87,15 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
-    my $f2  = substr( $result, 1,  1 );
-    my $f3  = substr( $result, 2,  1 );
-    my $f4  = substr( $result, 3,  1 );
-    my $f5  = substr( $result, 4,  1 );
-    my $f6  = substr( $result, 5,  1 );
-    my $f7  = substr( $result, 6,  1 );
-    my $f8  = substr( $result, 7,  1 );
-    my $f9  = substr( $result, 8,  1 );
+    my $f1  = wrapper( substr( $result, 0,  1 ) );
+    my $f2  = wrapper( substr( $result, 1,  1 ) );
+    my $f3  = wrapper( substr( $result, 2,  1 ) );
+    my $f4  = wrapper( substr( $result, 3,  1 ) );
+    my $f5  = wrapper( substr( $result, 4,  1 ) );
+    my $f6  = wrapper( substr( $result, 5,  1 ) );
+    my $f7  = wrapper( substr( $result, 6,  1 ) );
+    my $f8  = wrapper( substr( $result, 7,  1 ) );
+    my $f9  = wrapper( substr( $result, 8,  1 ) );
     my $f10 = substr( $result, 9,  4 );
     my $f11 = substr( $result, 13, 2 );
 
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 21e2368..66c8ffe 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -63,6 +63,15 @@ function Clic$field_number(i) {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -79,20 +88,20 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1 = substr( $result, 0, 1 );
-    my $f2 = substr( $result, 1, 1 );
-    my $f3 = substr( $result, 2, 1 );
-    my $f4 = substr( $result, 3, 1 );
+    my $f1 = wrapper( substr( $result, 0, 1 ) );
+    my $f2 = wrapper( substr( $result, 1, 1 ) );
+    my $f3 = wrapper( substr( $result, 2, 1 ) );
+    my $f4 = wrapper( substr( $result, 3, 1 ) );
 
-    my $f5 = substr( $result, 4, 2 );
-    my $f6 = substr( $result, 6, 2 );
-    my $f7 = substr( $result, 8, 2 );
+    my $f5 = wrapper( substr( $result, 4, 2 ) );
+    my $f6 = wrapper( substr( $result, 6, 2 ) );
+    my $f7 = wrapper( substr( $result, 8, 2 ) );
 
-    my $f8  = substr( $result, 10, 2 );
-    my $f9  = substr( $result, 12, 2 );
-    my $f10 = substr( $result, 14, 2 );
+    my $f8  = wrapper( substr( $result, 10, 2 ) );
+    my $f9  = wrapper( substr( $result, 12, 2 ) );
+    my $f10 = wrapper( substr( $result, 14, 2 ) );
 
-    my $f11 = substr( $result, 16, 2 );
+    my $f11 = wrapper( substr( $result, 16, 2 ) );
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index ff206f7..7b30d02 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -62,6 +62,16 @@ function Clic$field_number(i) {
 
 return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,12 +86,12 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,2);
- 	my $f2 = substr($result,2,2);
- 	my $f3 = substr($result,4,2);
- 	my $f4 = substr($result,6,2);
+ 	my $f1 = wrapper( substr($result,0,2) );
+ 	my $f2 = wrapper( substr($result,2,2) );
+ 	my $f3 = wrapper( substr($result,4,2) );
+ 	my $f4 = wrapper( substr($result,6,2) );
 
- 	my $f5 = substr($result,8,1);
+ 	my $f5 = wrapper( substr($result,8,1) );
 
 	$template->param(index => $index,
 							"f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 3f72c85..61e9b9a 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -63,6 +63,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -82,13 +91,13 @@ my ($template, $loggedinuser, $cookie)
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
+	my $f4 = wrapper( substr($result,3,1) );
+	my $f5 = wrapper( substr($result,4,1) );
+	my $f6 = wrapper( substr($result,5,1) );
+	my $f7 = wrapper( substr($result,6,1) );
 	my $f8 = substr($result,7,2);
-	my $f9 = substr($result,9,2);
-	my $f10 = substr($result,11,2);
+	my $f9 = wrapper( substr($result,9,2) );
+	my $f10 = wrapper( substr($result,11,2) );
 	$template->param(index => $index,
 							"f1$f1" => 1,
 							"f2$f2" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index a855332..8da7769 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -63,6 +63,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -80,8 +88,8 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f2 = wrapper( substr($result,1,1) );
+	my $f3 = wrapper( substr($result,2,1) );
 	my $f4 = substr($result,3,2);
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index b356956..14c0e44 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = wrapper( substr($result,0,1) );
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index 2f85f9e..b240397 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -83,12 +91,12 @@ my ($template, $loggedinuser, $cookie)
 	my $f5 = substr($result,4,1);
 	my $f6 = substr($result,5,1);
 	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-	my $f11 = substr($result,10,1);
-	my $f12 = substr($result,11,1);
-	my $f13 = substr($result,12,1);
+	my $f8 = wrapper( substr($result,7,1) );
+	my $f9 = wrapper( substr($result,8,1) );
+	my $f10 = wrapper( substr($result,9,1) );
+	my $f11 = wrapper( substr($result,10,1) );
+	my $f12 = wrapper( substr($result,11,1) );
+	my $f13 = wrapper( substr($result,12,1) );
 	my $f14 = substr($result,13,1);
 	my $f15 = substr($result,14,1);
 	$template->param(index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index b44bd21..60fefc9 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -60,6 +60,13 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +83,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,2);
+	my $f1 = wrapper( substr($result,0,2) );
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index caf6ba3..6b64b9f 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -61,6 +61,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -79,7 +87,7 @@ my ($template, $loggedinuser, $cookie)
 			     });
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f3 = wrapper( substr($result,2,1) );
 	my $f4 = substr($result,3,1);
 	my $f5 = substr($result,4,3);
 	my $f6 = substr($result,7,1);
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index de631c2..24d240a 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = wrapper( substr($result,0,1) );
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
 	my $f4 = substr($result,3,1);
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index ac50f32..5d9b8ce 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -60,6 +60,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,23 +85,23 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,2);
-	my $f11 = substr($result,11,2);
-	my $f12 = substr($result,13,2);
-	my $f13 = substr($result,15,2);
-	my $f14 = substr($result,17,2);
-	my $f15 = substr($result,19,1);
-	my $f16 = substr($result,20,1);
-	my $f17 = substr($result,21,1);
+	my $f1 = wrapper( substr($result,0,1) );
+	my $f2 = wrapper( substr($result,1,1) );
+	my $f3 = wrapper( substr($result,2,1) );
+	my $f4 = wrapper( substr($result,3,1) );
+	my $f5 = wrapper( substr($result,4,1) );
+	my $f6 = wrapper( substr($result,5,1) );
+	my $f7 = wrapper( substr($result,6,1) );
+	my $f8 = wrapper( substr($result,7,1) );
+	my $f9 = wrapper( substr($result,8,1) );
+	my $f10 = wrapper( substr($result,9,2) );
+	my $f11 = wrapper( substr($result,11,2) );
+	my $f12 = wrapper( substr($result,13,2) );
+	my $f13 = wrapper( substr($result,15,2) );
+	my $f14 = wrapper( substr($result,17,2) );
+	my $f15 = wrapper( substr($result,19,1) );
+	my $f16 = wrapper( substr($result,20,1) );
+	my $f17 = wrapper( substr($result,21,1) );
 	my $f18 = substr($result,22,1);
 	my $f19 = substr($result,23,1);
 	my $f20 = substr($result,24,1);
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 02608c9..b0b1a22 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -66,6 +66,13 @@ function Clic$function_name(i) {
     return ( $function_name, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -83,13 +90,13 @@ sub plugin {
         }
     );
     $result = "     nam                 " unless $result;
-    my $f5  = substr( $result, 5,  1 );
-    my $f6  = substr( $result, 6,  1 );
-    my $f7  = substr( $result, 7,  1 );
-    my $f8  = substr( $result, 8,  1 );
+    my $f5  = wrapper( substr( $result, 5,  1 ) );
+    my $f6  = wrapper( substr( $result, 6,  1 ) );
+    my $f7  = wrapper( substr( $result, 7,  1 ) );
+    my $f8  = wrapper( substr( $result, 8,  1 ) );
     my $f9  = substr( $result, 9,  1 );
-    my $f17 = substr( $result, 17, 1 );
-    my $f18 = substr( $result, 18, 1 );
+    my $f17 = wrapper( substr( $result, 17, 1 ) );
+    my $f18 = wrapper( substr( $result, 18, 1 ) );
     my $f19 = substr( $result, 19, 1 );
 
     $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index d186dfa..4686148 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -14,7 +14,7 @@
         <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
         <td>
             <select name="f2" id="f2" size="1">
-            [% IF ( f2 ) %]
+            [% IF ( f2space ) %]
                 <option value=" " selected="selected">Non required value</option>
             [% ELSE %]
                 <option value=" ">Non required value</option>
@@ -494,7 +494,7 @@ languages and obsolete typography)
         <td>
             <select name="f13" id="f13" size="1">
             
-            [% IF ( f13 ) %]
+            [% IF ( f13dblspace ) %]
                     <option value="  " selected="selected">non required value</option>
             [% ELSE %]
                     <option value="  ">non required value</option>
@@ -578,10 +578,10 @@ languages and obsolete typography)</option>
     <td><label for="f15">Script of Title</label></td>
     <td>
     <select name="f15" id="f15" size="1">
-            [% IF ( f15 ) %]
-                    <option value=" " selected="selected">Non required value</option>
+            [% IF ( f15dblspace ) %]
+                    <option value="  " selected="selected">Non required value</option>
             [% ELSE %]
-                    <option value=" ">Non required value</option>
+                    <option value="  ">Non required value</option>
             [% END %]
             
             [% IF ( f15ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 18f652f..f7e5884 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -16,7 +16,7 @@
             	           <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -114,7 +114,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -211,7 +211,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -307,7 +307,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -404,7 +404,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -542,7 +542,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -680,7 +680,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -817,7 +817,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
                         
-                        [% IF ( f8 ) %]
+                        [% IF ( f8space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -949,7 +949,7 @@
         <td><label for="f9">Conference or meeting code:</label></td>
                 <td>
                 <select name="f9" id="f9" size="1">
-               	[% IF ( f1pipe ) %]
+               	[% IF ( f9pipe ) %]
             		<option value="|" selected="selected">|- Filling character</option>
 	            [% ELSE %]
     	        	<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index ccb7624..b661898 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -198,7 +198,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-                    [% IF ( f4 ) %]
+                    [% IF ( f4space ) %]
                         <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                         <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 03a94e1..8a7b2eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -48,7 +48,7 @@
 		<td><label for="f3">Colour indicator</label></td>
 		<td>
 	<select name="f3" id="f3" size="1">
-			[% IF ( f1pipe ) %]
+			[% IF ( f3pipe ) %]
 				<option value="|" selected="selected">|- Filling character</option>
 			[% ELSE %]
 				<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index acb0695..70cd050 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -287,12 +287,12 @@
 		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f5dblpipe ) %]
+                            <option value="||" selected="selected">|- Filling character</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f5 ) %]
+                        [% IF ( f5dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -484,12 +484,12 @@
 		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
-			[% IF ( f6pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f6dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f6 ) %]
+			[% IF ( f6dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -685,12 +685,12 @@
 		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-			[% IF ( f7pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f7dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f7 ) %]
+			[% IF ( f7dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -889,12 +889,12 @@
 		<td><label for="f8">Technique (Prints) 1</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f8dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling character</option>
             [% END %]
-                        [% IF ( f8 ) %]
+                        [% IF ( f8dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -1082,13 +1082,13 @@
 		<td><label for="f9">Technique (Prints) 2</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f9dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1278,13 +1278,13 @@
 		<td><label for="f10">Technique (Prints) 3</label></td>
 		<td>
 			<select name="f10" id="f10" size="1">
-			[% IF ( f10pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f10dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1472,10 +1472,10 @@
 		<td><label for="f11">Functional Designation</label></td>
 		<td>
 			<select name="f11" id="f11" size="1">
-			[% IF ( f11pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f11dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
                         
 			[% IF ( f11aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index b42650f..376641a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Specific Material Designation</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	           <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f1dblpipe ) %]
+            	           <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
 			[% IF ( f1aa ) %]
@@ -220,13 +220,13 @@
 		<td><label for="f2">Material 1</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f2dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -399,13 +399,13 @@
 		<td><label for="f3">Material 2</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f3dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -579,12 +579,12 @@
 		<td><label for="f4">Material 3</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f4dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f4 ) %]
+                        [% IF ( f4dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index d072701..09ac0df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -71,7 +71,7 @@
 		<td><label for="f4">Relief codes 1:</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -148,7 +148,7 @@
 		<td><label for="f5">Relief codes 2:</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -226,7 +226,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
                         
-                        [% IF ( f6 ) %]
+                        [% IF ( f6space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -304,7 +304,7 @@
 		<td><label for="f7">Relief codes 4:</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-                        [% IF ( f7 ) %]
+                        [% IF ( f7space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -661,7 +661,7 @@
 		</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -901,10 +901,10 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
-				<option value=" ">non required value</option>
+				<option value="  ">non required value</option>
 			[% END %]
 
 			[% IF ( f10aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index f43bea8..827c506 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -27,7 +27,7 @@
 		<td>
 			<select name="f2" id="f2" size="1">
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -64,7 +64,7 @@
 		<td><label for="f3">Primary cartographic image 2:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-                        [% IF ( f3 ) %]
+                        [% IF ( f3space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index c8612de..7bee0bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Literary Text Indicator:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index e212a05..959e4a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -415,7 +415,7 @@
 		<td><label for="f8">Accompanying textual material 1:</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -502,7 +502,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
 			
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -589,7 +589,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
 			
-			[% IF ( f10 ) %]
+			[% IF ( f10space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -676,7 +676,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
 			
-			[% IF ( f11 ) %]
+			[% IF ( f11space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -762,7 +762,7 @@
 		<td><label for="f12">Accompanying textual material 5:</label></td>
 		<td>
 			<select name="f12" id="f12" size="1">
-                        [% IF ( f12 ) %]
+                        [% IF ( f12space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -848,7 +848,7 @@
 		<td><label for="f13">Accompanying textual material 6:</label></td>
 		<td>
 			<select name="f13" id="f13" size="1">
-                        [% IF ( f13 ) %]
+                        [% IF ( f13space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -1038,4 +1038,4 @@
 //]]>
 </script>
 
-[% INCLUDE 'popup-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 7aad5b3..5751b2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	<option value="|" selected="selected">|- Caract?re de remplissage</option>
+			[% IF ( f1dblpipe ) %]
+            	<option value="||" selected="selected">||- Caract?res de remplissage</option>
             [% ELSE %]
-            	<option value="|">|- Caract?re de remplissage</option>
+            	<option value="||">||- Caract?res de remplissage</option>
             [% END %]
 
 			[% IF ( f1ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 8e66d82..6edba01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -89,7 +89,7 @@
 		<td>
 			<select name="f3" id="f3" size="1">
 
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 29b46e4..152c6f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -11,7 +11,7 @@
 		<td>
 			<select name="f1" id="f1" size="1">
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 0201d04..689e775 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Illustration - Book 1:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -105,7 +105,7 @@
 		<td><label for="f2">Illustration - Book 2:</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -201,7 +201,7 @@
 		<td><label for="f3">Illustration - Book 3:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -297,7 +297,7 @@
 		<td>
 			<select name="f4" id="f4" size="1">
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -394,7 +394,7 @@
 		<td>
 			<select name="f5" id="f5" size="1">
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -465,7 +465,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -537,7 +537,7 @@
 		<td>
 			<select name="f7" id="f7" size="1">
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -608,7 +608,7 @@
 		<td>
 			<select name="f8" id="f8" size="1">
             
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -679,7 +679,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
             
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -732,7 +732,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -888,7 +888,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
             
-			[% IF ( f11 ) %]
+			[% IF ( f11dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1046,7 +1046,7 @@
 			<td>
 			<select name="f12" id="f12" size="1">
             
-			[% IF ( f12 ) %]
+			[% IF ( f12dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1202,7 +1202,7 @@
 		<td>
 			<select name="f13" id="f13" size="1">
             
-			[% IF ( f13 ) %]
+			[% IF ( f13dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1358,7 +1358,7 @@
 		<td>
 			<select name="f14" id="f14" size="1">
 
-			[% IF ( f14 ) %]
+			[% IF ( f14dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1527,7 +1527,7 @@
 		<td>
 			<select name="f15" id="f15" size="1">
 
-			[% IF ( f15 ) %]
+			[% IF ( f15space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1570,7 +1570,7 @@
 		<td>
 			<select name="f16" id="f16" size="1">
 
-			[% IF ( f16 ) %]
+			[% IF ( f16space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1611,7 +1611,7 @@
 		<td>
 			<select name="f17" id="f17" size="1">
 
-         		[% IF ( f17 ) %]
+         		[% IF ( f17space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 24ffc74..6e53881 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -188,7 +188,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f8 ) %]
+				[% IF ( f8space ) %]
 					<option value=" " selected="selected"> - Hierarchical relationship undefined</option>
 				[% ELSE %]
 					<option value=" "> - Hierarchical relationship undefined</option>
@@ -230,7 +230,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f17 ) %]
+				[% IF ( f17space ) %]
 					<option value=" " selected="selected"> Full level ("item in hand")</option>
 				[% ELSE %]
 					<option value=" "> Full level ("item in hand")</option>
@@ -264,7 +264,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f18 ) %]
+				[% IF ( f18space ) %]
 					<option value=" " selected="selected"> - In full ISBD form</option>
 				[% ELSE %]
 					<option value=" "> - In full ISBD form</option>
-- 
1.7.2.5


From mtj at kohaaloha.com  Mon Jun  6 06:30:11 2011
From: mtj at kohaaloha.com (James, Mason)
Date: Mon, 06 Jun 2011 16:30:11 +1200
Subject: [Koha-patches] [PATCH] Bug 6466 - hung socket read causes SIP tests
	to fail
Message-ID: <1307334611-5305-1-git-send-email-mtj@kohaaloha.com>

From: JAMES Mason <mason at kohaaloha.com>

---
 C4/SIP/t/SIPtest.pm |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/C4/SIP/t/SIPtest.pm b/C4/SIP/t/SIPtest.pm
index 62d5646..ed11f8e 100644
--- a/C4/SIP/t/SIPtest.pm
+++ b/C4/SIP/t/SIPtest.pm
@@ -185,10 +185,14 @@ sub one_msg {
 
     # If reading or writing fails, then the server's dead,
     # so there's no point in continuing.
-    if (!write_msg({seqno => $seqno}, $test->{msg}, $sock)) {
-		BAIL_OUT("Write failure in $test->{id}");
-    } elsif (!($resp = <$sock>)) {
-		BAIL_OUT("Read failure in $test->{id}");
+    if ( !write_msg( { seqno => $seqno }, $test->{msg}, $sock ) ) {
+        BAIL_OUT("Write failure in $test->{id}");
+    }
+
+    my $rv = sysread( $sock, $resp, 10000000 ); # 10000000 is a big number
+    
+    if ( !$rv ) {
+        BAIL_OUT("Read failure in $test->{id}");
     }
 
 	chomp($resp);
-- 
1.7.1


From januszop at gmail.com  Mon Jun  6 13:56:02 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Mon,  6 Jun 2011 14:56:02 +0300
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Errata_to_Bugfix_6465_-_Erro?=
	=?utf-8?q?rs_in_UNIMARC_plugins_for_fixed_length_fields_=28for_=7C?=
	=?utf-8?b?IGFuZCBzcGFjZSkgKFQ6OlQgaXNzdWUp?=
Message-ID: <1307361362-12918-1-git-send-email-januszop@gmail.com>

This is a corrected version of the patch.  One has to pay attention 
if the $fx resulting from substr () is defined.  In fact, it happens 
that if it comes from the end of the $result string and there were spaces 
at the end of the coded data, the spaces are cut off when passing the data 
from addbiblio dialog to the plugin. 

For instance if you have in you record:
"        d        k  y0frey50        "
then you will get
"        d        k  y0frey50"
in the plugin.

So the test if $fx is defined in now being done.

---
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +++++--
 cataloguing/value_builder/unimarc_field_105.pl     |   37 ++++++++------
 cataloguing/value_builder/unimarc_field_110.pl     |   24 ++++++---
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++++++++------
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 ++++++---
 cataloguing/value_builder/unimarc_field_116.pl     |   31 +++++++----
 cataloguing/value_builder/unimarc_field_117.pl     |   20 ++++++--
 cataloguing/value_builder/unimarc_field_120.pl     |   21 ++++++--
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 ++++-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +++++--
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +++-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +++-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++++++++------
 cataloguing/value_builder/unimarc_leader.pl        |   19 +++++--
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 ++--
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +++---
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 ++++++++++----------
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 ++++++------
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +++---
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +++---
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++++++------
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 31 files changed, 339 insertions(+), 211 deletions(-)

diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 5477856..b37b1d1 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -67,6 +67,14 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index  = $input->param('index');
@@ -90,14 +98,14 @@ sub plugin {
         my @today = Date::Calc::Today();
         $f1 = $today[0] . sprintf('%02s',$today[1]) . sprintf('%02s',$today[2]);
     }
-    my $f2  = substr( $result, 8,  1 );
+    my $f2  = substr( $result, 8,  1 ); $f2  = wrapper( $f2 ) if $f2;
     my $f3  = substr( $result, 9,  4 );
     $f3='' if $f3 eq '    '; # empty publication year if only spaces, otherwise it's hard to fill the field
     my $f4  = substr( $result, 13, 4 );
     $f4='' if $f4 eq '    ';
-    my $f5  = substr( $result, 17, 1 );
-    my $f6  = substr( $result, 18, 1 );
-    my $f7  = substr( $result, 19, 1 );
+    my $f5  = substr( $result, 17, 1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 18, 1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 19, 1 ); $f7  = wrapper( $f7 ) if $f7;
     my $f8  = substr( $result, 20, 1 );
     my $f9  = substr( $result, 21, 1 );
     my $f10 = substr( $result, 22, 3 );
@@ -105,7 +113,7 @@ sub plugin {
     my $f12 = substr( $result, 26, 2 );
     my $f13 = substr( $result, 28, 2 );
     my $f14 = substr( $result, 30, 4 );
-    my $f15 = substr( $result, 34, 2 );
+    my $f15 = substr( $result, 34, 2 ); $f15 = wrapper( $f15 ) if $f15;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index d87afb4..0d55dce 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -63,6 +63,13 @@ sub plugin_javascript {
     return ($field_number,$res);
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index= $input->param('index');
@@ -79,21 +86,21 @@ sub plugin {
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
-
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-
-	my $f9  = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-        my $f11 = substr($result,10,1);
-        my $f12 = substr($result,11,1);
-        my $f13 = substr($result,12,1);
+ 	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+
+	my $f9  = substr($result,8,1); $f9  = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+        my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+        my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+        my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 848a53a..2c301ae 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -62,6 +62,14 @@ sub plugin_javascript {
 
     return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,15 +84,15 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
+ 	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
  	my $f5 = substr($result,4,3);
- 	my $f6 = substr($result,7,1);
- 	my $f7 = substr($result,8,1);
- 	my $f8 = substr($result,9,1);
- 	my $f9 = substr($result,10,1);
+ 	my $f6 = substr($result,7,1); $f6 = wrapper( $f6 ) if $f6;
+ 	my $f7 = substr($result,8,1); $f7 = wrapper( $f7 ) if $f7;
+ 	my $f8 = substr($result,9,1); $f8 = wrapper( $f8 ) if $f8;
+ 	my $f9 = substr($result,10,1); $f9 = wrapper( $f9 ) if $f9;
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 6144771..2cd6806 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -69,6 +69,13 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -86,24 +93,24 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
+    my $f1  = substr( $result, 0,  1 ); $f1  = wrapper( $f1 ) if $f1;
     my $f2  = substr( $result, 1,  3 );
-    my $f3  = substr( $result, 4,  1 );
-    my $f4  = substr( $result, 5,  1 );
-    my $f5  = substr( $result, 6,  1 );
-    my $f6  = substr( $result, 7,  1 );
-    my $f7  = substr( $result, 8,  1 );
-    my $f8  = substr( $result, 9,  1 );
-    my $f9  = substr( $result, 10, 1 );
-    my $f10 = substr( $result, 11, 1 );
-    my $f11 = substr( $result, 12, 1 );
-    my $f12 = substr( $result, 13, 1 );
-    my $f13 = substr( $result, 14, 1 );
-    my $f14 = substr( $result, 15, 1 );
-    my $f15 = substr( $result, 16, 1 );
-    my $f16 = substr( $result, 17, 1 );
-    my $f17 = substr( $result, 18, 1 );
-    my $f18 = substr( $result, 19, 1 );
+    my $f3  = substr( $result, 4,  1 ); $f3  = wrapper( $f3 ) if $f3;
+    my $f4  = substr( $result, 5,  1 ); $f4  = wrapper( $f4 ) if $f4;
+    my $f5  = substr( $result, 6,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 7,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 8,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 9,  1 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 10, 1 ); $f9  = wrapper( $f9 ) if $f9;
+    my $f10 = substr( $result, 11, 1 ); $f10 = wrapper( $f10 ) if $f10;
+    my $f11 = substr( $result, 12, 1 ); $f11 = wrapper( $f11 ) if $f11;
+    my $f12 = substr( $result, 13, 1 ); $f12 = wrapper( $f12 ) if $f12;
+    my $f13 = substr( $result, 14, 1 ); $f13 = wrapper( $f13 ) if $f13;
+    my $f14 = substr( $result, 15, 1 ); $f14 = wrapper( $f14 ) if $f14;
+    my $f15 = substr( $result, 16, 1 ); $f15 = wrapper( $f15 ) if $f15;
+    my $f16 = substr( $result, 17, 1 ); $f16 = wrapper( $f16 ) if $f16;
+    my $f17 = substr( $result, 18, 1 ); $f17 = wrapper( $f17 ) if $f17;
+    my $f18 = substr( $result, 19, 1 ); $f18 = wrapper( $f18 ) if $f18;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 7582e74..919b1fa 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -63,6 +63,13 @@ function Clic$field_number() {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -80,15 +87,15 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
-    my $f2  = substr( $result, 1,  1 );
-    my $f3  = substr( $result, 2,  1 );
-    my $f4  = substr( $result, 3,  1 );
-    my $f5  = substr( $result, 4,  1 );
-    my $f6  = substr( $result, 5,  1 );
-    my $f7  = substr( $result, 6,  1 );
-    my $f8  = substr( $result, 7,  1 );
-    my $f9  = substr( $result, 8,  1 );
+    my $f1  = substr( $result, 0,  1 ); $f1  = wrapper( $f1 ) if $f1;
+    my $f2  = substr( $result, 1,  1 ); $f2  = wrapper( $f2 ) if $f2;
+    my $f3  = substr( $result, 2,  1 ); $f3  = wrapper( $f3 ) if $f3;
+    my $f4  = substr( $result, 3,  1 ); $f4  = wrapper( $f4 ) if $f4;
+    my $f5  = substr( $result, 4,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 5,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 6,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 7,  1 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 8,  1 ); $f9  = wrapper( $f9 ) if $f9;
     my $f10 = substr( $result, 9,  4 );
     my $f11 = substr( $result, 13, 2 );
 
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 21e2368..67f6875 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -63,6 +63,15 @@ function Clic$field_number(i) {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -79,20 +88,20 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1 = substr( $result, 0, 1 );
-    my $f2 = substr( $result, 1, 1 );
-    my $f3 = substr( $result, 2, 1 );
-    my $f4 = substr( $result, 3, 1 );
+    my $f1 = substr( $result, 0, 1 ); $f1 = wrapper( $f1 ) if $f1;
+    my $f2 = substr( $result, 1, 1 ); $f2 = wrapper( $f2 ) if $f2;
+    my $f3 = substr( $result, 2, 1 ); $f3 = wrapper( $f3 ) if $f3;
+    my $f4 = substr( $result, 3, 1 ); $f4 = wrapper( $f4 ) if $f4;
 
-    my $f5 = substr( $result, 4, 2 );
-    my $f6 = substr( $result, 6, 2 );
-    my $f7 = substr( $result, 8, 2 );
+    my $f5 = substr( $result, 4, 2 ); $f5 = wrapper( $f5 ) if $f5;
+    my $f6 = substr( $result, 6, 2 ); $f6 = wrapper( $f6 ) if $f6;
+    my $f7 = substr( $result, 8, 2 ); $f7 = wrapper( $f7 ) if $f7;
 
-    my $f8  = substr( $result, 10, 2 );
-    my $f9  = substr( $result, 12, 2 );
-    my $f10 = substr( $result, 14, 2 );
+    my $f8  = substr( $result, 10, 2 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 12, 2 ); $f9  = wrapper( $f9 ) if $f9;
+    my $f10 = substr( $result, 14, 2 ); $f10 = wrapper( $f10 ) if $f10;
 
-    my $f11 = substr( $result, 16, 2 );
+    my $f11 = substr( $result, 16, 2 ); $f11 = wrapper( $f11 ) if $f11;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index ff206f7..fcbb18f 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -62,6 +62,16 @@ function Clic$field_number(i) {
 
 return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,12 +86,12 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,2);
- 	my $f2 = substr($result,2,2);
- 	my $f3 = substr($result,4,2);
- 	my $f4 = substr($result,6,2);
+ 	my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,2,2); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,4,2); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,6,2); $f4 = wrapper( $f4 ) if $f4;
 
- 	my $f5 = substr($result,8,1);
+ 	my $f5 = substr($result,8,1); $f5 = wrapper( $f5 ) if $f5;
 
 	$template->param(index => $index,
 							"f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 3f72c85..f140fce 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -63,6 +63,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -82,13 +91,13 @@ my ($template, $loggedinuser, $cookie)
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
+	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
 	my $f8 = substr($result,7,2);
-	my $f9 = substr($result,9,2);
-	my $f10 = substr($result,11,2);
+	my $f9 = substr($result,9,2); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,11,2); $f10 = wrapper( $f10 ) if $f10;
 	$template->param(index => $index,
 							"f1$f1" => 1,
 							"f2$f2" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index a855332..d40f49c 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -63,6 +63,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -80,8 +88,8 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
 	my $f4 = substr($result,3,2);
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index b356956..8c66161 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index 2f85f9e..e3d47b5 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -83,12 +91,12 @@ my ($template, $loggedinuser, $cookie)
 	my $f5 = substr($result,4,1);
 	my $f6 = substr($result,5,1);
 	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-	my $f11 = substr($result,10,1);
-	my $f12 = substr($result,11,1);
-	my $f13 = substr($result,12,1);
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+	my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+	my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+	my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+	my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
 	my $f14 = substr($result,13,1);
 	my $f15 = substr($result,14,1);
 	$template->param(index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index b44bd21..1f196ac 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -60,6 +60,13 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +83,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,2);
+	my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index caf6ba3..d0eb5c9 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -61,6 +61,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -79,7 +87,7 @@ my ($template, $loggedinuser, $cookie)
 			     });
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
 	my $f4 = substr($result,3,1);
 	my $f5 = substr($result,4,3);
 	my $f6 = substr($result,7,1);
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index de631c2..93454aa 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
 	my $f4 = substr($result,3,1);
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index ac50f32..201e31a 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -60,6 +60,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,23 +85,23 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,2);
-	my $f11 = substr($result,11,2);
-	my $f12 = substr($result,13,2);
-	my $f13 = substr($result,15,2);
-	my $f14 = substr($result,17,2);
-	my $f15 = substr($result,19,1);
-	my $f16 = substr($result,20,1);
-	my $f17 = substr($result,21,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+	my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,2); $f10 = wrapper( $f10 ) if $f10;
+	my $f11 = substr($result,11,2); $f11 = wrapper( $f11 ) if $f11;
+	my $f12 = substr($result,13,2); $f12 = wrapper( $f12 ) if $f12;
+	my $f13 = substr($result,15,2); $f13 = wrapper( $f13 ) if $f13;
+	my $f14 = substr($result,17,2); $f14 = wrapper( $f14 ) if $f14;
+	my $f15 = substr($result,19,1); $f15 = wrapper( $f15 ) if $f15;
+	my $f16 = substr($result,20,1); $f16 = wrapper( $f16 ) if $f16;
+	my $f17 = substr($result,21,1); $f17 = wrapper( $f17 ) if $f17;
 	my $f18 = substr($result,22,1);
 	my $f19 = substr($result,23,1);
 	my $f20 = substr($result,24,1);
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 02608c9..0f0bcdf 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -66,6 +66,13 @@ function Clic$function_name(i) {
     return ( $function_name, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -83,13 +90,13 @@ sub plugin {
         }
     );
     $result = "     nam                 " unless $result;
-    my $f5  = substr( $result, 5,  1 );
-    my $f6  = substr( $result, 6,  1 );
-    my $f7  = substr( $result, 7,  1 );
-    my $f8  = substr( $result, 8,  1 );
+    my $f5  = substr( $result, 5,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 6,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 7,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 8,  1 ); $f8  = wrapper( $f8 ) if $f8;
     my $f9  = substr( $result, 9,  1 );
-    my $f17 = substr( $result, 17, 1 );
-    my $f18 = substr( $result, 18, 1 );
+    my $f17 = substr( $result, 17, 1 ); $f17 = wrapper( $f17 ) if $f17;
+    my $f18 = substr( $result, 18, 1 ); $f18 = wrapper( $f18 ) if $f18;
     my $f19 = substr( $result, 19, 1 );
 
     $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index d186dfa..4686148 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -14,7 +14,7 @@
         <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
         <td>
             <select name="f2" id="f2" size="1">
-            [% IF ( f2 ) %]
+            [% IF ( f2space ) %]
                 <option value=" " selected="selected">Non required value</option>
             [% ELSE %]
                 <option value=" ">Non required value</option>
@@ -494,7 +494,7 @@ languages and obsolete typography)
         <td>
             <select name="f13" id="f13" size="1">
             
-            [% IF ( f13 ) %]
+            [% IF ( f13dblspace ) %]
                     <option value="  " selected="selected">non required value</option>
             [% ELSE %]
                     <option value="  ">non required value</option>
@@ -578,10 +578,10 @@ languages and obsolete typography)</option>
     <td><label for="f15">Script of Title</label></td>
     <td>
     <select name="f15" id="f15" size="1">
-            [% IF ( f15 ) %]
-                    <option value=" " selected="selected">Non required value</option>
+            [% IF ( f15dblspace ) %]
+                    <option value="  " selected="selected">Non required value</option>
             [% ELSE %]
-                    <option value=" ">Non required value</option>
+                    <option value="  ">Non required value</option>
             [% END %]
             
             [% IF ( f15ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 18f652f..f7e5884 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -16,7 +16,7 @@
             	           <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -114,7 +114,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -211,7 +211,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -307,7 +307,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -404,7 +404,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -542,7 +542,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -680,7 +680,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -817,7 +817,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
                         
-                        [% IF ( f8 ) %]
+                        [% IF ( f8space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -949,7 +949,7 @@
         <td><label for="f9">Conference or meeting code:</label></td>
                 <td>
                 <select name="f9" id="f9" size="1">
-               	[% IF ( f1pipe ) %]
+               	[% IF ( f9pipe ) %]
             		<option value="|" selected="selected">|- Filling character</option>
 	            [% ELSE %]
     	        	<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index ccb7624..b661898 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -198,7 +198,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-                    [% IF ( f4 ) %]
+                    [% IF ( f4space ) %]
                         <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                         <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 03a94e1..8a7b2eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -48,7 +48,7 @@
 		<td><label for="f3">Colour indicator</label></td>
 		<td>
 	<select name="f3" id="f3" size="1">
-			[% IF ( f1pipe ) %]
+			[% IF ( f3pipe ) %]
 				<option value="|" selected="selected">|- Filling character</option>
 			[% ELSE %]
 				<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index acb0695..70cd050 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -287,12 +287,12 @@
 		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f5dblpipe ) %]
+                            <option value="||" selected="selected">|- Filling character</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f5 ) %]
+                        [% IF ( f5dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -484,12 +484,12 @@
 		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
-			[% IF ( f6pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f6dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f6 ) %]
+			[% IF ( f6dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -685,12 +685,12 @@
 		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-			[% IF ( f7pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f7dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f7 ) %]
+			[% IF ( f7dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -889,12 +889,12 @@
 		<td><label for="f8">Technique (Prints) 1</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f8dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling character</option>
             [% END %]
-                        [% IF ( f8 ) %]
+                        [% IF ( f8dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -1082,13 +1082,13 @@
 		<td><label for="f9">Technique (Prints) 2</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f9dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1278,13 +1278,13 @@
 		<td><label for="f10">Technique (Prints) 3</label></td>
 		<td>
 			<select name="f10" id="f10" size="1">
-			[% IF ( f10pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f10dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1472,10 +1472,10 @@
 		<td><label for="f11">Functional Designation</label></td>
 		<td>
 			<select name="f11" id="f11" size="1">
-			[% IF ( f11pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f11dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
                         
 			[% IF ( f11aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index b42650f..376641a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Specific Material Designation</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	           <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f1dblpipe ) %]
+            	           <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
 			[% IF ( f1aa ) %]
@@ -220,13 +220,13 @@
 		<td><label for="f2">Material 1</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f2dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -399,13 +399,13 @@
 		<td><label for="f3">Material 2</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f3dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -579,12 +579,12 @@
 		<td><label for="f4">Material 3</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f4dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f4 ) %]
+                        [% IF ( f4dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index d072701..09ac0df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -71,7 +71,7 @@
 		<td><label for="f4">Relief codes 1:</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -148,7 +148,7 @@
 		<td><label for="f5">Relief codes 2:</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -226,7 +226,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
                         
-                        [% IF ( f6 ) %]
+                        [% IF ( f6space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -304,7 +304,7 @@
 		<td><label for="f7">Relief codes 4:</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-                        [% IF ( f7 ) %]
+                        [% IF ( f7space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -661,7 +661,7 @@
 		</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -901,10 +901,10 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
-				<option value=" ">non required value</option>
+				<option value="  ">non required value</option>
 			[% END %]
 
 			[% IF ( f10aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index f43bea8..827c506 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -27,7 +27,7 @@
 		<td>
 			<select name="f2" id="f2" size="1">
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -64,7 +64,7 @@
 		<td><label for="f3">Primary cartographic image 2:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-                        [% IF ( f3 ) %]
+                        [% IF ( f3space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index c8612de..7bee0bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Literary Text Indicator:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index e212a05..959e4a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -415,7 +415,7 @@
 		<td><label for="f8">Accompanying textual material 1:</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -502,7 +502,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
 			
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -589,7 +589,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
 			
-			[% IF ( f10 ) %]
+			[% IF ( f10space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -676,7 +676,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
 			
-			[% IF ( f11 ) %]
+			[% IF ( f11space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -762,7 +762,7 @@
 		<td><label for="f12">Accompanying textual material 5:</label></td>
 		<td>
 			<select name="f12" id="f12" size="1">
-                        [% IF ( f12 ) %]
+                        [% IF ( f12space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -848,7 +848,7 @@
 		<td><label for="f13">Accompanying textual material 6:</label></td>
 		<td>
 			<select name="f13" id="f13" size="1">
-                        [% IF ( f13 ) %]
+                        [% IF ( f13space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -1038,4 +1038,4 @@
 //]]>
 </script>
 
-[% INCLUDE 'popup-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 7aad5b3..5751b2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	<option value="|" selected="selected">|- Caract?re de remplissage</option>
+			[% IF ( f1dblpipe ) %]
+            	<option value="||" selected="selected">||- Caract?res de remplissage</option>
             [% ELSE %]
-            	<option value="|">|- Caract?re de remplissage</option>
+            	<option value="||">||- Caract?res de remplissage</option>
             [% END %]
 
 			[% IF ( f1ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 8e66d82..6edba01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -89,7 +89,7 @@
 		<td>
 			<select name="f3" id="f3" size="1">
 
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 29b46e4..152c6f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -11,7 +11,7 @@
 		<td>
 			<select name="f1" id="f1" size="1">
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 0201d04..689e775 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Illustration - Book 1:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -105,7 +105,7 @@
 		<td><label for="f2">Illustration - Book 2:</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -201,7 +201,7 @@
 		<td><label for="f3">Illustration - Book 3:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -297,7 +297,7 @@
 		<td>
 			<select name="f4" id="f4" size="1">
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -394,7 +394,7 @@
 		<td>
 			<select name="f5" id="f5" size="1">
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -465,7 +465,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -537,7 +537,7 @@
 		<td>
 			<select name="f7" id="f7" size="1">
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -608,7 +608,7 @@
 		<td>
 			<select name="f8" id="f8" size="1">
             
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -679,7 +679,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
             
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -732,7 +732,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -888,7 +888,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
             
-			[% IF ( f11 ) %]
+			[% IF ( f11dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1046,7 +1046,7 @@
 			<td>
 			<select name="f12" id="f12" size="1">
             
-			[% IF ( f12 ) %]
+			[% IF ( f12dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1202,7 +1202,7 @@
 		<td>
 			<select name="f13" id="f13" size="1">
             
-			[% IF ( f13 ) %]
+			[% IF ( f13dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1358,7 +1358,7 @@
 		<td>
 			<select name="f14" id="f14" size="1">
 
-			[% IF ( f14 ) %]
+			[% IF ( f14dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1527,7 +1527,7 @@
 		<td>
 			<select name="f15" id="f15" size="1">
 
-			[% IF ( f15 ) %]
+			[% IF ( f15space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1570,7 +1570,7 @@
 		<td>
 			<select name="f16" id="f16" size="1">
 
-			[% IF ( f16 ) %]
+			[% IF ( f16space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1611,7 +1611,7 @@
 		<td>
 			<select name="f17" id="f17" size="1">
 
-         		[% IF ( f17 ) %]
+         		[% IF ( f17space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 24ffc74..6e53881 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -188,7 +188,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f8 ) %]
+				[% IF ( f8space ) %]
 					<option value=" " selected="selected"> - Hierarchical relationship undefined</option>
 				[% ELSE %]
 					<option value=" "> - Hierarchical relationship undefined</option>
@@ -230,7 +230,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f17 ) %]
+				[% IF ( f17space ) %]
 					<option value=" " selected="selected"> Full level ("item in hand")</option>
 				[% ELSE %]
 					<option value=" "> Full level ("item in hand")</option>
@@ -264,7 +264,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f18 ) %]
+				[% IF ( f18space ) %]
 					<option value=" " selected="selected"> - In full ISBD form</option>
 				[% ELSE %]
 					<option value=" "> - In full ISBD form</option>
-- 
1.7.2.5


From f.demians at tamil.fr  Mon Jun  6 14:44:37 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon,  6 Jun 2011 14:44:37 +0200
Subject: [Koha-patches] [PATCH] Bug 6464 Check inconsistent placeholders in
	translated strings
Message-ID: <1307364277-29259-1-git-send-email-f.demians@tamil.fr>

Display a warning for strings that don't have the same count of %s placeholders
that the English original strings. Don't warn for not translated string and
'fuzzy' string because those strings are not installed, and this is the
translator responsability to examine them.

Based on Fr?re S?bastien Marie work.
---
 misc/translator/tmpl_process3.pl |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/misc/translator/tmpl_process3.pl b/misc/translator/tmpl_process3.pl
index 46ceceb..d862a97 100755
--- a/misc/translator/tmpl_process3.pl
+++ b/misc/translator/tmpl_process3.pl
@@ -274,6 +274,21 @@ if (defined $href) {
 #       $charset_in = $candidate;
 #   }
 #     }
+
+    # BUG6464: check consistency of PO messages
+    #  - count number of '%s' in msgid and msgstr
+    for my $msg ( values %$href ) {
+        my $id_count  = split(/%s/, $msg->{msgid}) - 1;
+        my $str_count = split(/%s/, $msg->{msgstr}) - 1;
+        next if $id_count == $str_count ||
+                $msg->{msgstr} eq '""' ||
+                grep { /fuzzy/ } @{$msg->{_flags}};
+        warn_normal
+            "unconsistent %s count: ($id_count/$str_count):\n" .
+            "  line:   " . $msg->{loaded_line_number} . "\n" .
+            "  msgid:  " . $msg->{msgid} . "\n" .
+            "  msgstr: " . $msg->{msgstr} . "\n", undef;
+    }
 }
 
 # set our charset in to UTF-8
-- 
1.7.5.1


From oleonard at myacpl.org  Mon Jun  6 14:47:15 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  6 Jun 2011 08:47:15 -0400
Subject: [Koha-patches] [PATCH] [REVISED] Fix for Bug 6291,
	Cart printing truncated in Firefox
Message-ID: <1307364435-5600-1-git-send-email-oleonard@myacpl.org>

Implementing 100% width and height on <table>,<td>, and <th>
as suggested by this post:

http://www.piglets.org/serendipity/archives/45-Fixing-truncated-printing-with-Firefox.html
---
 koha-tmpl/intranet-tmpl/prog/en/css/print.css |    9 +++++++--
 koha-tmpl/opac-tmpl/prog/en/css/print.css     |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css
index 955b68b..d2ad905 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css
@@ -17,7 +17,7 @@ body {
 	background-color : #FFF;
 	color : #333333;
 	font-family : arial, geneva, sans-serif;
-	font-size : 14px;
+	font-size : 12px;
 	margin : 0px 0px 0px 0px;
 }
 
@@ -94,7 +94,8 @@ table {
 	border-left : 1px solid #CCCCCC;
 	margin : 3px 0px 5px 0px;
 	padding : 0px;
-	width : 99%;
+	width : 100%;
+	height : 100%;
 }
 
 table.list {
@@ -114,6 +115,8 @@ td {
 	border-left : 0;
 	font-size : 12px;
 	padding : 5px 5px 5px 5px;
+	width : 100%;
+	height : 100%;
 }
 
 td:last-child {
@@ -124,6 +127,8 @@ td:last-child {
 	border-left : 0;
 	font-size : 12px;
 	padding : 5px 5px 5px 5px;
+	width : 100%;
+	height : 100%;
 }
 
 table.list th {
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/print.css b/koha-tmpl/opac-tmpl/prog/en/css/print.css
index 85df351..53db2bc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/print.css
@@ -17,7 +17,7 @@ body {
 	background-color : #FFF;
 	color : #333333;
 	font-family : arial, geneva, sans-serif;
-	font-size : 14px;
+	font-size : 12px;
 	margin : 0px 0px 0px 0px;
 }
 
@@ -98,7 +98,8 @@ table {
 	border-left : 0px solid #CCCCCC;
 	margin : 3px 0px 5px 0px;
 	padding : 0px;
-	width : 99%;
+	width : 100%;
+	height : 100%;
 }
 
 td {
@@ -107,6 +108,8 @@ td {
 	border-right : 1px solid #CCCCCC;
 	padding : 5px 5px 5px 5px;
 	vertical-align : top;
+	width : 100%;
+	height : 100%;
 }
 
 td:last-child {
@@ -123,6 +126,8 @@ th {
 	border-right : 1px solid #CCCCCC;
 	font-weight : bold;
 	padding : 5px 5px 5px 5px;
+	width: 100%;
+	height : 100%;
 }
 
 th:last-child {
-- 
1.7.3


From januszop at gmail.com  Mon Jun  6 15:46:16 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Mon,  6 Jun 2011 16:46:16 +0300
Subject: [Koha-patches] [PATCH] Bug 6468 - Authorities browsing error in OPAC
Message-ID: <1307367976-16241-1-git-send-email-januszop@gmail.com>

---
 .../en/modules/opac-authoritiessearchresultlist.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 7fb7f49..5a30a74 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -20,7 +20,7 @@
 				[% IF ( number.highlight ) %]
 					<span class="current">[% number.number %]</span>
 				[% ELSE %]
-					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% number.resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% number.authtypecode %]&amp;orderby=[% number.orderby %]">[% number.number %]</a>
+					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode %]&amp;orderby=[% orderby %]">[% number.number %]</a>
 				[% END %]
 			[% END %]
 			[% IF ( displaynext ) %]
@@ -71,7 +71,7 @@
 			[% END %]
 			[% FOREACH number IN numbers %]
 				[% IF ( number.highlight ) %]<span class="current">[% number.number %]</span>[% ELSE %]
-					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% number.resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% number.authtypecode %]&amp;orderby=[% number.orderby %]">[% number.number %]</a>
+					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode %]&amp;orderby=[% orderby %]">[% number.number %]</a>
 				[% END %]
 			[% END %]
 			[% IF ( displaynext ) %]
-- 
1.7.2.5


From colin.campbell at ptfs-europe.com  Mon Jun  6 16:44:21 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon,  6 Jun 2011 15:44:21 +0100
Subject: [Koha-patches] [PATCH] Bug 6469: Avoid compile time warninggs in
	C4::Accounts
Message-ID: <1307371461-10169-1-git-send-email-colin.campbell@ptfs-europe.com>

$sth was redeclared in the same scope. Overwriting its value
with the return from prepare is adequate

removed some tab/space mixed indents from the SQL strings
---
 C4/Accounts.pm |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index 7bddd1a..fd834b6 100644
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -169,10 +169,10 @@ sub makepayment {
     my $data = $sth->fetchrow_hashref;
     $sth->finish;
 
-    my $sth = $dbh->prepare("UPDATE accountlines
-			        SET amountoutstanding = 0
-			      WHERE borrowernumber = ?
-				AND accountno = ?");
+    $sth = $dbh->prepare('UPDATE accountlines
+        SET amountoutstanding = 0
+        WHERE borrowernumber = ?
+        AND accountno = ?');
     $sth->execute($borrowernumber, $accountno);
 
     #  print $updquery;
@@ -185,10 +185,10 @@ sub makepayment {
 
     # create new line
     my $payment = 0 - $amount;
-    my $sth = $dbh->prepare("INSERT INTO accountlines
-					 (borrowernumber, accountno, date, amount,
-					  description, accounttype, amountoutstanding)
-				  VALUES (?,?,now(),?,?,'Pay',0)");
+    $sth = $dbh->prepare("INSERT INTO accountlines
+           (borrowernumber, accountno, date, amount,
+            description, accounttype, amountoutstanding)
+            VALUES (?,?,now(),?,?,'Pay',0)");
     $sth->execute($borrowernumber, $nextaccntno, $payment, "Payment,thanks - $user");
 
     # FIXME - The second argument to &UpdateStats is supposed to be the
-- 
1.7.5.2


From januszop at gmail.com  Mon Jun  6 17:57:58 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Mon,  6 Jun 2011 18:57:58 +0300
Subject: [Koha-patches] [PATCH] Bug 6470 - Unable to filter out log entries
	for kohaadmin (user 0)
Message-ID: <1307375878-19540-1-git-send-email-januszop@gmail.com>

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

diff --git a/C4/Log.pm b/C4/Log.pm
index 822cda5..98cd8d5 100644
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -213,7 +213,7 @@ sub GetLogs {
     my @parameters;
     $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$iso_datefrom."\" " if $iso_datefrom;   #fix me - mysql specific
     $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"".$iso_dateto."\" " if $iso_dateto;
-    if($user) {
+    if($user ne "") {
     	$query .= " AND user = ? ";
     	push(@parameters,$user);
     }
-- 
1.7.2.5


From lrea at nekls.org  Mon Jun  6 20:40:35 2011
From: lrea at nekls.org (Liz Rea)
Date: Mon,  6 Jun 2011 13:40:35 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] Bug 6467: Add shelving location
	to checkin screen
Message-ID: <1307385635-4457-1-git-send-email-lrea@nekls.org>

From: ruth at bywatersolutions.com <ruth at bywatersolutions.com>


Signed-off-by: Liz Rea <lrea at nekls.org>
---
 circ/returns.pl                                    |    6 ++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index d7fad0c..bb5230b 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -537,6 +537,7 @@ if ($borrower) {
 my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
 my $count = 0;
 my @riloop;
+my $shelflocations = GetKohaAuthorisedValues('items.location','');
 foreach ( sort { $a <=> $b } keys %returneditems ) {
     my %ri;
     if ( $count++ < $returned_counter ) {
@@ -575,6 +576,11 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
         $ri{ccode}            = $biblio->{'ccode'};
         $ri{itemnumber}       = $biblio->{'itemnumber'};
         $ri{barcode}          = $bar_code;
+
+        $ri{location}         = $biblio->{'location'};
+        my $shelfcode = $ri{'location'};
+        $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
+
     }
     else {
         last;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 620f770..c02be49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -396,7 +396,7 @@ function Dopop(link) {
 [% IF ( riloop ) %]
     <h2>Checked-In items</h2>
     <table>
-	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
+	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
 
         [% FOREACH riloo IN riloop %]
             <tr>
@@ -412,6 +412,7 @@ function Dopop(link) {
                     [% riloo.itemtitle |html %]</a></td>
 			<td>[% riloo.itemauthor %]</td>
             <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
+            <td>[% riloo.location %]</td>
             <td>[% riloo.itemcallnumber %]</td>
             <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
 			<td>[% IF ( riloo.duedate ) %]
-- 
1.7.2.5


From nengard at bywatersolutions.com  Mon Jun  6 10:21:08 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Mon,  6 Jun 2011 04:21:08 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 642: HidePatronName on
	detail page broken
Message-ID: <1307348468-4321-1-git-send-email-nengard@bywatersolutions.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

TT issue

To test:
- Check out an item to a patron
- Go to detail page of the title in intranet
- Normal view will show cardnumber when HidePatronName is activated
- Normal view will show patron's name, when HidePatronName is off

Hold page was not broken.

http://bugs.koha-community.org/show_bug.cgi?id=6472

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 97cb22c..39c2cd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -273,7 +273,7 @@ function verify_images() {
 						<span class="datedue">Checked out
                     [% UNLESS ( itemloo.NOTSAMEBRANCH ) %]
                           to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.borrowernumber %]">
-			  [% IF ( hidepatronname ) %]
+			  [% IF ( itemloo.hidepatronname ) %]
 			      [% itemloo.cardnumber %]
 			  [% ELSE %]
 			      [% itemloo.firstname %] [% itemloo.surname %]
-- 
1.7.2.3


From pianohacker at gmail.com  Tue Jun  7 02:41:11 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Mon,  6 Jun 2011 18:41:11 -0600
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_5633_=3A_MT2897_=3A_Allo?=
	=?utf-8?q?w_import=5Fborrowers=2Epl_to_be_used_in_commandline_mode?=
Message-ID: <1307407271-4369-1-git-send-email-pianohacker@gmail.com>

From: Matthias Meusburger <matthias.meusburger at biblibre.com>

Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
---
 tools/import_borrowers.pl   |  179 ++++++++++++++++++++++++++++++++++---------
 tools/import_borrowers.yaml |    3 +
 2 files changed, 144 insertions(+), 38 deletions(-)
 create mode 100644 tools/import_borrowers.yaml

diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 6141998..6295f8d 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -46,7 +46,8 @@ use C4::Members;
 use C4::Members::Attributes qw(:all);
 use C4::Members::AttributeTypes;
 use C4::Members::Messaging;
-
+use Date::Calc qw(Today_and_Now);
+use Getopt::Long;
 use Text::CSV;
 # Text::CSV::Unicode, even in binary mode, fails to parse lines with these diacriticals:
 # ?
@@ -55,6 +56,45 @@ use Text::CSV;
 use CGI;
 # use encoding 'utf8';    # don't do this
 
+my $input = CGI->new();
+
+# Checks if the script is called from commandline
+my $commandline = 0;
+my $uploadborrowers;
+my $matchpoint;
+my $overwrite_cardnumber;
+my $ext_preserve;
+my $file;
+my $cl_defaults;
+my $help;
+if (scalar @ARGV > 0) {
+    # Getting parameters
+    GetOptions ('matchpoint=s' => \$matchpoint, 'overwrite' => \$overwrite_cardnumber, 'preserve_attributes' => \$ext_preserve, 'file=s' => \$file, 'help|?' => \$help);
+    $commandline = 1;
+
+    if ($help) {
+	print "\nimport_borrowers.pl [--matchpoint=matchpoint] [--overwrite] [--preserve_attributes] --file=csvtoimport.csv\n\n";
+	print " * matchpoint is either 'cardnumber' or like 'patron_attribute_' + patron attribute code (example: patron_attribute_EXTERNALID)\n";
+	print " * Default values can be specified in import_borrowers.yaml (keys must be column names from the borrowers table)\n\n";
+	exit;
+    }
+
+    # Default parameters values :
+    $matchpoint ||= "cardnumber";
+    $overwrite_cardnumber ||= 0;
+    $ext_preserve ||= 0;
+
+    # Default values
+    $cl_defaults = (-e 'import_borrowers.yaml') ? YAML::LoadFile('import_borrowers.yaml') : {};
+
+    open($uploadborrowers, '<', $file) or die("Unable to open $file");
+} else {
+    $uploadborrowers      = $input->param('uploadborrowers');
+    $matchpoint           = $input->param('matchpoint');
+    $overwrite_cardnumber = $input->param('overwrite_cardnumber');
+    $ext_preserve         = $input->param('ext_preserve') || 0;
+}
+
 my (@errors, @feedback);
 my $extended = C4::Context->preference('ExtendedPatronAttributes');
 my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences');
@@ -64,54 +104,55 @@ if ($extended) {
 }
 my $columnkeystpl = [ map { {'key' => $_} }  grep {$_ ne 'borrowernumber' && $_ ne 'cardnumber'} @columnkeys ];  # ref. to array of hashrefs.
 
-my $input = CGI->new();
 our $csv  = Text::CSV->new({binary => 1});  # binary needed for non-ASCII Unicode
 # push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend};
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "tools/import_borrowers.tmpl",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { tools => 'import_patrons' },
-        debug           => 1,
-});
-
-$template->param(columnkeys => $columnkeystpl);
-
-if ($input->param('sample')) {
-    print $input->header(
-        -type       => 'application/vnd.sun.xml.calc', # 'application/vnd.ms-excel' ?
-        -attachment => 'patron_import.csv',
-    );
-    $csv->combine(@columnkeys);
-    print $csv->string, "\n";
-    exit 1;
+	    template_name   => "tools/import_borrowers.tmpl",
+	    query           => $input,
+	    type            => "intranet",
+	    authnotrequired => $commandline,
+	    flagsrequired   => { tools => 'import_patrons' },
+	    debug           => 1,
+    });
+
+if (!$commandline) {
+    $template->param(columnkeys => $columnkeystpl);
+    $template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'} );
+    ($extended) and $template->param(ExtendedPatronAttributes => 1);
+
+    if ($input->param('sample')) {
+	print $input->header(
+	    -type       => 'application/vnd.sun.xml.calc', # 'application/vnd.ms-excel' ?
+	    -attachment => 'patron_import.csv',
+	);
+	$csv->combine(@columnkeys);
+	print $csv->string, "\n";
+	exit 1;
+    }
 }
-my $uploadborrowers = $input->param('uploadborrowers');
-my $matchpoint      = $input->param('matchpoint');
+
 if ($matchpoint) {
     $matchpoint =~ s/^patron_attribute_//;
 }
-my $overwrite_cardnumber = $input->param('overwrite_cardnumber');
 
-$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'} );
 
-($extended) and $template->param(ExtendedPatronAttributes => 1);
 
 if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
     push @feedback, {feedback=>1, name=>'filename', value=>$uploadborrowers, filename=>$uploadborrowers};
-    my $handle = $input->upload('uploadborrowers');
+    my $handle = ($commandline == 1) ? $uploadborrowers : $input->upload('uploadborrowers');
     my $uploadinfo = $input->uploadInfo($uploadborrowers);
     foreach (keys %$uploadinfo) {
         push @feedback, {feedback=>1, name=>$_, value=>$uploadinfo->{$_}, $_=>$uploadinfo->{$_}};
     }
     my $imported    = 0;
     my $alreadyindb = 0;
+    my $lastalreadyindb;
     my $overwritten = 0;
     my $invalid     = 0;
+    my $lastinvalid;
     my $matchpoint_attr_type; 
-    my %defaults = $input->Vars;
+    my %defaults = ($commandline) ? %$cl_defaults : $input->Vars;
 
     # use header line to construct key to column map
     my $borrowerline = <$handle>;
@@ -126,7 +167,6 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
         $csvkeycol{$keycol} = $col++;
     }
     #warn($borrowerline);
-    my $ext_preserve = $input->param('ext_preserve') || 0;
     if ($extended) {
         $matchpoint_attr_type = C4::Members::AttributeTypes->fetch($matchpoint);
     }
@@ -187,7 +227,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                 $_->{surname}        = $borrower{surname} || 'UNDEF';
             }
             $invalid++;
-            (25 > scalar @errors) and push @errors, {missing_criticals=>\@missing_criticals};
+            ($commandline or 25 > scalar @errors) and push @errors, {missing_criticals=>\@missing_criticals};
             # The first 25 errors are enough.  Keeping track of 30,000+ would destroy performance.
             next LINE;
         }
@@ -233,7 +273,8 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
             # borrower exists
             unless ($overwrite_cardnumber) {
                 $alreadyindb++;
-                $template->param('lastalreadyindb'=>$borrower{'surname'}.' / '.$borrowernumber);
+                $template->param('lastalreadyindb'=>$borrower{'surname'}.' / '.$borrowernumber) if (!$commandline);
+                $lastalreadyindb = $borrower{'surname'}.' / '.$borrowernumber;
                 next LINE;
             }
             $borrower{'borrowernumber'} = $borrowernumber;
@@ -246,7 +287,8 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
             }
             unless (ModMember(%borrower)) {
                 $invalid++;
-                $template->param('lastinvalid'=>$borrower{'surname'}.' / '.$borrowernumber);
+                $template->param('lastinvalid'=>$borrower{'surname'}.' / '.$borrowernumber) if (!$commandline);
+		$lastinvalid = $borrower{'surname'}.' / '.$borrowernumber;
                 next LINE;
             }
             if ($extended) {
@@ -257,7 +299,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                 SetBorrowerAttributes($borrower{'borrowernumber'}, $patron_attributes);
             }
             $overwritten++;
-            $template->param('lastoverwritten'=>$borrower{'surname'}.' / '.$borrowernumber);
+            $template->param('lastoverwritten'=>$borrower{'surname'}.' / '.$borrowernumber) if (!$commandline);
         } else {
             # FIXME: fixup_cardnumber says to lock table, but the web interface doesn't so this doesn't either.
             # At least this is closer to AddMember than in members/memberentry.pl
@@ -273,15 +315,16 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                                                                                   categorycode => $borrower{categorycode} });
                 }
                 $imported++;
-                $template->param('lastimported'=>$borrower{'surname'}.' / '.$borrowernumber);
+                $template->param('lastimported'=>$borrower{'surname'}.' / '.$borrowernumber) if (!$commandline);
             } else {
                 $invalid++;
-                $template->param('lastinvalid'=>$borrower{'surname'}.' / AddMember');
+                $template->param('lastinvalid'=>$borrower{'surname'}.' / AddMember') if (!$commandline);
+                $lastinvalid = $borrower{'surname'}.' / AddMember';
             }
         }
     }
-    (@errors  ) and $template->param(  ERRORS=>\@errors  );
-    (@feedback) and $template->param(FEEDBACK=>\@feedback);
+    (@errors  ) and $template->param(  ERRORS=>\@errors  ) if (!$commandline);
+    (@feedback) and $template->param(FEEDBACK=>\@feedback) if (!$commandline);
     $template->param(
         'uploadborrowers' => 1,
         'imported'        => $imported,
@@ -289,7 +332,67 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
         'alreadyindb'     => $alreadyindb,
         'invalid'         => $invalid,
         'total'           => $imported + $alreadyindb + $invalid + $overwritten,
-    );
+    ) if (!$commandline);
+    if ($commandline) {
+
+	my $total = $imported + $alreadyindb + $invalid + $overwritten;
+	my $output;
+
+	my $timestamp = C4::Dates->new()->output . " " . POSIX::strftime("%H:%M:%S",localtime);
+	$output .= "Timestamp : $timestamp\n";
+	$output .= "Import results\n";
+	$output .= "$imported imported records\n";
+	$output .= "$overwritten overwritten records\n";
+	$output .= "$alreadyindb not imported because already in borrowers table and overwrite disabled\n";
+	$output .= "(last was $lastalreadyindb)\n" if ($lastalreadyindb);
+	$output .= "$invalid not imported because they are not in the expected format\n";
+	$output .= "(last was $lastinvalid)\n" if ($lastinvalid);
+	$output .= "$total records parsed\n";
+
+
+	$output .= "\nError analysis\n";
+	foreach my $hash (@errors) {
+	   $output .= "Header row could not be parsed" if ($hash->{'badheader'});
+	   foreach my $array ($hash->{'missing_criticals'}) {
+	       foreach (@$array) {
+		    $output .= "Line $_->{'line'}: ";
+		    if ($hash->{'badparse'}) {
+			$output .= "could not be parsed!";
+		    } elsif ($hash->{'bad_date'}) {
+			$output .= "has $_->{'key'} in unrecognized format: $_->{'value'} ";
+		    } else {
+			$output .= "Critical field $_->{'key'}: ";
+			if ($_->{'branch_map'} || $_->{'category_map'}) {
+			    $output .= "has unrecognized value: $_->{'value'}";
+			} else {
+			    $output .= " missing";
+			}
+			$output .= " (borrowernumber: $_->{'borrowernumber'}; surname: $_->{'surname'})";
+		    }
+		    $output .= "\n". $_->{'lineraw'} . "\n";
+		}
+	   }
+	}
+
+    # Write log file
+    my $logfile = "/var/log/koha/reports/import_borrowers.log";
+    if (open (FH, ">>$logfile")) {
+	print FH $output;
+	close(FH);
+    } else {
+	$output .= "Unable to write to log file : $logfile\n";
+    }
+
+
+    # Send email with log
+     my $mail = MIME::Lite->new(
+                To      => C4::Context->preference('KohaAdminEmailAddress'),
+                Subject => "Import borrowers log email",
+                Type    => 'text/plain',
+                Data    => $output
+            );
+    $mail->send() or print STDERR "Warning: Unable to send log email\n";
+    }
 
 } else {
     if ($extended) {
@@ -305,5 +408,5 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
     }
 }
 
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output if (!$commandline);
 
diff --git a/tools/import_borrowers.yaml b/tools/import_borrowers.yaml
new file mode 100644
index 0000000..04b8d5f
--- /dev/null
+++ b/tools/import_borrowers.yaml
@@ -0,0 +1,3 @@
+# Default values for import_borrowers.pl used in command line
+column: value
+othercolumn: value
-- 
1.7.4.1


From chris at bigballofwax.co.nz  Tue Jun  7 08:37:02 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue,  7 Jun 2011 18:37:02 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6277 : CustomLog by default
Message-ID: <1307428622-4284-1-git-send-email-chris@bigballofwax.co.nz>

From: Nu?o L?pez Ans?tegui <nunyo at masmedios.com>

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 etc/koha-httpd.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 etc/koha-httpd.conf

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
old mode 100644
new mode 100755
index bc2b4d8..bf8cdc7
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -13,6 +13,7 @@
    ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ScriptAlias /search "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ErrorLog __LOG_DIR__/koha-opac-error_log
+#  CustomLog __LOG_DIR__/koha-opac-access_log combined
 #  TransferLog __LOG_DIR__/koha-opac-access_log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
-- 
1.7.2.2


From chris at bigballofwax.co.nz  Tue Jun  7 08:42:13 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue,  7 Jun 2011 18:42:13 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6078: Request to find
	borrowers without issues overload the server
Message-ID: <1307428933-4422-1-git-send-email-chris@bigballofwax.co.nz>

From: Sophie Meynieux <sophie.meynieux at biblibre.com>

Optimization of the SQL request using NOT EXISTS instead of NOT IN

BibLibre MT5946

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 reports/borrowers_out.pl |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 0a135e1..278e412 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -230,18 +230,12 @@ sub calculate {
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
 
-    my $strqueryfilter = "SELECT DISTINCT borrowernumber FROM  ";
-    $strqueryfilter .= "(SELECT borrowernumber from old_issues WHERE borrowernumber IS NOT NULL ";
-    if ($filters->[1]){
-        $strqueryfilter .= "AND old_issues.timestamp> '$filters->[1]' ";
-    }
-    $strqueryfilter .= "UNION SELECT borrowernumber FROM issues WHERE 1 ";
-    if ($filters->[1]){
-        $strqueryfilter .= "AND issues.timestamp> '$filters->[1]' ";
-    }
-    $strqueryfilter .= ") active_borrowers";
-
-    $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
+    $strcalc .= " AND NOT EXISTS (SELECT * FROM issues WHERE issues.borrowernumber=borrowers.borrowernumber ";
+    $strcalc .= " AND issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]);
+    $strcalc .= ") ";
+    $strcalc .= " AND NOT EXISTS (SELECT * FROM old_issues WHERE old_issues.borrowernumber=borrowers.borrowernumber ";
+    $strcalc .= " AND old_issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]);
+    $strcalc .= ") ";
     $strcalc .= " group by borrowers.borrowernumber";
     $strcalc .= ", $colfield" if ($column);
     $strcalc .= " order by $colfield " if ($colfield);
-- 
1.7.2.2


From chris at bigballofwax.co.nz  Tue Jun  7 09:31:33 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue,  7 Jun 2011 19:31:33 +1200
Subject: [Koha-patches] [Signed Off] [PATCH 1/2] bug 5602: Rewriting the
	package making script Now it is a perl script. Various
	pdebuild flexibility.
Message-ID: <1307431894-4954-1-git-send-email-chris@bigballofwax.co.nz>

From: Srdjan Jankovic <srdjan at catalyst.net.nz>

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 debian/README.build       |   13 ++++
 debian/build-git-snapshot |  171 +++++++++++++++++++++++++++++++++------------
 2 files changed, 138 insertions(+), 46 deletions(-)
 create mode 100644 debian/README.build

diff --git a/debian/README.build b/debian/README.build
new file mode 100644
index 0000000..32a0f5d
--- /dev/null
+++ b/debian/README.build
@@ -0,0 +1,13 @@
+In order to build .deb packages, following debian packages need to be present (installed):
+devscripts
+pbuilder
+dh-make
+fakeroot
+
+As root (or sudo) execute:
+pbuilder create
+
+Executing build-git-snapshot without any arguments will leave package and the rest in some pbuilder dir, eg. /var/cache/pbuilder/result
+It is highly recommended that --buildresult option is used.
+
+The script requires sudo.
diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index 3847024..c3140e7 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -1,64 +1,143 @@
-#!/bin/sh
+#!/usr/bin/perl 
+
+# Copyright 2010 Catalyst IT Ltd.
+#
+# 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.
 #
-# This script will build a .deb from a git snapshot of koha.
-# Don't use it for building actual versions for uploading to Debian.
+# 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.
 #
-# To use:
-# - commit any changes into git
-# - run this script
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Written by Robin Sheat <robin at catalyst.net.nz>
+# Based on an sh version by Lars Wirzenius.
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use POSIX qw/strftime/;
+
+my $buildresult;
+my $distribution='squeeze-dev';
+my $git_checks='all';
+my $version='3.3-1~git';
+my $auto_version=1;
+my $need_help;
+my $debug;
+
+GetOptions(
+    'buildresult|r=s'   => \$buildresult,
+    'distribution|D=s'  => \$distribution,
+    'git-checks|g=s'    => \$git_checks,
+    'version|v=s'       => \$version,
+    'autoversion!'      => \$auto_version,
+    'help|h'            => \$need_help,
+    'debug|d'           => \$debug,
+);
+
+help_and_exit() if $need_help;
+
 
-set -e
+sub sys_command_output {
+    my ($command) = @_;
 
-die()
-{
-    echo "$@"
-    exit 1
+    print "$command\n" if $debug;
+    open COMMAND, "$command |"
+      or die qq{Cannot execute "$command": $!"};
+    return map { chomp; $_ } <COMMAND>;
 }
 
-everything_is_commited()
-{
-    if git status --short | grep -q '^'
-    then
-        return 1
-    else
-        return 0
-    fi
+sub everything_is_committed {
+    my $filter;
+    for ($git_checks) {
+        $_ eq "none"
+          and return 1;
+
+        $_ eq "modified"
+          and $filter = "no",
+              last;
+
+        $_ eq "all"
+          and $filter = "normal",
+              last;
+
+	    help_and_exit("$0: --git-checks/-g must be one of 'all', 'modified', or 'none'");
+    }
+    my $has_changes = grep /^xxx/, sys_command_output("git status --porcelain -u${filter}");
+
+    return !$has_changes;
 }
 
-latest_sha1() {
-    git rev-parse --short=8 HEAD
+sub help_and_exit {
+	my $msg = shift;
+	if ($msg) {
+    	print "$msg\n\n";
+    }
+    print <<EOH;
+This builds Koha deb packages, from a git snapshot. It's not suitable for
+making upstreamable verions, but handy for your own local packages.
+
+Options:
+    --buildresult, -r
+        the location that the resulting .deb, .changes, etc. will be placed in.
+        Default is whatever pdebuild uses.
+    --distribution, -D
+        the distribution value to set in the changelog when editing it. Default
+        is 'squeeze-dev'.
+    --git-checks, -g
+        what level of git checks are run to determine if the working copy is
+        clean enough. One of 'all' (any changes are bad), 'modified' (only
+        tracked files with untracked changes will cause an error), and 'none'
+        (checking git status is skipped totally.) Default is 'all'.
+    --version, -v
+        the version string for the resulting package. Default is '3.3-1~git'.
+    --(no)autoversion
+        whether or not to use the date and git commit ID in the version value.
+        Default is to include it.
+    --debug, -d
+EOH
+    exit;
 }
 
-newversion() {
-    printf '3.5-1~git%s.%s' $(date +%Y%m%d%H%M%S) $(latest_sha1)
+sub latest_sha1 {
+    return sys_command_output("git rev-parse --short=8 HEAD");
 }
 
-adjust_debian_changelog() {
-    dch --force-distribution -D squeeze-dev -v "$1" \
-        "Building git snapshot."
-    dch -r "Building git snapshot."
+sub adjust_debian_changelog {
+    my ($newversion) = @_;
+
+    sys_command_output( qq{dch --force-distribution -D "$distribution" -v "$newversion" "Building git snapshot."} );
+    sys_command_output( qq{dch -r "Building git snapshot."} );
 }
 
-reset_debian_changelog() {
-    git checkout -- debian/changelog
+sub reset_debian_changelog {
+    sys_command_output( qq{git checkout -- debian/changelog} );
 }
 
-build_package() {
-    git archive --format=tar --prefix="koha-$1/" HEAD | 
-        gzip -9 > "../koha_$1.tar.gz"
-    pdebuild $2
+sub build_package {
+    my ($newversion) = @_;
+    sys_command_output( qq{git archive --format=tar --prefix="koha-$newversion/" HEAD | gzip -9 > "../koha_$newversion.tar.gz"} );
+
+    my $pdebuildopts = $buildresult ? "--buildresult $buildresult" : "";
+    sys_command_output( "pdebuild $pdebuildopts" );
 }
 
-if ! everything_is_commited
-then
-    die "cannot build: uncommited changes"
-fi
-
-version="$(newversion)"
-if [ -n "$1" ]
-then
-    pdebuildopts="--buildresult $1"
-fi
-adjust_debian_changelog "$version"
-build_package "$version" "$pdebuildopts"
-reset_debian_changelog
+everything_is_committed() or die "cannot build: uncommited changes";
+
+my $newversion = $auto_version
+  ? sprintf ('%s%s.%s', $version, strftime("+%Y%m%d%H%M%S", localtime), latest_sha1())
+  : $version;
+
+adjust_debian_changelog( $newversion );
+build_package( $newversion );
+reset_debian_changelog();
+
-- 
1.7.2.2


From chris at bigballofwax.co.nz  Tue Jun  7 09:31:34 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue,  7 Jun 2011 19:31:34 +1200
Subject: [Koha-patches] [Signed Off] [PATCH 2/2] Bug 5602: Changes to
	account for the version update.
In-Reply-To: <1307431894-4954-1-git-send-email-chris@bigballofwax.co.nz>
References: <1307431894-4954-1-git-send-email-chris@bigballofwax.co.nz>
Message-ID: <1307431894-4954-2-git-send-email-chris@bigballofwax.co.nz>

From: Robin Sheat <robin at catalyst.net.nz>

This is intended to apply on top of the previous 5602 patch.

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 debian/README.build       |   10 +++++-----
 debian/build-git-snapshot |    7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/README.build b/debian/README.build
index 32a0f5d..9d33726 100644
--- a/debian/README.build
+++ b/debian/README.build
@@ -1,4 +1,5 @@
-In order to build .deb packages, following debian packages need to be present (installed):
+In order to build .deb packages, following debian packages need to be present
+(installed): 
 devscripts
 pbuilder
 dh-make
@@ -7,7 +8,6 @@ fakeroot
 As root (or sudo) execute:
 pbuilder create
 
-Executing build-git-snapshot without any arguments will leave package and the rest in some pbuilder dir, eg. /var/cache/pbuilder/result
-It is highly recommended that --buildresult option is used.
-
-The script requires sudo.
+Executing build-git-snapshot without any arguments will leave package and the
+rest in some pbuilder dir, eg. /var/cache/pbuilder/result It is highly
+recommended that --buildresult option is used.
diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index c3140e7..295b5fa 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -17,7 +17,8 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Written by Robin Sheat <robin at catalyst.net.nz>
+# Written by Robin Sheat <robin at catalyst.net.nz> and
+#   Srdjan Jankovic <srdjan at catalyst.net.nz>
 # Based on an sh version by Lars Wirzenius.
 
 use strict;
@@ -29,7 +30,7 @@ use POSIX qw/strftime/;
 my $buildresult;
 my $distribution='squeeze-dev';
 my $git_checks='all';
-my $version='3.3-1~git';
+my $version='3.5-1~git';
 my $auto_version=1;
 my $need_help;
 my $debug;
@@ -99,7 +100,7 @@ Options:
         tracked files with untracked changes will cause an error), and 'none'
         (checking git status is skipped totally.) Default is 'all'.
     --version, -v
-        the version string for the resulting package. Default is '3.3-1~git'.
+        the version string for the resulting package. Default is '3.5-1~git'.
     --(no)autoversion
         whether or not to use the date and git commit ID in the version value.
         Default is to include it.
-- 
1.7.2.2


From tomascohen at gmail.com  Tue Jun  7 16:30:05 2011
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Tue,  7 Jun 2011 11:30:05 -0300
Subject: [Koha-patches] [PATCH] Bug 6299 - Provide a list of authorized
	values for Relator terms
Message-ID: <1307457005-6441-1-git-send-email-tomascohen@gmail.com>

That's it. I was not sure about fr-FR, please let me know if it is not correct so
I fix it.

Regards
To+
---
 .../mysql/de-DE/optional/marc21_relatorterms.sql   |  227 ++++++++++++++++++++
 .../mysql/de-DE/optional/marc21_relatorterms.txt   |    1 +
 .../data/mysql/en/optional/marc21_relatorterms.sql |  227 ++++++++++++++++++++
 .../data/mysql/en/optional/marc21_relatorterms.txt |    1 +
 .../mysql/fr-FR/2-Optionel/marc21_relatorterms.sql |  227 ++++++++++++++++++++
 .../mysql/fr-FR/2-Optionel/marc21_relatorterms.txt |    1 +
 .../nb-NO/2-Valgfritt/marc21_relatorterms.sql      |  227 ++++++++++++++++++++
 .../nb-NO/2-Valgfritt/marc21_relatorterms.txt      |    1 +
 .../mysql/pl-PL/optional/marc21_relatorterms.sql   |  227 ++++++++++++++++++++
 .../mysql/pl-PL/optional/marc21_relatorterms.txt   |    1 +
 .../mysql/ru-RU/optional/marc21_relatorterms.sql   |  227 ++++++++++++++++++++
 .../mysql/ru-RU/optional/marc21_relatorterms.txt   |    1 +
 .../mysql/uk-UA/optional/marc21_relatorterms.sql   |  227 ++++++++++++++++++++
 .../mysql/uk-UA/optional/marc21_relatorterms.txt   |    1 +
 14 files changed, 1596 insertions(+), 0 deletions(-)
 create mode 100644 installer/data/mysql/de-DE/optional/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/de-DE/optional/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/pl-PL/optional/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/pl-PL/optional/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/ru-RU/optional/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/ru-RU/optional/marc21_relatorterms.txt
 create mode 100644 installer/data/mysql/uk-UA/optional/marc21_relatorterms.sql
 create mode 100644 installer/data/mysql/uk-UA/optional/marc21_relatorterms.txt

diff --git a/installer/data/mysql/de-DE/optional/marc21_relatorterms.sql b/installer/data/mysql/de-DE/optional/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/de-DE/optional/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/de-DE/optional/marc21_relatorterms.txt b/installer/data/mysql/de-DE/optional/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/de-DE/optional/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/en/optional/marc21_relatorterms.sql b/installer/data/mysql/en/optional/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/en/optional/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/en/optional/marc21_relatorterms.txt b/installer/data/mysql/en/optional/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/en/optional/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.sql b/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.txt b/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/fr-FR/2-Optionel/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.sql b/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.txt b/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/nb-NO/2-Valgfritt/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/pl-PL/optional/marc21_relatorterms.sql b/installer/data/mysql/pl-PL/optional/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/pl-PL/optional/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/pl-PL/optional/marc21_relatorterms.txt b/installer/data/mysql/pl-PL/optional/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/pl-PL/optional/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/ru-RU/optional/marc21_relatorterms.sql b/installer/data/mysql/ru-RU/optional/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/ru-RU/optional/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/ru-RU/optional/marc21_relatorterms.txt b/installer/data/mysql/ru-RU/optional/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/ru-RU/optional/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
diff --git a/installer/data/mysql/uk-UA/optional/marc21_relatorterms.sql b/installer/data/mysql/uk-UA/optional/marc21_relatorterms.sql
new file mode 100644
index 0000000..c5b5365
--- /dev/null
+++ b/installer/data/mysql/uk-UA/optional/marc21_relatorterms.sql
@@ -0,0 +1,227 @@
+-- MARC code list for Relators, taken from
+-- http://www.loc.gov/marc/relators/relacode.html
+
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','acp','Art');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','act','Actor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','adp','Adapter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aft','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anl','Analyst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','anm','Animator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ann','Annotator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ant','Bibliographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','app','Applicant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aqt','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arc','Architect');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ard','Artistic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','arr','Arranger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','art','Artist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asg','Assignee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','asn','Associated');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','att','Attributed');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','auc','Auctioneer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aud','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aui','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aus','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','aut','Author');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bdd','Binding');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bjd','Bookjacket');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkd','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bkp','Book');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','blw','Blurb');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bnd','Binder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bpd','Bookplate');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','bsl','Bookseller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ccp','Conceptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','chr','Choreographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clb','Collaborator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cli','Client');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cll','Calligrapher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clr','Colorist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','clt','Collotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmm','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmp','Composer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cmt','Compositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cng','Cinematographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cnd','Conductor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cns','Censor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','coe','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','col','Collector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','com','Compiler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','con','Conservator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cos','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cot','Contestant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cov','Cover');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpc','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpe','Complainant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cph','Copyright');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpl','Complainant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cpt','Complainant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cre','Creator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crp','Correspondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','crr','Corrector');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csl','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','csp','Consultant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cst','Costume');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctb','Contributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cte','Contestee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctg','Cartographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctr','Contractor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cts','Contestee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ctt','Contestee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cur','Curator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','cwt','Commentator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfd','Defendant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dfe','Defendant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dft','Defendant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dgg','Degree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dis','Dissertant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dln','Delineator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnc','Dancer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dnr','Donor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpb','Distribution');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpc','Depicted');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dpt','Depositor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drm','Draftsman');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','drt','Director');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dsr','Designer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dst','Distributor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtc','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dte','Dedicatee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dtm','Data');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dto','Dedicator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','dub','Dubious');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','edt','Editor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','egr','Engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elg','Electrician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','elt','Electrotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','eng','Engineer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','etr','Etcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','evp','Event');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','exp','Expert');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fac','Facsimilist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fld','Field');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','flm','Film');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fmo','Former');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fpy','First');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','fnd','Funder');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','frg','Forger');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','gis','Geographic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','-grt','Graphic');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hnr','Honoree');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','hst','Host');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ill','Illustrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ilu','Illuminator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ins','Inscriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','inv','Inventor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','itr','Instrumentalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ive','Interviewee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ivr','Interviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lbt','Librettist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ldr','Laboratory');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','led','Lead');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lee','Libelee-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lel','Libelee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','len','Lender');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','let','Libelee-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lgd','Lighting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lie','Libelant-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lil','Libelant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lit','Libelant-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lsa','Landscape');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lse','Licensee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lso','Licensor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ltg','Lithographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','lyr','Lyricist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mcp','Music');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfp','Manufacture');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mfr','Manufacturer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mdc','Metadata');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mod','Moderator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mon','Monitor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrb','Marbler');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mrk','Markup');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','msd','Musical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mte','Metal-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','mus','Musician');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','nrt','Narrator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','opn','Opponent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','org','Originator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','orm','Organizer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','oth','Other');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','own','Owner');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pat','Patron');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbd','Publishing');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pbl','Publisher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pdr','Project');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pfr','Proofreader');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pht','Photographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','plt','Platemaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pma','Permitting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pmn','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pop','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppm','Papermaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ppt','Puppeteer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prc','Process');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prd','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prf','Performer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prg','Programmer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prm','Printmaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pro','Producer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prp','Production');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','prt','Printer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pta','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pte','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptf','Plaintiff');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pth','Patent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ptt','Plaintiff-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','pup','Publication');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rbr','Rubricator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rce','Recording');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rcp','Recipient');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','red','Redactor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ren','Renderer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','res','Researcher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rev','Reviewer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rps','Repository');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpt','Reporter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rpy','Responsible');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rse','Respondent-appellee');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsg','Restager');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rsp','Respondent');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rst','Respondent-appellant');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rth','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','rtm','Research');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sad','Scientific');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sce','Scenarist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scl','Sculptor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','scr','Scribe');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sds','Sound');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sec','Secretary');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sgn','Signer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sht','Supporting');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','sng','Singer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spk','Speaker');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spn','Sponsor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','spy','Second');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','srv','Surveyor');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','std','Set');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stl','Storyteller');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stm','Stage');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','stn','Standards');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','str','Stereotyper');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tcd','Technical');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tch','Teacher');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','ths','Thesis');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trc','Transcriber');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','trl','Translator');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyd','Type');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','tyg','Typographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','uvp','University');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','vdg','Videographer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','voc','Vocalist');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wam','Writer');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wdc','Woodcutter');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wde','Wood-engraver');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('MARCRELATOR','wit','Witness');
+
diff --git a/installer/data/mysql/uk-UA/optional/marc21_relatorterms.txt b/installer/data/mysql/uk-UA/optional/marc21_relatorterms.txt
new file mode 100644
index 0000000..ef8264b
--- /dev/null
+++ b/installer/data/mysql/uk-UA/optional/marc21_relatorterms.txt
@@ -0,0 +1 @@
+MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
-- 
1.7.4.1


From lrea at nekls.org  Tue Jun  7 18:48:08 2011
From: lrea at nekls.org (Liz Rea)
Date: Tue,  7 Jun 2011 11:48:08 -0500
Subject: [Koha-patches] [PATCH] Bug 6478 -- add purge_suggestions.pl to the
	crontab.example
Message-ID: <1307465288-28391-1-git-send-email-lrea@nekls.org>

To test:
Verify that there is a listed job for purge_suggestions.pl in the crontab.example
---
 misc/cronjobs/crontab.example |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/misc/cronjobs/crontab.example b/misc/cronjobs/crontab.example
index b43d377..47bb064 100644
--- a/misc/cronjobs/crontab.example
+++ b/misc/cronjobs/crontab.example
@@ -76,3 +76,6 @@ KOHA_CRON_PATH = /usr/share/koha/bin/cronjobs
 
 # clean up databases nightly.  Be sure not to run this with --sessions during a time when the system is in use!
 16 1 * * * $KOHA_CRON_PATH/cleanup_database.pl --sessions --zebraqueue 10
+
+# delete old purchase suggestions weekly. 
+ at weekly	$KOHA_CRON_PATH/purge_suggestions.pl > /dev/null 2>&1
-- 
1.7.2.5


From januszop at gmail.com  Tue Jun  7 21:32:17 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Tue,  7 Jun 2011 22:32:17 +0300
Subject: [Koha-patches] [PATCH] Bug 6480 - Koha produces a lot of apache
	logs for UNIMARC
Message-ID: <1307475137-29838-1-git-send-email-januszop@gmail.com>

For Koha with UNIMARC a lot of entries in apache log lines are produced.

In the patch, corrections to the GetCOinSBiblio function has been introduces,
in the UNIMARC section: (i.e. || '' at the end of lines that can create this
problem) -- analogous as it is in the MARC21 section.
---
 C4/Biblio.pm |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 3c8936b..3d1cf3e 100755
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1175,8 +1175,8 @@ sub GetCOinSBiblio {
     if ( C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 
         # Setting datas
-        $aulast  = $record->subfield( '700', 'a' );
-        $aufirst = $record->subfield( '700', 'b' );
+        $aulast  = $record->subfield( '700', 'a' ) || '';
+        $aufirst = $record->subfield( '700', 'b' ) || '';
         $oauthors = "&amp;rft.au=$aufirst $aulast";
 
         # others authors
@@ -1189,10 +1189,10 @@ sub GetCOinSBiblio {
           ( $mtx eq 'dc' )
           ? "&amp;rft.title=" . $record->subfield( '200', 'a' )
           : "&amp;rft.title=" . $record->subfield( '200', 'a' ) . "&amp;rft.btitle=" . $record->subfield( '200', 'a' );
-        $pubyear   = $record->subfield( '210', 'd' );
-        $publisher = $record->subfield( '210', 'c' );
-        $isbn      = $record->subfield( '010', 'a' );
-        $issn      = $record->subfield( '011', 'a' );
+        $pubyear   = $record->subfield( '210', 'd' ) || '';
+        $publisher = $record->subfield( '210', 'c' ) || '';
+        $isbn      = $record->subfield( '010', 'a' ) || '';
+        $issn      = $record->subfield( '011', 'a' ) || '';
     } else {
 
         # MARC21 need some improve
-- 
1.7.2.5


From chrisc at catalyst.net.nz  Wed Jun  8 03:50:39 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed,  8 Jun 2011 13:50:39 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6478 -- add
	purge_suggestions.pl to the crontab.example
Message-ID: <1307497839-28028-1-git-send-email-chrisc@catalyst.net.nz>

From: Liz Rea <lrea at nekls.org>

To test:
Verify that there is a listed job for purge_suggestions.pl in the crontab.example

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 misc/cronjobs/crontab.example |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/misc/cronjobs/crontab.example b/misc/cronjobs/crontab.example
index b43d377..47bb064 100644
--- a/misc/cronjobs/crontab.example
+++ b/misc/cronjobs/crontab.example
@@ -76,3 +76,6 @@ KOHA_CRON_PATH = /usr/share/koha/bin/cronjobs
 
 # clean up databases nightly.  Be sure not to run this with --sessions during a time when the system is in use!
 16 1 * * * $KOHA_CRON_PATH/cleanup_database.pl --sessions --zebraqueue 10
+
+# delete old purchase suggestions weekly. 
+ at weekly	$KOHA_CRON_PATH/purge_suggestions.pl > /dev/null 2>&1
-- 
1.7.4.1


From robin at catalyst.net.nz  Wed Jun  8 06:13:02 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed,  8 Jun 2011 16:13:02 +1200
Subject: [Koha-patches] [PATCH] Bug 6482 - allow the mysql details to be
	changed during koha-create
Message-ID: <1307506382-20023-1-git-send-email-robin@catalyst.net.nz>

This allows the database details (username and database name in
particular) to be modified in between a koha-create --request-db and
--populate-db. Most useful when you discover that the username is too
long or something. Now, when populating the database, the connection
information is reloaded from the koha-conf.xml rather than being
generated from the instance name.
---
 debian/scripts/koha-create |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e3c73fc..80c9cac 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -54,10 +54,16 @@ getmysqlhost() {
 }
 
 getinstancemysqlpassword() {
-    sed -n '/<pass>/s:.*>\(.*\)</pass>.*:\1:p' \
-        "/etc/koha/sites/$1/koha-conf.xml"
+    xmlstarlet sel -t -v 'yazgfs/config/pass' "/etc/koha/sites/$1/koha-conf.xml"
 }
 
+getinstancemysqluser() {
+    xmlstarlet sel -t -v 'yazgfs/config/user' "/etc/koha/sites/$1/koha-conf.xml"
+}
+
+getinstancemysqldatabase() {
+    xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
+}
 
 # Set defaults and read config file, if it exists.
 DOMAIN=""
@@ -124,7 +130,7 @@ then
     koha-create-dirs "$name"
 
     # Generate Zebra database password.
-    zebrapwd="$(pwgen -1)"
+    zebrapwd="$(pwgen -s 12 1)"
     # Set up MySQL database for this instance.
     if [ "$op" = create ]
     then
@@ -134,7 +140,7 @@ CREATE USER \`$mysqluser\`@'%' IDENTIFIED BY '$mysqlpwd';
 GRANT ALL PRIVILEGES ON \`$mysqldb\`.* TO \`$mysqluser\`;
 FLUSH PRIVILEGES;
 eof
-    fi
+    fi #`
 
     # Generate and install Apache site-available file and log dir.
     generate_config_file apache-site.conf.in \
@@ -183,6 +189,11 @@ fi
 
 if [ "$op" = create ] || [ "$op" = populate ]
 then
+    # Re-fetch the passwords from the config we've generated, allows it
+    # to be different from what we set, in case the user had to change
+    # something.
+    mysqluser=$(getinstancemysqluser $name)
+    mysqldb=$(getinstancemysqldatabase $name)
     # Use the default database content if that exists.
     if [ -e "$DEFAULTSQL" ]
     then
@@ -205,7 +216,7 @@ UPDATE borrowers
 SET password = '$staffdigest' 
 WHERE borrowernumber = 3;
 eof
-
+        #`
         echo "staff user password is '$staffpass' but keep that secret"
 
         # Upgrade the database schema, just in case the dump was from an 
-- 
1.7.4.1


From colin.campbell at ptfs-europe.com  Wed Jun  8 10:06:36 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed,  8 Jun 2011 09:06:36 +0100
Subject: [Koha-patches] [Signed Off] Bug 6305: Subscriptions can not be
	edited
Message-ID: <1307520396-2981-1-git-send-email-colin.campbell@ptfs-europe.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

This seems to fix the problem with editing existing subscriptions. Please test.

Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
---
 .../prog/en/includes/serials-toolbar.inc           |    4 +-
 .../prog/en/modules/serials/subscription-add.tt    |   28 ++++++++++----------
 serials/subscription-add.pl                        |   12 ++++----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index a330601..3e22038 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -18,7 +18,7 @@
     [% IF ( subscriptionid ) %]
 	    var editmenu = [
 	        [% IF ( CAN_user_serials_edit_subscription ) %]
-		    { text: _("Edit Subscription"),  [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=[% subscriptionid %]" },
+		    { text: _("Edit Subscription"),  [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]" },
 		[% END %]
 	        [% IF ( CAN_user_serials_create_subscription ) %]
 		    { text: _("Edit as New (Duplicate)"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]" },
@@ -69,7 +69,7 @@ onclick: {fn:function(){popup([% subscriptionid %])}}
 
 	    [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
 		[% UNLESS ( cannotedit ) %]
-		    <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=[% subscriptionid %]">Edit</a></li>
+		    <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit</a></li>
 		[% END %]
 	    [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index b20ced4..d5d1615 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modname ) %][% bibliotitle |html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
+<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle |html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 
@@ -931,7 +931,7 @@ $(document).ready(function() {
 	}
 	);
    //  $(".widelabel").attr("width", "300px");  // labels stay skinny in IE7 anyway.
-[% IF ( modname ) %]
+[% IF ( modify ) %]
     set_num_pattern_from_template_vars();
     [% IF ( hemisphere ) %]
 	is_hemisphere = [% hemisphere %] ;
@@ -952,15 +952,15 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modname ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>
 
 <div id="doc3" class="yui-t7">
    
    <div id="bd">
-<h1>[% IF ( modname ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %]</h1>
+<h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %]</h1>
    <div class="yui-g">
     <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl">
-[% IF ( modname ) %]
+[% IF ( modify ) %]
         <input type="hidden" name="op" value="modsubscription" />
         <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
 [% ELSE %]
@@ -988,7 +988,7 @@ $(document).ready(function() {
                 (<input type="text" name="title" value="[% bibliotitle %]" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span>
                <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a>
 		    [% IF ( CAN_user_editcatalogue ) %] 
-		       [% IF ( modname ) %]
+		       [% IF ( modify ) %]
 		       | <a href="#" onclick="addbiblioPopup([% bibnum %]); return false;">Edit biblio</a>
 		       [% ELSE %]
 		       | <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a>
@@ -1107,10 +1107,10 @@ $(document).ready(function() {
     <ol>
         <li>
            <label for="acqui_date"> First issue publication date:</label>
-                [% UNLESS ( modname ) %]<img src="[% themelang %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %]
-                <input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" [% IF ( modname ) %]disabled="disabled"[% END %] style="border-width: 0px;"  />
+                [% UNLESS ( modify ) %]<img src="[% themelang %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %]
+                <input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" [% IF ( modify ) %]disabled="disabled"[% END %] style="border-width: 0px;"  />
         </li>
-           [% IF ( modname ) %]<li><label for="next_acqui_date"> Next issue publication date:</label>
+           [% IF ( modify ) %]<li><label for="next_acqui_date"> Next issue publication date:</label>
                 <img src="[% themelang %]/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
                 <input type="text" name="nextacquidate" value="[% nextacquidate %]" size="13" maxlength="10" id="next_acqui_date" style="border-width: 0px;"  />
                 </li>[% END %]
@@ -1118,9 +1118,9 @@ $(document).ready(function() {
         <li><!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
-                        inputField      :   "[% IF ( modname ) %]next_[% END %]acqui_date",
+                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
                         ifFormat       :   "[% DHTMLcalendar_dateformat %]",
-                        button         :   "[% IF ( modname ) %]next_[% END %]acqui_button",
+                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_button",
                         align          :   "Tl",
                         onUpdate        :    function(cal) { 
                                                              irregular_issues.weeks = getWeeksArray(cal.date);
@@ -1134,9 +1134,9 @@ $(document).ready(function() {
                                                         } 
                         });
                     Calendar.setup({
-                        inputField      :   "[% IF ( modname ) %]next_[% END %]acqui_date",
+                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
                         ifFormat       :   "[% DHTMLcalendar_dateformat %]",
-                        button         :   "[% IF ( modname ) %]next_[% END %]acqui_date",
+                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_date",
                         align          :   "Tl",
                         onUpdate        :    function(cal) { irregular_issues.weeks = getWeeksArray(cal.date);
                                                             irregular_issues.firstissue = cal.date;
@@ -1404,7 +1404,7 @@ $(document).ready(function() {
                 </tr>
                 <tr>
                     <td>
-                        [% IF ( modname ) %]
+                        [% IF ( modify ) %]
                             Last value
                         [% ELSE %]
                             Begins with
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 7fcccdf..9acee7b 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -43,7 +43,7 @@ my @budgets;
 
 # Permission needed if it is a modification : edit_subscription
 # Permission needed otherwise (nothing or dup) : create_subscription
-my $permission = ($op eq "mod") ? "edit_subscription" : "create_subscription";
+my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription";
 
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tmpl",
@@ -66,12 +66,12 @@ my $subs;
 my $firstissuedate;
 my $nextexpected;
 
-if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
+if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') {
 
     my $subscriptionid = $query->param('subscriptionid');
     $subs = GetSubscription($subscriptionid);
 ## FIXME : Check rights to edit if mod. Could/Should display an error message.
-    if ($subs->{'cannotedit'} && $op eq 'mod'){
+    if ($subs->{'cannotedit'} && $op eq 'modify'){
       carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
       print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
     }
@@ -91,7 +91,7 @@ if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
     letter_loop($subs->{'letter'}, $template);
     $nextexpected = GetNextExpected($subscriptionid);
     $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
-    $subs->{nextacquidate} = $nextexpected->{planneddate}->output()  if($op eq 'mod');
+    $subs->{nextacquidate} = $nextexpected->{planneddate}->output()  if($op eq 'modify');
     unless($op eq 'modsubscription') {
 		foreach my $length_unit qw(numberlength weeklength monthlength){
 			if ($subs->{$length_unit}){
@@ -107,7 +107,7 @@ if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
                     $op => 1,
                     "subtype_$sub_on" => 1,
                     sublength =>$sub_length,
-                    history => ($op eq 'mod'),
+                    history => ($op eq 'modify'),
                     "periodicity".$subs->{'periodicity'} => 1,
                     "numberpattern".$subs->{'numberpattern'} => 1,
                     firstacquiyear => substr($firstissuedate,0,4),
@@ -160,7 +160,7 @@ if ($op eq 'addsubscription') {
         }
     $template->param(subtype => \@sub_type_data);
 
-    letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'mod');
+    letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify');
 
     my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
     if (defined $new_biblionumber) {
-- 
1.7.5.2


From colin.campbell at ptfs-europe.com  Wed Jun  8 10:12:13 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed,  8 Jun 2011 09:12:13 +0100
Subject: [Koha-patches] [Signed Off] Bug 6305: Copy enumchron into created
	serial item
Message-ID: <1307520733-11151-1-git-send-email-colin.campbell@ptfs-europe.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Should work for normal and supplemental issues.

Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
---
 .../prog/en/modules/serials/serials-edit.tt        |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 145166d..75319b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -287,7 +287,7 @@ $(document).ready(function() {
         [% FOREACH item IN serialslis.items %]
         <div id="item[% item.serialid %][% item.countitems %]" class="items">
         <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
+               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
                               
                 <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
                 [% iteminformatio.marc_value %]
@@ -297,7 +297,7 @@ $(document).ready(function() {
                 <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
                 <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
                 [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
+                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
                 [% END %]
         
             </div></li>
@@ -326,7 +326,7 @@ $(document).ready(function() {
             <input type="hidden" name="biblionumber" value="[% newserialloo.biblionumber %]" />
             <input type="hidden" name="itemcount" value="[% newserialloo.issuesatonce %]" />
             <input type="hidden" name="user" value="[% newserialloo.librarian %]" />
-            Supplemental Issue <input type="text" name="serialseq" value="" size="20" maxlength="100" onchange="if (this.value!=''){unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')} else {HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')}" />
+            Supplemental Issue <input type="text" name="serialseq" id="serialseq[% newserialloo.serialid %]" value="" size="20" maxlength="100" onchange="if (this.value!=''){unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')} else {HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')}" />
         </td>
         <td>
             <input type="text" name="publisheddate" value="[% newserialloo.publisheddate %]" size="10" maxlength="15" />
@@ -335,7 +335,8 @@ $(document).ready(function() {
             <input type="text" name="planneddate" id="supexpecteddate" value="[% newserialloo.planneddate %]" size="10" maxlength="15" />
         </td>
         <td>
-            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2 || this.value==7){changeDate2('[% newserialloo.arriveddate %]')} else {changeDate2('[% newserialloo.planneddate %]')}" >
+            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]','[% newserialloo.serialid %]'); changeDate2('[% newserialloo.arriveddate %]')} else if (this.value==7){changeDate('[% newserialloo.arriveddate %]')} else { HideItems('items'+'[% newserialloo.subscriptionid %]'+[% newserialloo.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate2('[% serialslis.planneddate %]')}" >
+
                     <option value="">----</option>
   [% IF ( newserialloo.status1 ) %]
                     <option value="1" selected="selected">Expected</option>
@@ -389,7 +390,7 @@ $(document).ready(function() {
           <div class="cataloguing_additem_itemlist">
         <div id="item[% newserialloo.serialid %][% newserialloo.countitems %]" class="items">
         <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li>
-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
+               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
    
                 <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
                 [% iteminformatio.marc_value %]
@@ -399,7 +400,7 @@ $(document).ready(function() {
                 <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
                 <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
                 [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
+                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
                 [% END %]
         </div>
        </li>[% END %]</ol>
-- 
1.7.5.2


From koha at ricmarques.net  Wed Jun  8 13:44:36 2011
From: koha at ricmarques.net (Ricardo Dias Marques)
Date: Wed, 8 Jun 2011 12:44:36 +0100
Subject: [Koha-patches] [PATCH] Updating INSTALL.opensuse file with the
	changes by Freek de Kruijf
Message-ID: <1307533476-2705-1-git-send-email-koha@ricmarques.net>

Freek de Kruijf (from @opensuse.org) has adapted the installation
guide (that I - Ricardo Dias Marques - had created) about installing
"Koha 3.0.0 in openSUSE 11.0" and he kindly updated it with the
information about installing the same version of Koha (3.0.0),
but on a more recent version of openSUSE (openSUSE 11.3 instead
of openSUSE 11.0).

He also has put his version on the Koha Wiki:

Koha 3.0.0 on openSUSE 11.3
http://wiki.koha-community.org/wiki/Koha_3.0.0_on_openSUSE_11.3

This commit updates the INSTALL.opensuse to have the content of
that wiki page (last modified on 16-Oct-2010), changing only
things that are related to converting the format from a wiki
page to text format (replacing some HTML tags by some markers
and replacing screenshots by their descriptions).

This commit may be applied to the "master" branch and it can
also be "cherry-picked" to the "3.2.x" branch.
---
 INSTALL.opensuse | 2331 ++++++++++--------------------------------------------
 1 files changed, 397 insertions(+), 1934 deletions(-)

diff --git a/INSTALL.opensuse b/INSTALL.opensuse
index 2ffb2fc..f80fe4b 100644
--- a/INSTALL.opensuse
+++ b/INSTALL.opensuse
@@ -1,6 +1,7 @@
-====== Installation Guide for Installing Koha 3 on openSUSE 11 ======
+= Installation Guide for Installing Koha 3.0.0 on openSUSE 11.3 =
 
-Original version created by Ricardo Dias Marques - koha at ricmarques.net
+Original version for openSUSE 11.0 created by Ricardo Dias Marques - koha at ricmarques.net
+Version for openSUSE 11.3 adapted by Freek de Kruijf - freek -at- opensuse -dot- org
 
 No liability for the contents of this document can be accepted.
 
@@ -8,32 +9,27 @@ Feedback/bug reports: Koha Developer's List:
 
 http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
 
-This document last modified: 02 December 2008
+This document last modified: 15 Oct 2010
 
-
-===== Installation Instructions =====
+== Installation Instructions ==
 
 This document was prepared in order to help you discover (or test) Koha (Integrated Library System).
 
 The installation of Linux system described below is a basic, it is not designed for a production server (e.g., security, load balancing ... are not described).
 
-This document describes the different stages of installing the software Koha 3 on the openSUSE 11 Linux distribution 
-in a "new" computer, that is, a computer that will have its hard disk contents COMPLETELY ERASED to install openSUSE and Koha!
+This document describes the different stages of installing the software Koha 3 on the openSUSE 11.3 Linux distribution in a "new" computer, the author uses a VirtualBox virtual machine, that is, a virtual computer that will have its virtual hard disk contents COMPLETELY ERASED to install openSUSE and Koha!
 
-In this example, it's assumed that your server gets an IP address by DHCP that will be later changed to 192.168.0.2. 
+In this example, the virtual machine uses a bridged network connection, which mimics a separate computer in the local network, it's assumed that your server gets an IP address by DHCP that later will be changed to 192.168.1.16. 
 
 You'll have to change this to the real IP address that your machine should get (or use DHCP, if that's the case).
 
-This tutorial assumes a Koha installation that does NOT use Zebra ("Zebra is a high-performance, general-purpose structured text indexing and retrieval engine" - http://www.indexdata.dk/zebra/). Additional steps would be required to set up Zebra for Koha.
-
-==== LINUX System Installation ====
+This tutorial assumes a Koha installation that does NOT use Zebra ("Zebra is a high-performance, general-purpose structured text indexing and retrieval engine" - http://www.indexdata.dk/zebra/). Additional steps would be required to set up Zebra for Koha, however it will be installed.
 
+=== LINUX System Installation ===
 
-Download openSUSE 11 DVD at: 
-http://software.opensuse.org/
-
-Place the DVD in the drive and restart the machine.
+Download openSUSE 11.3 DVD from [http://software.opensuse.org/ here].
 
+Place the DVD in the drive and restart the machine. In the case of a virtualmachine the iso image is still on the disc and you connect it as a DVD to the virtual machine.
 
 After the "Welcome" screen, you'll get a First menu, with the following options:
 
@@ -51,77 +47,66 @@ Firmware Test
 Memory Test
 ----
 
+You may want to change the screen size to 1024 x 768 by pressing F3.
 Choose "Installation" (second command)
 
-
-=== "Initializing" screen ===
+==== "Initializing" screen ====
 
 (Dialog box appears saying "Probing Mouse")
 
-
-=== "Welcome" screen ===
+==== "Welcome" screen ====
 
 You'll see two Dropdown Lists: "Language" and "Keyboard Layout"
 
 This depends of your place and preference, naturally. 
-I live in Portugal, so I want a Portuguese Keyboard Layout but I prefer an Operating System in English. 
-So I leave the default option selected for "Language" (English (US)) 
-and change "Keyboard Layout" to "Portuguese".
+I live in The Netherlands, and we use the English (US) Keyboard Layout but I prefer an Operating System in English. 
+So I leave the default option selected for "Language"  and "Keyboard Layout" to (English (US)).
 
 Check the "I Agree to the License Terms" checkbox (under the "License Agreement" textbox).
 
 Click the "Next" button.
 
-
-
-=== "System Probing" screen ===
-
+==== "System Probing" screen ====
 
 [just watch it...]
 
-
-
-=== "Installation Mode" screen ===
-
+==== "Installation Mode" screen ====
 
 Leave "New Installation" radio button checked
 
-Click the "Next" button
+I prefer not to have the "Automatic Configuration" so this option is unchecked.
+It gives you the possibility to specify the name of the system and the network setup.
 
+Click the "Next" button
 
-=== "Initializing" screen ===
-
+==== "Initializing" screen ====
 
 [just watch it...]
 
+==== "Clock and Time Zone" screen ====
 
+I do this work in Yemen, so I select the following options:
 
+"Region" listbox: click on "Asia"
 
-=== "Clock and Time Zone" screen ===
-
-
-Again, I live in Portugal, so I select the following options:
-
-"Region" listbox: click on "Europe"
-
-"Time Zone" listbox: click on "Portugal"
+"Time Zone" listbox: click on "Aden"
 
 I leave the "Hardware Clock Set To UTC" checkbox checked.
 
 Click the "Next" button
 
+==== "Desktop Selection" screen ====
 
-=== "Desktop Selection" screen ===
-
-
-You should see four radio buttons: "GNOME", "KDE 4.0", "KDE 3.5" and "Other".
+You should see three radio buttons: "GNOME Desktop", "KDE Desktop" and "Other".
 
 Click on the "Other" radio button.
 
-Three radio buttons should become visible then:
+Four radio buttons should become visible then:
 
 "XFCE Desktop"
 
+"LXDE Desktop"
+
 "Minimal X Window"
 
 "Minimal Server Selection (Text Mode)"
@@ -130,26 +115,20 @@ click on this last "Minimal Server Selection (Text Mode)" radio button.
 
 Click the "Next" button
 
+==== "Suggested Partitioning" screen ====
 
-
-=== "Suggested Partitioning" screen ===
-
-
-Partitioning choices are really up to you. In this example, I will create a 9 GB / ("root") partition and a 712 Swap Megs partition.
+Partitioning choices are really up to you. In this example, I started with a 8 GB virtual disc and I will create a 1000 MB swap partition and the rest is the root "/" partition.
 
 So, to do this I click on the "Create Partition Setup..." button.
 
-=== "Preparing Hard Disk: Step 1" screen ===
-
+===== "Preparing Hard Disk: Step 1" screen =====
 
 I click on the first radio button:
-"1: 1.IDE 10.0 GB,/dev/sda"
+"1: 1.IDE 8.0 GB,/dev/sda"
 
 I click the "Next" button
 
-
-=== "Preparing Hard Disk: Step 2" screen ===
-
+===== "Preparing Hard Disk: Step 2" screen =====
 
 I uncheck the "Propose separate Home Partition" checkbox.
 
@@ -157,21 +136,17 @@ I click the "Next" button.
 
 This takes me back to the Suggested Partitioning screen.
 
-
-=== "Suggested Partitioning" screen ===
-
+===== "Suggested Partitioning" screen =====
 
 In my case, I now have this:
 
-- Create swap partition /dev/sda1 (760.8 MB)
+- Create swap volume /dev/sda1 (1004.06 MB)
 
-- Create root partition /dev/sda2 (9.2 GB with ext3)
+- Create root volume /dev/sda2 (7.02 GB) with ext4
 
 I click the "Next" button.
 
-
-=== "Create New User" screen ===
-
+==== "Create New User" screen ====
 
 I use this screen to create a regular user.
 
@@ -185,30 +160,23 @@ Confirm Password:
 
 I uncheck the "Use this password for System Administrator" checkbox.
 
+I check the "Receive System Mail"
+
 I uncheck the "Automatic Login" checkbox.
 
 I click the "Next" button (you may be "nagged" with a dialog box by the YAST2 installer warning that you selected a password that it considers to be too simple. Click "Yes" to keep the password you chose, or "No" to change it).
 
-
-
-
-
-=== Password for the System Administrator "root" screen ===
-
+==== Password for the System Administrator "root" screen ====
 
 Enter your password (in the "Password for root User" text box) and repeat it (in the "Confirm Password" text box).
 
-Click the "Accept" button to return to the "Installation Settings" screen.
-
-
-=== "Installation Settings" screen ===
+Click the "Next" button to proceed to the "Installation Settings" screen.
 
+==== "Installation Settings" screen ====
 
 Click on the "Software" link
 
-
-=== "Software Selection and System Tasks" screen ===
-
+==== "Software Selection and System Tasks" screen ====
 
 Scroll down the listbox (that begins with the "Base Technologies" group) until you find the "Server Functions" group.
 
@@ -216,179 +184,207 @@ In that "Server Functions" group click on the "Web and LAMP Server" checkbox (to
 
 Click on the "OK" button to return to "Installation Settings"
 
-
-
-=== "Installation Settings" screen ===
-
+==== "Installation Settings" screen ====
 
 Click on the "Install" button (placed in the same place where usually appear the "Accept" or "Next" button).
 
 You should see a "Confirm Installation" dialog box. Click on the "Install" button of that dialog box.
 
-
-=== "Preparing Your Hard Disk" screen ===
-
+==== "Preparing Your Hard Disk" screen ====
 
 [just watch it...]
 
-
-=== "Deploying Installation Images" screen ===
-
+==== "Deploying Installation Images" screen ====
 
 [just watch it... ]
 
-
-
-=== "Package Installation" screen ===
-
-
+==== "Package Installation" screen ====
 
 [just watch it... or click on the "Details" tab if you want to see what packages are being installed.]
 
-
-=== "Finishing Basic Installation" screen ===
-
+==== "Finishing Basic Installation" screen ====
 
 [just watch it... ]
 
 After some time you'll see a dialog box warning that the system will reboot in 10 seconds.
 
+==== After reboot ====
 
+Leave "Boot from Hard Disk" selected and press ENTER
 
-=== After reboot ===
+You'll have to wait a while (or press ESC to see what the operating system is "doing"). After some moments, you'll be taken to the "Yast2 - installation @ Linux" screen (a text installer).
 
+On the screen you will see Hostname and Domain Name with a textbox below.
+The cursor is in the textbox below Hostname.
+Press the Backspace to delete the name there and insert the name of your system, e.g. koha-server.
+Pres Tab and Backspace to delete "site" and enter the domain name, e.g. "univ.org".
+Press Tab go to Change Hostname via DHCP en press Space to remove the "x".
+Leave the "x" in Assign Hostname to Loopback IP.
+Press <Alt>+N to activate "Next". Now you enter:
 
-Leave "Boot from Hard Disk" selected and click ENTER
+==== Network Configuration ====
 
-You'll have to wait a while (or press ESC to see what the operating system is "doing"). After some moments, you'll 
-be taken to the "Yast2 - installation @ Linux" screen (a text installer).
+Press ALT+C to Change Network Settings. Use the Arrow Keys to Highlight "Firewall" and press RETURN.
+Proceed to Firewall and press RETURN. Go to "Allowed Services" and press RETURN. Press TAB several times to highlight "HTTP Server".
+Press ALT+A to add HTTP Server to the list. Press ALT+S to choose the next Service to Allow.
+Press the Down Arrow and a drop down box will appear and press the Down Arrow several times to select Secure Shell Server and press RETURN.
+Press ALT+A to Add.
+We also need port 8080 for the management of Koha to be open, so press ALT+D to activate (Advanced...).
+Press ALT+T to go to TCP Ports and enter 8080 in the textbox.
+Pressing Alt+O for OK, brings you back to the Firewall Configuration.
+Pressing Alt+O for OK, brings you back to Network Configuration, but now you see the SSH port is open, the 8080 port is not shown.
+Press Alt+N for Next, which brings you to: Saving Network Configuration and finally to:
 
+==== Test Internet Connection ====
 
-=== "Writing the System Configuration" screen ===
+Press RETURN to activate Next and do the test.
+If all is well you should see "Test Result: Success".
+Press RETURN to activate Next.
+Now the meta data of some repositories will be downloaded and the next screen will appear:
 
+==== Online Update ====
 
-[just watch it... ]
+Here you can choose to do an online update or not.
+Press RETURN to activate Next and the update will be done.
+In my case the update even replaced the kernel. Press ALT+A to Accept the update.
+After that you press RETURN to activate Next.
+A warning may appear saying that the system will reboot.
 
-After a while you'll see a prompt:
-|--------------------
-Welcome to openSUSE 11.0 (i586) - Kernel 2.6.25.4-8-default (tty1)
+You will see the first screen of booting of the DVD again, but again you choose Boot from Hard Disk, which will also happen when you do not do anything.
 
-linux-3r10 login:
-|--------------------
+After that you will see the normal system boot screen and you do not need to do anything, but you may press RETURN to speed up the start of booting from the disc.
+In my case, after booting, the installtion went on and showed a screen of the YaST2 Package Manager showing the Release Notes.
+Press RETURN to continue.
+Now a screen asking about Hardware Configuration appeared. Press RETURN to continue.
 
-You may now login with your "root" user.
+Next a screen appears showing Installation Completed.
+Press RETURN to continue and you will see the startup log messages and at the end the following:
 
+|--------------------
+Welcome to openSUSE 11.3 "Teal" - Kernel 2.6.34.7-0.3-desktop (tty1)
 
+koha-server login:
+|--------------------
 
+You may now login with your "root" user.
 
 ==== Changing the Hostname and Domain Name ====
  
 
-I want to change my hostname, domain name and switch from DHCP to a Static IP address.
+Maybe you want to change the hostname, domain name and switch from DHCP to a Static IP address.
+Changing the hostname and domain name will not be shown here, because we assume that was done according to your whishes during installation.
 
-So, the first thing I do, is to run yast (the setup tool) by entering the yast command in the command prompt:
+This is how you can do it. You give the command yast (the setup tool) on the command prompt:
 |--------------------
-linux-3r10:~ # yast
+koha-server:~ # yast
 |--------------------
 
 Yast should appear.
 
-On the listbox of the left hand side select "Network Devices" (press TAB to turn focus on that listbox, and press the down arrow key several times to reach it). Then, on the listbox of the right hand side, select "Network Settings" (you'll have again to press TAB to turn focus on that listbox, and press the down arrow key several times to reach it).
+On the listbox of the left hand side select "Network Devices" (press TAB to turn focus on that listbox, and press the down arrow key several times to reach it).
+Then, on the listbox of the right hand side, select "Network Settings" (you'll have again to press TAB to turn focus on that listbox, and press the down arrow key several times to reach it).
 
 Press the ENTER key.
 
-
-=== "Initializing Network Configuration" screen ===
-
+==== "Initializing Network Configuration" screen ====
 
 [just watch it...]
 
-=== "Network Settings" screen ===
-
+==== "Network Settings" screen ====
 
-I want to disable IPv6, so I first go to the "Global Options" section (by pushing the key combination ALT+G to press the "G" letter in Global Options that is highlighted). In the next screen, I push ALT+E to uncheck the "Enable IPv6" checkbox. I'll get a dialog box with a Warning saying that "To apply this change a reboot is needed.". I just press ENTER on that dialog box, but I do NOT reboot (at least not yet). 
+I want to disable IPv6, so I first go to the "Global Options" section (by pushing the key combination ALT+G to press the "G" letter in Global Options that is highlighted).
+In the next screen, I push ALT+E to uncheck the "Enable IPv6" checkbox.
+I'll get a dialog box with a Warning saying that "To apply this change a reboot is needed.".
+I just press ENTER on that dialog box, but I do NOT reboot (at least not yet). 
 
-Then I press Alt+O to go to the "Overview" (still in "Network Settings"). Then I press ALT+i to "Edit" the information for this Network Card.
-
-=== "Network Card Setup" screen ===
+Then I press Alt+V to go to the "Overview" (still in "Network Settings").
+Then I press ALT+I to "Edit" the information for this Network Card.
 
+==== "Network Card Setup" screen ====
 
 I check the "Statically assigned IP Address" checkbox, and enter the following info for "IP Address", "Subnet Mask" and "Hostname" (you should use the values defined by your network administrator):
 
-IP Address: 192.168.0.2
+IP Address: 192.168.1.16
 Subnet Mask: 255.255.255.0
-Hostname: myhost
+Hostname: koha-server.univ.org
 
 Then I press ALT+N to click the "Next" button. After a few seconds, I will be taken again to the "Network Settings" screen.
 
+==== "Network Settings" screen ====
 
-=== "Network Settings" screen ===
-
-
-I press ALT+s to go to the "Hostname/DNS" screen.
-
-I check the "Change /etc/resolv.conf manually" checkbox and enter the IP Address of my DNS Server in the "Name Server 1" text box:
+I press ALT+S to go to the "Hostname/DNS" screen.
 
+Press ALT+I and the Arrow Key to choose "Only Custom Policy" by pressing Enter, press Tab to choose "Custom Policy Rule" and select "STATIC".
+Enter the IP Address of the Domain Name Server in the "Name Server 1" text box:
 
-Name Server 1: 192.168.0.1
+Name Server 1: 192.168.1.254
 
-Then I press ALT+u to go to the "Routing" configuration.
-
-=== "Routing" screen ===
+Then I press ALT+U to go to the "Routing" configuration.
 
+==== "Routing" screen ====
 
 In the "Default Gateway" text box, I enter the IP Address of my Default Gateway:
 
-Default Gateway: 192.168.0.1
-
-Then I press ALT+F to Finish
-
-
+Default Gateway: 192.168.1.254
 
-=== "Saving Network Configuration" screen ===
+Then I press ALT+O for OK to Finish
 
+==== "Saving Network Configuration" screen ====
 
 [just watch it...]
 
-
 After a few seconds, you should be taken back to the "YaST2 Control Center" screen.
+Press ALT+Q to Quit YaST2.
 
+==== Making the ssh-daemon to start at system start ====
 
+We need a ssh-daemon that does not accept Environment parameters from the remote user.
+So we have to disable accepting these.
+For this you use vim to change the config file of sshd.
 
+|--------------------
+# cp /etc/ssh/sshd_config /etc/ssh/sshd_config.ORIG
+# vi /etc/ssh/sshd_config
+|--------------------
 
-==== Enabling access to SSH (Secure Shell) and Apache2 (Web Server) ====
-
-I want to administer remotely this server with a SSH (Secure Shell) client. So, while still in the "YaST2 Control Center, I will enable SSH in the Firewall (running by default). In the listbox of the left hand side, I select "Security and Users" and then, on the listbox of the right side, I select "Firewall" (first option) and press the ENTER key.
-
-=== "yast2 - firewall" screen ===
-
-In the list box of the left side, I select "Allowed Services" and press ENTER.
-
-Then, on the "Service to Allow" dropdown list (on the right side), I leave the "Apache 2" option selected and press "ALt+A" to add it. After adding Apache, I'll press "Alt+S" to see the available services to add. Then, I use the down key in that list until I see "Secure Shell Server" and press ENTER to select it. This will close that list and put "Secure Shell Server" as the selected option. I'll press Alt+A again to add it.
-
-Then I click on ALT+N click on the "Next" button.
-
-
-=== "Firewall Configuration: Summary" screen ===
-
+Find the lines starting with AcceptEnv and insert a # in front of these, There are three lines.
+Afterwards these lines will look like:
+|--------------------
+#AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
+#AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
+#AcceptEnv LC_IDENTIFICATION LC_ALL
+|--------------------
 
-Click on the "Finish" button.
+In order to make the ssh-daemon start at system boot, you have to enable this by giving:
+|--------------------
+# chkconfig sshd on
+|--------------------
 
-When you get sent back to the "YaST2 Control Center" screen, press ALT+Q to Quit Yast.
+You can check the status with the command "chkconfig -l sshd".
+The output should look like this:
+|--------------------
+# sshd                      0:off  1:off  2:off  3:on   4:off  5:on   6:off
+|--------------------
 
+Also you need to start the sshd service in order to generate the security keypair for sshd.
+|--------------------
+# service sshd start
+|--------------------
 
 This time seems to be a good time to reboot your server:
 |--------------------
-linux-3r10:~ # reboot
+# reboot
 |--------------------
 After rebooting the machine, if you wish, you may go to another machine and connect to your newly created server using a SSH (Secure Shell) client. In Windows, I like to use putty to do ssh sessions to my Linux servers.
 
-
-==== Configure Software Repositories ===
+=== Configure Software Repositories ===
 
 After the system has rebooted, log in as root.
 
-Later on, you will need to add some software packages from the openSUSE 11 Distribution. Some of those packages are NOT available in the openSUSE 11.0 DVD (libyaz-devel is one of those packages). So, we'll now set up openSUSE to add the "Official openSUSE 11.0 OSS (Open Source Software) Repository" using yast.
+Later on, you will need to add some software packages from the openSUSE 11 Distribution.
+Some of those packages are NOT available in the openSUSE 11.3 DVD (libyaz-devel is one of those packages).
+However we already added these repositories to the system after configuring the network.
+In case you did not have a network setup at that time, it is now time to setup these repositories, but you can skip this if this has been done already.
 
 First, run the yast command in the Linux command line (shell):
 
@@ -398,109 +394,72 @@ First, run the yast command in the Linux command line (shell):
 
 Inside yast, select Software -> Software Repositories
 
+==== "Configured Software Repositories" screen ====
 
-=== "Configured Software Repositories" screen ===
-
-If on this screen, you already see a table that has: 
-
-  * as configured repositories (in the "Name" column) - "openSUSE-DVD 11.0", "openSUSE-11.0-Non.Oss", "openSUSE-11.0-Debug" and "openSUSE-11.0-Oss" ... 
-  * ... and, at least "openSUSE-DVD 11.0" and "openSUSE-11.0-Oss" have an "x" in the "Enabled" column ... 
-  * ... then you may leave yast, as the required repositories have already been configured.
-
-If not, you'll have to add the "openSUSE-11.0-Oss" repository. Click on the "Add" button.
-
-=== "Media type" screen ===
-
-
-Click on the Specify URL... radio button.
+When on this screen, you already see a table that has: 
 
-Click on the "Next" button.
+* as configured repositories (in the "Name" column)
+** "Updates for openSUSE 11.3 11.3-1.82"
+** "openSUSE-11.3 11.3-1.82"
+** "openSUSE-11.3-Debug"
+** "openSUSE-11.3-Non-Oss" "openSUSE-11.3-Oss" ... 
+* at least the following repositories have an "x" in the "Enabled" column
+** "Updates for openSUSE 11.3 11.3-1.82"
+** "openSUSE-11.3-Oss"
+* you still have to add the folowing repositiory to this list
+** "openSUSE BuildService - devel:languages:perl" 
+Press ALT+A to Add Repositories.
 
+==== "Media type" screen ====
 
-=== "Repository URL" screen ===
+Select Community Repositories by pressing ALT+I and apply Next (press ALT+X).
 
+You will see a message that data will be downloaded.
+After that you will get a list of Repositories and the above mentioned, but not yet available, will be in this list.
+Select the one you need by using the Arrow Keys and press Space to select (an x will appear in front of the Repository).
+After that apply OK. You may see some activity and you may get asked to import GnuPG keys, just do so.
 
-In the "Repository Name" textbox enter some descriptive text like:
-openSUSE 11.0 Official OSS Repository
-
-In the "URL" textbox enter:
-http://download.opensuse.org/distribution/11.0/repo/oss/
-
-
-Click on the "Next" button.
-
-
-=== "License Agreement" screen ===
+You may see the following screen.
 
+==== "License Agreement" screen ====
 
 Check the "Yes, I Agree to the License Agreement" radio button.
 
 Click on the "Next" button to return to the "Configured Software Repositories" screen.
 
+==== "Configured Software Repositories" screen ====
 
-=== "Configured Software Repositories" screen ===
-
-
-You should see now the "openSUSE 11 Official OSS Repository" listed as an entry.
+You should see now the "openSUSE 11.3-Oss" listed as an entry.
+You can Disable "openSUSE-11.3-Source" and its Autorefresh, if present.
 
-Click on the "Finish" button.
+Click on the "OK" button.
 
 When you get sent back to the "Yast Control Center" click on the "Quit" button (to return to the shell).
 
+=== Install some useful / necessary programs ===
 
-==== Install some useful / necessary programs ===
-
-By this time, I'll install some of the programs I regularly use, by using yast:
-
-
-  * To install locate:
-|--------------------
-# yast -i findutils-locate
-|--------------------
-A YaST screen may appear saying:
-|--------------------
-Starting the Package Manager.
-|--------------------
-If that screen appears, it will download some information from http://download.opensuse.org (and set several Software Repositories "behind the scenes)
-
-
-  * To install ncftp (command-line ftp client):
-|--------------------
-# yast -i ncftp
-|--------------------
-
-
-Install some packages that are needed to install Koha:
-
-  * To install make :
-|--------------------
-# yast -i make
-|--------------------
+By this time, you have to install some of the programs which are regularly used, by using zypper (the command line mode packet manager):
 
-  * To install gcc :
+To install locate, ncftp (command-line ftp client), make and gcc you give the following command:
 |--------------------
-# yast -i gcc
+# zypper install findutils-locate ncftp make gcc
 |--------------------
-(this will also install some packages that gcc depend on, like glibc-devel).
-
+Zypper reports that it will install 18 packages; confirm with RETURN.
 
-==== Download Koha ====
+== Download Koha ==
 
 |--------------------
 # wget http://download.koha-community.org/koha-3.00.00.tar.gz
 |--------------------
+You will receive 49,266,888 bytes.
 
-[FIXME: Check what will be the exact URL of the .tar.gz file for Koha 3]
-
-
-==== Extract Koha ====
+== Extract Koha ==
 
 |--------------------
 # tar -xzvf koha-3.00.00.tar.gz
 |--------------------
 
-
-==== Set up Locale for root user ====
+== Set up Locale for root user ==
 
 If you run the locale command, you'll probably get this output:
 |--------------------
@@ -533,7 +492,6 @@ In the first section (Primary Language Settings):
 
 Leave "English (US)" selected as the option for Primary Language
 
-
 Click on the "Details..." link
 
 Change the Locale Settings for user root from the default option ("ctype Only") to "Yes"
@@ -544,18 +502,15 @@ Leave the "Detailed Locale Setting" en_US selected
 
 Click on the OK button to return to the "Languages" screen
 
-Click on the "Accept" button.
-
-
+Click on the "OK" button.
 
 When you get back to the "Yast2 Control Center" screen, click on the "Quit" button
 
+== Putty configuration to use Unicode (UTF-8 encoding) ==
 
-
-==== Putty configuration to use Unicode (UTF-8 encoding) ====
-
-If you use Putty, set up Putty to use UTF-8 encoding. To do this, click on the upper left corner of the PuTTy window, 
-to expand the menu. Scroll down until you find the "Change Settings..." command and click on it.
+If you use Putty, set up Putty to use UTF-8 encoding.
+To do this, click on the upper left corner of the PuTTy window, to expand the menu.
+Scrol down until you find the "Change Settings..." command and click on it.
 
 This should open the "PuTTy Reconfiguration" screen. Here expand the "Window" category and click on "Translation"
 
@@ -567,11 +522,11 @@ change it to: "UTF-8"
 
 Click on the "Apply" button
 
+Now, it's a good time to SAVE this PuTTy session.
+To do this, click again on the upper left corner of the PuTTy window, to expand the menu, and click on the "Change Settings..." command like you did before.
 
-Now, it's a good time to SAVE this PuTTy session. To do this, click again on the upper left corner of the PuTTy window, to expand the menu, and click on the "Change Settings..." command like you did before.
-
-This should open the "PuTTy Reconfiguration" screen. Go to the right hand side of that screen and type a name in the "Saved Sessions" textbox (e.g: koha). Then click on the "Save" button and, after doing that, click on the "Apply" button.
-
+This should open the "PuTTy Reconfiguration" screen. Go to the right hand side of that screen and type a name in the "Saved Sessions" textbox (e.g: koha).
+Then click on the "Save" button and, after doing that, click on the "Apply" button.
 
 IMPORTANT!!! Now it's the time to EXIT the login shell, by typing the exit command:
 |--------------------
@@ -580,6 +535,7 @@ IMPORTANT!!! Now it's the time to EXIT the login shell, by typing the exit comma
 
 Now you'll reopen PuTTy, but when you do that, open the Saved Session that you have created in order to use the "UTF-8" configuration you have done.
 
+You may not need to do the above after the change, made earlier, in /etc/ssh/sshd_config. Check it and if so you can modify this wiki page.
 
 After logging in again with the root user, type the locale command again. Now it should read like the following:
 
@@ -601,8 +557,7 @@ LC_IDENTIFICATION="en_US.UTF-8"
 LC_ALL=
 |--------------------
 
-
-==== Apache configuration (for UTF-8) ====
+== Apache configuration (for UTF-8) ==
 
 Create a file called /etc/apache2/httpd.conf.local with vim (or your preferred text editor):
 |--------------------
@@ -613,8 +568,7 @@ Add this line:
 AddDefaultCharset UTF-8
 |--------------------
 
-
-==== Configure Apache to start at boot time and start the service ====
+== Configure Apache to start at boot time and start the service ==
 |--------------------
 # chkconfig apache2 on
 
@@ -624,15 +578,13 @@ Starting httpd2 (prefork)                                            done
 
 Go to a browser and type:
 
-http://192.168.0.2
+http://192.168.1.16
 
 You should see a page that reads:
 
 "It works!"
 
-
-
-==== MySQL configuration ====
+== MySQL configuration ==
 
 1 - Configure MySQL to start at boot time and start the service:
 |--------------------
@@ -640,23 +592,29 @@ You should see a page that reads:
 
 # service mysql start
 |--------------------
+The system will issue a warning that '--skip-locking' is deprecated, but for now we accept that.
 
 2 - Change the password for the "root" user of MySQL:
 |--------------------
 # /usr/bin/mysqladmin -u root password 'chosenpassword'
 |--------------------
+After starting MySQL also it is recommended to give the command:
+<tt> # /usr/bin/mysqladmin -u root -h koha-server.univ.org password 'chosenpassword'</tt>
+However this gives an error message. This is left for the more advanced MySQL administrator.
 
 3 - Check the encoding variables of MySQL
 
-To check the encoding variables of MySQL, will type the 
-show variables like 'char%'; command in a mysql prompt:
+To check the encoding variables of MySQL, will type the show variables like 'char%'; command in a mysql prompt:
 |--------------------
 # mysql -p
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 7
-Server version: 5.0.51a SUSE MySQL RPM
+Server version: 5.1.46-log SUSE MySQL RPM
 
+Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+and you are welcome to modify and redistribute it under the GPL v2 license
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
@@ -664,12 +622,12 @@ mysql> show variables like 'char%';
 +--------------------------+----------------------------+
 | Variable_name            | Value                      |
 +--------------------------+----------------------------+
-| character_set_client     | latin1                     |
-| character_set_connection | latin1                     |
-| character_set_database   | latin1                     |
+| character_set_client     | utf8                       |
+| character_set_connection | utf8                       |
+| character_set_database   | utf8                       |
 | character_set_filesystem | binary                     |
-| character_set_results    | latin1                     |
-| character_set_server     | latin1                     |
+| character_set_results    | utf8                       |
+| character_set_server     | utf8                       |
 | character_set_system     | utf8                       |
 | character_sets_dir       | /usr/share/mysql/charsets/ |
 +--------------------------+----------------------------+
@@ -679,6 +637,8 @@ mysql> quit
 Bye
 |--------------------
 
+The above looks OK, so we can skip 1 and 2 and continue with 2a, but if not you can follow the following procedure.
+
 We want to have utf8 in the above character_set_* variables above (and NOT latin1)!
 
 In order to do this:
@@ -695,6 +655,9 @@ default-character-set = utf8
 character-set-server = utf8
 skip-character-set-client-handshake
 |--------------------
+In openSUSE 11.3 and the provided mysql packet only the default-character-set can be set, the other 2 should not be added.
+
+2a - If you are unfamilar with SQL you should remove the #-character in front of safe-updates in that same section.
 
 3 - Restart MySQL:
 |--------------------
@@ -712,8 +675,7 @@ myhost:/etc # mysql -p
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 1
-Server version: 5.0.51a SUSE MySQL RPM
-
+Server version: 5.1.46-log SUSE MySQL RPM
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
@@ -736,7 +698,7 @@ mysql> quit
 Bye
 |--------------------
 
-==== Create the Koha database ====
+== Create the Koha database ==
 
 === Create the koha database and user with associated privileges ===
 |--------------------
@@ -744,7 +706,6 @@ Bye
 |--------------------
 (you may name the koha database something different from koha)
 
-
 === Grant privileges to a MySQL user to the koha database === 
 
 Assuming that you want to have a MySQL user called "kohaadmin" to administer a database called "koha" with the password "kohapassword", you'd enter this:
@@ -753,7 +714,7 @@ myhost:~ # mysql -p
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 3
-Server version: 5.0.51a SUSE MySQL RPM
+Server version: 5.1.46-log SUSE MySQL RPM
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
@@ -767,18 +728,29 @@ mysql> quit
 Bye
 |--------------------
 
-
-==== Test your SAX Parser and correct where necessary ====
-
+== Test your SAX Parser and correct where necessary ==
 
   * Install the XML::SAX and XML::LibXML perl Modules:
+
 |--------------------
-# yast -i perl-XML-SAX 
+# zypper install perl-XML-SAX perl-XML-LibXML
+Loading repository data...
+Reading installed packages...
+'perl-XML-SAX' is already installed.
+There is an update candidate for 'perl-XML-SAX', but it is from different vendor. Use 'zypper install perl-XML-SAX-0.96-13.1.x86_64' to install this candidate.
+'perl-XML-LibXML' is already installed.
+There is an update candidate for 'perl-XML-LibXML', but it is from different vendor. Use 'zypper install perl-XML-LibXML-1.70-6.1.x86_64' to install this candidate.
+Resolving package dependencies...
 
-# yast -i perl-XML-LibXML
+Nothing to do.
 |--------------------
 
-You must be sure you're using the XML::LibXML SAX parser, not Expat or PurePerl, both of which have outstanding bugs with pre-composed characters. You can test your SAX parser by running:
+In the above you see that these two packets have been installed during system installation.
+You also installed a repository for the language perl.
+The message about a different vendor is about this repository.
+You have to use "zypper dup" to install the newer versions from this repository, but this outside this tutorial.
+
+You must be sure you're using the XML::LibXML SAX parser, not Expat or PurePerl, both of which have outstanding bugs (in 2008) with pre-composed characters. You can test your SAX parser by running:
 |--------------------
 # cd /root/koha-3.00.00/
 
@@ -791,7 +763,8 @@ XML::SAX::PurePerl=HASH(0x8356a4c)
 |--------------------
 
 If you're using PurePerl (you probably are) or Expat, you'll need to edit your ParserDetails.ini file to use the LibXML Parser. 
-To find the ParserDetails.ini file, you may use locate. To do this, first update the locate database by running the updatedb command:
+To find the ParserDetails.ini file, you may use locate.
+To do this, first update the locate database by running the updatedb command:
 |--------------------
 # updatedb
 |--------------------
@@ -799,12 +772,12 @@ To find the ParserDetails.ini file, you may use locate. To do this, first update
 Then find ParserDetails.ini using locate:
 |--------------------
 # locate ParserDetails.ini
-/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX/ParserDetails.ini
+/usr/lib/perl5/vendor_perl/5.12.1/XML/SAX/ParserDetails.ini
 |--------------------
 
 OK. So, let's first do a backup of this ini file:
 |--------------------
- # cd /usr/lib/perl5/vendor_perl/5.10.0/XML/SAX/
+# cd /usr/lib/perl5/vendor_perl/5.12.1/XML/SAX/
 
 myhost:/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX # cp ParserDetails.ini ParserDetails.ini.ORIG
 |--------------------
@@ -820,30 +793,102 @@ If it does, replace this first line by the following:
 [XML::LibXML::SAX::Parser]
 |--------------------
 
-Run the /root/koha-3.00.00/misc/sax_parser_print.pl command again. This time, you should get the following output:
+Run the /root/koha-3.00.00/misc/sax_parser_print.pl command again.
+This time, you should get the following output:
 |--------------------
 XML::LibXML::SAX::Parser=HASH(0x8356e0c)
 |--------------------
 
+== Install the Zebra package ==
 
+Zebra is already in the standard repository of openSUSE 11.3, so it seems better to install it.
+In the next chapter a question will be asked wether it is installed, so you better install it; no harm done.
+Because you may need the documentation, that will also be installed.
+Note that the package name is idzebra.
 
+|--------------------
+# zypper install idzebra idzebra-doc
+|--------------------
+You will notice that a few dependencies need to be resolved, so a few other packages are also installed.
 
-
-
-==== Run Koha's perl installer ====
+== Run Koha's perl installer ==
 |--------------------
 myhost:/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX # cd /root/koha-3.00.00
 |--------------------
-We will now run perl Makefile.PL to run the installer. 
-
-My installation is a UNIMARC installation, so I'm answering unimarc to the "MARC format for Zebra indexing (marc21, unimarc) [marc21]" question below. If your Library uses the MARC21 format instead of UNIMARC, you should press ENTER to accept the default (which is marc21). 
-
-Because my bibliographic catalog will have mainly records in Portuguese, and Portuguese is more similar to French than to English, I'm answering "fr" (French) to the "Primary language for Zebra indexing (en, fr) [en]" question below.
+After installation of a number of CPAN/perl packages we will run perl Makefile.PL to run the Koha installer. 
+
+
+=== Using zypper to install CPAN modules ===
+
+The author of the openSUSE 11.0 version of this page did a trial run with the Makefile.PL module, which showed a lot of unstalled perl modules and other software packages.
+He used the names of these packages and installed the missing ones.
+I collected all the missing packets and put them in the list below to install these packages before running Makefile.PL.
+Doing the way he did provides more inside in the process, however it is tedious and I want to avoid that.
+You still can go [[Koha_3.0.0_on_openSUSE_11.0#Run_Koha's_perl_installer|there]] and learn from that experience.
+
+The commands show below need to be given one by one, because zypper will always ask for confirmation. However you can als also put more than one module name after the "zypper install" command.
+|--------------------
+# zypper install perl-Algorithm-CheckDigits
+# zypper install perl-Biblio-EndnoteStyle
+# zypper install perl-CGI-Session-Serialize-yaml
+# zypper install perl-CGI-Session
+# zypper install perl-Class-Accessor
+# zypper install perl-Class-Factory-Util
+# zypper install perl-DBD-mysql
+# zypper install perl-Data-ICal
+# zypper install perl-Date-Calc
+# zypper install perl-Date-ICal
+# zypper install perl-Date-Manip
+# zypper install perl-DublinCore-Record
+# zypper install perl-Email-Date
+# zypper install perl-GD
+# zypper install perl-GD-Barcode
+# zypper install perl-HTML-Scrubber
+# zypper install perl-HTML-Template-Pro
+# zypper install perl-Lingua-Stem
+# zypper install perl-MARC-Charset
+# zypper install perl-MARC-Crosswalk-DublinCore
+# zypper install perl-MARC-File-XML
+# zypper install perl-MARC-Record
+# zypper install perl-MIME-Lite
+# zypper install perl-Mail-Sendmail
+# zypper install perl-Net-LDAP
+# zypper install perl-Net-Z3950-ZOOM
+# zypper install perl-PDF-API2
+# zypper install perl-PDF-Reuse
+# zypper install perl-PDF-Reuse-Barcode
+# zypper install perl-POE
+# zypper install perl-32bit
+# zypper install perl-SMS-Send
+# zypper install perl-Schedule-At
+# zypper install perl-Text-CSV
+# zypper install perl-Text-Iconv
+# zypper install perl-XML-Dumper
+# zypper install perl-XML-LibXSLT
+# zypper install perl-XML-RSS
+# zypper install perl-Text-CSV_XS
+# zypper install perl-PerlMagick
+# zypper install perl-Carp-Assert
+# zypper install gd gd-devel
+# zypper install xorg-x11-libXpm-devel
+# zypper install libjpeg-devel
+# zypper install fontconfig-devel
+# zypper install libpng-devel
+# zypper install libyaz-devel
+|--------------------
+
+== Running the Makefile.PL module to configure Koha ==
+
+My installation is a UNIMARC installation, so I'm answering unimarc to the "MARC format for Zebra indexing (marc21, unimarc) [marc21]" question below.
+If your Library uses the MARC21 format instead of UNIMARC, you should press ENTER to accept the default (which is marc21). 
+
+Because my bibliographic catalog will have mainly records in English and Arabic, I'm answering "en" (English) to the "Primary language for Zebra indexing (en, fr) [en]" question below.
 
 Although I'm NOT using Zebra, I'm answering "yes" (the default choice) to the "Install the Zebra configuration files? (no, yes) [yes]" so I can set up Zebra later, if I decide to.
 
-OK. So here's the result of running the  perl Makefile.PL  command (including my answers to the several questions):
+Also note that Zebra has been installed in this case.
 
+Below is the result of running the "perl Makefile.PL" command (including my answers to the several questions):
 |--------------------
 myhost:~/koha-3.00.00 # perl Makefile.PL
 
@@ -945,7 +990,6 @@ Unable to find the Zebra programs 'zebrasrv' and 'zebraidx'
 in your PATH or in some of the usual places.  If you haven't
 installed Zebra yet, please do so and run Makefile.PL again.
 
-
 Since you've chosen to use Zebra with Koha,
 you must specify the primary MARC format of the
 records to be indexed by Zebra.
@@ -995,9 +1039,6 @@ Install the PazPar2 configuration files? [no] no
 
 Would you like to run the database-dependent test suite? (no, yes) [no]
 
-
-
-
 Koha will be installed with the following configuration parameters:
 
 AUTH_INDEX_MODE          dom
@@ -1043,7 +1084,6 @@ ZEBRA_DATA_DIR           /var/lib/koha/zebradb
 ZEBRA_LOCK_DIR           /var/lock/koha/zebradb
 ZEBRA_RUN_DIR            /var/run/koha/zebradb
 
-
 To change any configuration setting, please run
 perl Makefile.PL again.  To override one of the target
 directories, you can do so on the command line like this:
@@ -1067,1547 +1107,12 @@ If installing on a Win32 platform, be sure to use:
 
 Checking if your kit is complete...
 Looks good
-Warning: prerequisite Algorithm::CheckDigits 0.5 not found.
-Warning: prerequisite Biblio::EndnoteStyle 0.05 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite CGI::Session 4.10 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Class::Accessor 0.3 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Class::Factory::Util 1.6 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite DBD::mysql 4.004 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Data::ICal 0.13 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::Calc 5.4 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::ICal 1.72 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::Manip 5.44 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Email::Date 1.103 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite GD 2.39 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite GD::Barcode::UPCE 1.1 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite HTML::Scrubber 0.08 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite HTML::Template::Pro 0.69 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Lingua::Stem 0.82 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite List::MoreUtils 0.21 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Charset 0.98 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Crosswalk::DublinCore 0.02 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::File::XML 0.88 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Record 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MIME::Lite 3 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Mail::Sendmail 0.79 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::LDAP 0.33 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::LDAP::Filter 0.14 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::Z3950::ZOOM 1.16 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2::Page 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2::Util 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::Reuse 0.33 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::Reuse::Barcode 0.05 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite POE 0.9999 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite SMS::Send 0.05 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Schedule::At 1.06 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::CSV 0.01 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::CSV_XS 0.32 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::Iconv 1.7 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::Dumper 0.81 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::LibXSLT 1.59 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::RSS 1.31 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite YAML::Syck 0.71 not found.
 Writing Makefile for koha
 
-
 myhost:~/koha-3.00.00 #
 |--------------------
 
-OK... Lots of missing dependencies (Perl Modules). Let's build some of these modules in CPAN to fix this:
-
-
-==== CPAN Configuration ====
-If you don't already know, "CPAN is the Comprehensive Perl Archive Network, a large collection of Perl software and documentation". For additional info, you may browse the official CPAN web site is at http://www.cpan.org/
-
-Enter the "cpan" command to configure CPAN:
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-
-CPAN is the world-wide archive of perl resources. It consists of about
-300 sites that all replicate the same contents around the globe. Many
-countries have at least one CPAN site already. The resources found on
-CPAN are easily accessible with the CPAN.pm module. If you want to use
-CPAN.pm, lots of things have to be configured. Fortunately, most of
-them can be determined automatically. If you prefer the automatic
-configuration, answer 'yes' below.
-
-If you prefer to enter a dialog instead, you can answer 'no' to this
-question and I'll let you configure in small steps one thing after the
-other. (Note: you can revisit this dialog anytime later by typing 'o
-conf init' at the cpan prompt.)
-Would you like me to configure as much as possible automatically? [yes]
-|--------------------
-
-[Just press ENTER here to set all CPAN settings to the default values. 
-After doing this CPAN will scroll lots of messages with questions that 
-it will automatically answer]
-
-[Let's now set up CPAN for Internet access to enable it to download packages. 
-Because I live in Portugal, I'm choosing Portuguese mirrors here. Choose the 
-mirrors that are nearer to you:]
-
-|--------------------
-cpan[2]> o conf init urllist
-You have no /root/.cpan/sources/MIRRORED.BY
-  I'm trying to fetch one
-CPAN: LWP::UserAgent loaded ok (v5.810)
-
-I would like to connect to one of the following sites to get 'MIRRORED.BY':
-
- http://www.perl.org/CPAN/
- ftp://ftp.perl.org/pub/CPAN/
-
-Is it OK to try to connect to the Internet? [yes]
-Fetching with LWP:
-  http://www.perl.org/CPAN/MIRRORED.BY
-
-
-Now we need to know where your favorite CPAN sites are located. Push
-a few sites onto the array (just in case the first on the array won't
-work). If you are mirroring CPAN to your local workstation, specify a
-file: URL.
-
-First, pick a nearby continent and country by typing in the number(s)
-in front of the item(s) you want to select. You can pick several of
-each, separated by spaces. Then, you will be presented with a list of
-URLs of CPAN mirrors in the countries you selected, along with
-previously selected URLs. Select some of those URLs, or just keep the
-old list. Finally, you will be prompted for any extra URLs -- file:,
-ftp:, or http: -- that host a CPAN mirror.
-
-(1) Africa
-(2) Asia
-(3) Central America
-(4) Europe
-(5) North America
-(6) Oceania
-(7) South America
-Select your continent (or several nearby continents) [] 4
-
-(1) Austria
-(2) Belgium
-(3) Bosnia and Herzegovina
-(4) Bulgaria
-(5) Croatia
-(6) Czech Republic
-(7) Denmark
-(8) Finland
-(9) France
-(10) Germany
-(11) Greece
-(12) Hungary
-(13) Iceland
-(14) Ireland
-(15) Italy
-(16) Latvia
-15 more items, hit RETURN to show them
-Select your country (or several nearby countries) []
-Sorry! since you don't have any existing picks, you must make a
-geographic selection.
-
-(17) Lithuania
-(18) Malta
-(19) Netherlands
-(20) Norway
-(21) Poland
-(22) Portugal
-(23) Romania
-(24) Russia
-(25) Slovakia
-(26) Slovenia
-(27) Spain
-(28) Sweden
-(29) Switzerland
-(30) Ukraine
-(31) United Kingdom
-Select your country (or several nearby countries) [] 22
-
-(1) ftp://cpan.ip.pt/pub/cpan/
-(2) ftp://ftp.dei.uc.pt/pub/CPAN
-(3) ftp://ftp.isr.ist.utl.pt/pub/CPAN/
-(4) ftp://ftp.nfsi.pt/pub/cpan/
-(5) ftp://neacm.fe.up.pt/pub/CPAN/
-(6) ftp://perl.di.uminho.pt/pub/CPAN/
-(7) http://cpan.dcc.fc.up.pt/
-Select as many URLs as you like (by number),
-put them on one line, separated by blanks, hyphenated ranges allowed
- e.g. '1 4 5' or '7 1-4 8' [] 3 2 6 4 5 7 1
-
-Enter another URL or RETURN to quit: []
-New set of picks:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/
-  ftp://ftp.dei.uc.pt/pub/CPAN
-  ftp://perl.di.uminho.pt/pub/CPAN/
-  ftp://ftp.nfsi.pt/pub/cpan/
-  ftp://neacm.fe.up.pt/pub/CPAN/
-  http://cpan.dcc.fc.up.pt/
-  ftp://cpan.ip.pt/pub/cpan/
-
-
-Please remember to call 'o conf commit' to make the config permanent!
-
-
-cpan[3]> o conf commit
-commit: wrote '/usr/lib/perl5/5.10.0/CPAN/Config.pm'
-
-cpan[4]> quit
-Lockfile removed.
-|--------------------
-
-==== Installing Prerequisite Modules ====
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-CPAN: File::HomeDir loaded ok (v0.69)
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-|--------------------
-
-=== Install Algorithm::CheckDigits ===
-[Let's install the first package called "Algorithm::CheckDigits". Here I will leave the complete output. For the next installations, I will only show the prompts for dependencies and snip out the remaining output]:
-|--------------------
-cpan[1]> install Algorithm::CheckDigits
-CPAN: Storable loaded ok (v2.18)
-CPAN: LWP::UserAgent loaded ok (v5.810)
-CPAN: Time::HiRes loaded ok (v1.9711)
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/01mailrc.txt.gz
-Going to read /root/.cpan/sources/authors/01mailrc.txt.gz
-CPAN: Compress::Zlib loaded ok (v2.008)
-............................................................................DONE
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/modules/02packages.details.txt.gz
-Going to read /root/.cpan/sources/modules/02packages.details.txt.gz
-  Database was generated on Mon, 07 Jul 2008 04:02:45 GMT
-............................................................................DONE
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/modules/03modlist.data.gz
-Going to read /root/.cpan/sources/modules/03modlist.data.gz
-............................................................................DONE
-Going to write /root/.cpan/Metadata
-Running install for module 'Algorithm::CheckDigits'
-CPAN: Data::Dumper loaded ok (v2.121_14)
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
-Running make for M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-CPAN: Digest::SHA loaded ok (v5.45)
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MA/MAMAWE/CHECKSUMS
-Checksum for /root/.cpan/sources/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz ok
-Scanning cache /root/.cpan/build for sizes
-DONE
-Algorithm-CheckDigits-0.50/
-Algorithm-CheckDigits-0.50/t/
-Algorithm-CheckDigits-0.50/t/valid.data
-Algorithm-CheckDigits-0.50/t/valid.t
-Algorithm-CheckDigits-0.50/t/iban.t
-Algorithm-CheckDigits-0.50/t/isbn13.t
-Algorithm-CheckDigits-0.50/t/ecno.t
-Algorithm-CheckDigits-0.50/t/upc.t
-Algorithm-CheckDigits-0.50/t/imei.t
-Algorithm-CheckDigits-0.50/t/pod-coverage.t
-Algorithm-CheckDigits-0.50/t/pod.t
-Algorithm-CheckDigits-0.50/t/checkdigits.t
-Algorithm-CheckDigits-0.50/CheckDigits.pm
-Algorithm-CheckDigits-0.50/Changes
-Algorithm-CheckDigits-0.50/CheckDigits/
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_005.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_005.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M97_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_012.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_010.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_015.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M07_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_008.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M23_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_013.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_009.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M09_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M16_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_008.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_016.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_011.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M23_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M43_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_017.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_007.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_011.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M89_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M97_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_010.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_009.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_001.pm
-Algorithm-CheckDigits-0.50/META.yml
-Algorithm-CheckDigits-0.50/.perltidyrc
-Algorithm-CheckDigits-0.50/README
-Algorithm-CheckDigits-0.50/MANIFEST
-Algorithm-CheckDigits-0.50/Makefile.PL
-CPAN: File::Temp loaded ok (v0.18)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-
-Checking if your kit is complete...
-Looks good
-Writing Makefile for Algorithm::CheckDigits
-Could not read '/root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/META.yml'. Falling back to other methods to determine prerequisites
-cp CheckDigits/M11_001.pm blib/lib/Algorithm/CheckDigits/M11_001.pm
-cp CheckDigits/M11_010.pm blib/lib/Algorithm/CheckDigits/M11_010.pm
-cp CheckDigits/M97_002.pm blib/lib/Algorithm/CheckDigits/M97_002.pm
-cp CheckDigits/M23_001.pm blib/lib/Algorithm/CheckDigits/M23_001.pm
-cp CheckDigits/M97_001.pm blib/lib/Algorithm/CheckDigits/M97_001.pm
-cp CheckDigits/M16_001.pm blib/lib/Algorithm/CheckDigits/M16_001.pm
-cp CheckDigits/M10_006.pm blib/lib/Algorithm/CheckDigits/M10_006.pm
-cp CheckDigits/M11_013.pm blib/lib/Algorithm/CheckDigits/M11_013.pm
-cp CheckDigits/M07_001.pm blib/lib/Algorithm/CheckDigits/M07_001.pm
-cp CheckDigits/MXX_006.pm blib/lib/Algorithm/CheckDigits/MXX_006.pm
-cp CheckDigits/M10_008.pm blib/lib/Algorithm/CheckDigits/M10_008.pm
-cp CheckDigits/M11_017.pm blib/lib/Algorithm/CheckDigits/M11_017.pm
-cp CheckDigits/M10_003.pm blib/lib/Algorithm/CheckDigits/M10_003.pm
-cp CheckDigits/M11_016.pm blib/lib/Algorithm/CheckDigits/M11_016.pm
-cp CheckDigits/M11_003.pm blib/lib/Algorithm/CheckDigits/M11_003.pm
-cp CheckDigits/MXX_002.pm blib/lib/Algorithm/CheckDigits/MXX_002.pm
-cp CheckDigits/M10_001.pm blib/lib/Algorithm/CheckDigits/M10_001.pm
-cp CheckDigits/M10_004.pm blib/lib/Algorithm/CheckDigits/M10_004.pm
-cp CheckDigits/MXX_004.pm blib/lib/Algorithm/CheckDigits/MXX_004.pm
-cp CheckDigits/MBase_003.pm blib/lib/Algorithm/CheckDigits/MBase_003.pm
-cp CheckDigits/M43_001.pm blib/lib/Algorithm/CheckDigits/M43_001.pm
-cp CheckDigits/M10_005.pm blib/lib/Algorithm/CheckDigits/M10_005.pm
-cp CheckDigits/MXX_005.pm blib/lib/Algorithm/CheckDigits/MXX_005.pm
-cp CheckDigits/M11_006.pm blib/lib/Algorithm/CheckDigits/M11_006.pm
-cp CheckDigits/M11_004.pm blib/lib/Algorithm/CheckDigits/M11_004.pm
-cp CheckDigits/M11_012.pm blib/lib/Algorithm/CheckDigits/M11_012.pm
-cp CheckDigits/M09_001.pm blib/lib/Algorithm/CheckDigits/M09_001.pm
-cp CheckDigits/MXX_003.pm blib/lib/Algorithm/CheckDigits/MXX_003.pm
-cp CheckDigits/M11_008.pm blib/lib/Algorithm/CheckDigits/M11_008.pm
-cp CheckDigits/M89_001.pm blib/lib/Algorithm/CheckDigits/M89_001.pm
-cp CheckDigits/MBase_002.pm blib/lib/Algorithm/CheckDigits/MBase_002.pm
-cp CheckDigits/M11_011.pm blib/lib/Algorithm/CheckDigits/M11_011.pm
-cp CheckDigits/MBase_001.pm blib/lib/Algorithm/CheckDigits/MBase_001.pm
-cp CheckDigits/M10_009.pm blib/lib/Algorithm/CheckDigits/M10_009.pm
-cp CheckDigits/M11_002.pm blib/lib/Algorithm/CheckDigits/M11_002.pm
-cp CheckDigits.pm blib/lib/Algorithm/CheckDigits.pm
-cp CheckDigits/MXX_001.pm blib/lib/Algorithm/CheckDigits/MXX_001.pm
-cp CheckDigits/M10_011.pm blib/lib/Algorithm/CheckDigits/M10_011.pm
-cp CheckDigits/M11_007.pm blib/lib/Algorithm/CheckDigits/M11_007.pm
-cp CheckDigits/M11_015.pm blib/lib/Algorithm/CheckDigits/M11_015.pm
-cp CheckDigits/M23_002.pm blib/lib/Algorithm/CheckDigits/M23_002.pm
-cp CheckDigits/M10_002.pm blib/lib/Algorithm/CheckDigits/M10_002.pm
-cp CheckDigits/M11_009.pm blib/lib/Algorithm/CheckDigits/M11_009.pm
-cp CheckDigits/M10_010.pm blib/lib/Algorithm/CheckDigits/M10_010.pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_010.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M97_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M23_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M97_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M16_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_013.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M07_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_008.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_017.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_016.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M43_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_005.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_005.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_012.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M09_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_008.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M89_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_011.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_009.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_011.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_007.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_015.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_009.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M23_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_010.3pm
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
-t/checkdigits.....ok
-t/ecno............ok
-t/iban............ok
-t/imei............ok
-t/isbn13..........ok
-t/pod-coverage....skipped
-        all skipped: Test::Pod::Coverage 1.00 required for testing POD coverage
-t/pod.............skipped
-        all skipped: Test::Pod 1.00 required for testing POD
-t/upc.............ok
-t/valid...........ok
-All tests successful, 2 tests skipped.
-Files=9, Tests=448,  2 wallclock secs ( 0.35 cusr +  0.80 csys =  1.15 CPU)
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make test -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-Prepending /root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/blib/arch /root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/blib/lib to PERL5LIB for 'install'
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_011.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_005.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_009.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M43_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_010.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_010.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M23_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M09_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_013.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_008.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M07_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M23_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_016.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_017.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M97_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_007.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_008.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_015.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M16_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_011.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_005.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M89_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_009.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M97_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_012.pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_016.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_009.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_004.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_015.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_011.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M09_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_013.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_010.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_017.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M97_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_005.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M23_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_008.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_009.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M23_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M43_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M07_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M16_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_011.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_005.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_008.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_007.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_010.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M89_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_012.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_004.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M97_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_004.3pm
-Writing /usr/lib/perl5/site_perl/5.10.0/i586-linux-thread-multi/auto/Algorithm/CheckDigits/.packlist
-Appending installation info to /usr/lib/perl5/5.10.0/i586-linux-thread-multi/perllocal.pod
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make install  -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-|--------------------
-
-
-=== Install Biblio::EndnoteStyle ===
-|--------------------
-cpan[2]> install Biblio::EndnoteStyle
-|--------------------
-
-
-
-
-=== Install the "CGI::Session::Serialize::yaml" Perl Module ===
-
-[Install CGI::Session::Serialize::yaml "instead" of CGI::Session to avoid problems related to JSON::Syck when installing CGI::Session. Don't worry: by installing CGI::Session::Serialize::yaml you are also installing CGI::Session]:
-|--------------------
-cpan[3]> install CGI::Session::Serialize::yaml
-
-[...]
-CGI-Session-Serialize-yaml-4.24/README
-CGI-Session-Serialize-yaml-4.24/Build.PL
-CGI-Session-Serialize-yaml-4.24/Makefile.PL
-CPAN: File::Temp loaded ok (v0.18)
-CPAN: Module::Build loaded ok (v0.280801)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build R/RS/RSAVAGE/CGI-Session-Serialize-yaml-4.24.tgz
-
-Checking whether your kit is complete...
-Looks good
-
-Checking prerequisites...
- - ERROR: Test::Pod is not installed
- - ERROR: CGI::Session is not installed
- - ERROR: CGI::Session::ErrorHandler is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'CGI-Session-Serialize-yaml' version '4.24'
-Could not read '/root/.cpan/build/CGI-Session-Serialize-yaml-4.24-YmsZPx/META.yml'. Falling back to other methods to determine prerequisites
-----   Unsatisfied dependencies detected during  ----
----- RSAVAGE/CGI-Session-Serialize-yaml-4.24.tgz ----
-    CGI::Session [requires]
-    CGI::Session::ErrorHandler [requires]
-    Test::Pod [build_requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-Checking prerequisites...
- - ERROR: Test::Pod is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'CGI-Session' version '4.38'
-Could not read '/root/.cpan/build/CGI-Session-4.38-RYliaM/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     MARKSTOS/CGI-Session-4.38.tar.gz     ----
-    Test::Pod [build_requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-All tests successful, 1 test skipped.
-Files=11, Tests=19,  2 wallclock secs ( 0.83 cusr +  1.08 csys =  1.91 CPU)
-  PETDANCE/Test-Pod-1.26.tar.gz
-  /usr/bin/make test -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-P/PE/PETDANCE/Test-Pod-1.26.tar.gz is just needed temporarily during building or testing. Do you want to install it permanently? (Y/n) [yes]
-
-cpan[4]> quit
-Lockfile removed.
-|--------------------
-
-
-=== Install some "Class" Perl Modules ===
-To install the Class::Accessor Perl Module we'll use the available software package in openSUSE 11.0 (using yast) instead of downloading it from CPAN:
-|--------------------
-myhost:~/Koha-3.00.00 # yast -i perl-Class-Accessor
-|--------------------
-
-[this will also install a dependency: perl-Carp-Assert]
-
-|--------------------
-myhost:~/Koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Class::Factory::Util
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install DBD::MySQL ===
-|--------------------
-myhost:~/koha-3.00.00 # yast -i perl-DBD-mysql
-|--------------------
-[this will also install a dependency: perl-Data-Showtable]
-
-=== Install some "Data" Perl Modules ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-CPAN: File::HomeDir loaded ok (v0.69)
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Data::ICal
-
-CPAN: File::Temp loaded ok (v0.18)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build J/JE/JESSE/Data-ICal-0.13.tar.gz
-
-*** Module::AutoInstall version 1.03
-*** Checking for Perl dependencies...
-[Core Features]
-- Test::More          ...loaded. (0.72)
-- Test::Warn          ...missing.
-- Test::NoWarnings    ...missing.
-- Test::LongString    ...missing.
-- Class::Accessor     ...loaded. (0.31)
-- Text::vFile::asData ...missing.
-- MIME::QuotedPrint   ...loaded. (3.07)
-- Class::ReturnValue  ...missing.
-==> Auto-install the 5 mandatory module(s) from CPAN? [y]
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-*** Module::AutoInstall configuration finished.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Class::ReturnValue 0 not found.
-Warning: prerequisite Test::LongString 0 not found.
-Warning: prerequisite Test::NoWarnings 0 not found.
-Warning: prerequisite Test::Warn 0 not found.
-Warning: prerequisite Text::vFile::asData 0 not found.
-Writing Makefile for Data::ICal
-Could not read '/root/.cpan/build/Data-ICal-0.13-X1jsxc/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        JESSE/Data-ICal-0.13.tar.gz       ----
-    Test::LongString [requires]
-    Class::ReturnValue [requires]
-    Test::NoWarnings [requires]
-    Text::vFile::asData [requires]
-    Test::Warn [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
----- Unsatisfied dependencies detected during ----
-----    JESSE/Class-ReturnValue-0.55.tar.gz   ----
-    Devel::StackTrace [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite Test::Tester 0.103 not found.
-Writing Makefile for Test::NoWarnings
-Could not read '/root/.cpan/build/Test-NoWarnings-0.084-DMJBk3/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----    FDALY/Test-NoWarnings-0.084.tar.gz    ----
-    Test::Tester [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-Running install for module 'Text::vFile::asData'
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
----- Unsatisfied dependencies detected during ----
-----   RCLAMP/Text-vFile-asData-0.05.tar.gz   ----
-    Class::Accessor::Chained [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Warning: prerequisite Array::Compare 0 not found.
-Warning: prerequisite Sub::Uplevel 0.12 not found.
-Warning: prerequisite Test::Exception 0 not found.
-Warning: prerequisite Tree::DAG_Node 0 not found.
-Writing Makefile for Test::Warn
-Could not read '/root/.cpan/build/Test-Warn-0.10-9ekdi2/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----       CHORNY/Test-Warn-0.10.tar.gz       ----
-    Test::Exception [requires]
-    Sub::Uplevel [requires]
-    Array::Compare [requires]
-    Tree::DAG_Node [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
----- Unsatisfied dependencies detected during ----
-----      ADIE/Test-Exception-0.27.tar.gz     ----
-    Sub::Uplevel [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install some "Date" Perl Modules ===
-|--------------------
-myhost:~/koha-3.00.00 # yast -i perl-Date-Calc
-|--------------------
-[This will also install 2 other dependencies: perl-Carp-Clan and perl-Bit-Vector]
-
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Date::ICal
-
-
-Warning: prerequisite Date::Leapyear 1.03 not found.
-Writing Makefile for Date::ICal
----- Unsatisfied dependencies detected during ----
-----        RBOW/Date-ICal-1.72.tar.gz        ----
-    Date::Leapyear [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[2]> quit
-Lockfile removed.
-
-myhost:~/koha-3.00.00 # yast -i perl-DateManip
-|--------------------
-
-
-=== Install the "Email::Date" Perl Module ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Email::Date
-
-
-Warning: prerequisite Email::Abstract 2.10 not found.
-Warning: prerequisite Email::Date::Format 1.000 not found.
-Writing Makefile for Email::Date
-Could not read '/root/.cpan/build/Email-Date-1.103-LsgMdE/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----       RJBS/Email-Date-1.103.tar.gz       ----
-    Email::Abstract [requires]
-    Email::Date::Format [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite Email::Simple 1.91 not found.
-Writing Makefile for Email::Abstract
-Could not read '/root/.cpan/build/Email-Abstract-2.134-zLB1QI/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     RJBS/Email-Abstract-2.134.tar.gz     ----
-    Email::Simple [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "GD" Perl Module ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-[many lines scroll by...] 
-
-**UNRECOVERABLE ERROR**
-Could not find gdlib-config in the search path. Please install libgd 2.0.28 or higher.
-If you want to try to compile anyway, please rerun this script with the option --ignore_missing_gd.
-Warning: No success on command[/usr/bin/perl Makefile.PL]
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  LDS/GD-2.41.tar.gz
-  /usr/bin/perl Makefile.PL -- NOT OK
-Running make test
-  Make had some problems, won't test
-Running make install
-  Make had some problems, won't install
-Could not read '/root/.cpan/build/GD-2.41-4ZLPXP/META.yml'. Falling back to other methods to determine prerequisites
-Failed during this command:
- LDS/GD-2.41.tar.gz                           : writemakefile NO '/usr/bin/perl Makefile.PL' returned status 512
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-OK. It seems that we need to install the GD software packages. Let's do that:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i gd
-
-myhost:~/koha-3.00.00 # yast -i gd-devel
-|--------------------
-
-And now let's try again to install the "GD" Perl Module
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-[many lines scroll by...]
-
-/usr/lib/gcc/i586-suse-linux/4.3/../../../../i586-suse-linux/bin/ld: cannot find -lXpm
-collect2: ld returned 1 exit status
-make: *** [blib/arch/auto/GD/GD.so] Error 1
-  LDS/GD-2.41.tar.gz
-  /usr/bin/make -- NOT OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-  Can't test without successful make
-Running make install
-  Make had returned bad status, install seems impossible
-Failed during this command:
- LDS/GD-2.41.tar.gz                           : make NO
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-OK. We got another error, mentioning "-lXpm". Apparently, this is related to libXpm (the "X.Org Xpm Library"). Let's install the "xorg-x11-libXpm-devel" software package:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i xorg-x11-libXpm-devel
-|--------------------
-
-[This will also install 9 other xorg-x11-....-devel software packages: xorg-x11-proto-devel, xorg-x11-xtrans-devel, xorg-x11-libXdmcp-devel ...]
-
-If you'd try now to install again the "GD" perl module, you'd get another error, now concerning "ljpeg" (and in other attempt to "lfontconfig"... and yet in another to "lpng12"). So, let's first install the "libjpeg-devel", "fontconfig-devel" and "libpng-devel" software packages:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i libjpeg-devel
-
-myhost:~/koha-3.00.00 # yast -i fontconfig-devel
-
-myhost:~/koha-3.00.00 # yast -i libpng-devel
-|--------------------
-
-[Installing fontconfig-devel will also install some other dependencies: zlib-devel, libexpat-devel and freetype2-devel]
-
-And now, finally, we can install the "GD" Perl Module:
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "GD::Barcode::UPCE" Perl Module ===
-|--------------------
-myhost:~/Koha # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD::Barcode::UPCE
-|--------------------
-
-=== Install the "HTML::Template::Pro" Perl Module ===
-
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install HTML::Template::Pro
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-
-
-
-
-=== Install the "Lingua::Stem" Perl Module ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Lingua::Stem
-
-
-Checking prerequisites...
- - ERROR: Lingua::PT::Stemmer is not installed
- - ERROR: Lingua::Stem::It is not installed
- - ERROR: Lingua::Stem::Snowball::No is not installed
- - ERROR: Text::German is not installed
- - ERROR: Lingua::Stem::Snowball::Se is not installed
- - ERROR: Lingua::Stem::Fr is not installed
- - ERROR: Lingua::GL::Stemmer is not installed
- - ERROR: Lingua::Stem::Snowball::Da is not installed
- - ERROR: Lingua::Stem::Ru is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'Lingua-Stem' version '0.83'
-Could not read '/root/.cpan/build/Lingua-Stem-0.83-cmPLcK/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     SNOWHARE/Lingua-Stem-0.83.tar.gz     ----
-    Lingua::PT::Stemmer [requires]
-    Lingua::Stem::It [requires]
-    Lingua::Stem::Snowball::No [requires]
-    Text::German [requires]
-    Lingua::Stem::Snowball::Se [requires]
-    Lingua::Stem::Fr [requires]
-    Lingua::GL::Stemmer [requires]
-    Lingua::Stem::Snowball::Da [requires]
-    Lingua::Stem::Ru [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-|--------------------
-
-
-=== Install the "HTML::Scrubber" Perl Module ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install HTML::Scrubber
-
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "List::MoreUtils" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-List-MoreUtils
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-
-
-=== Install some "MARC" Perl Modules ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install MARC::Charset
-MARC::Charset is up to date (1.0).
-
-cpan[2]> install MARC::Crosswalk::DublinCore
-
-
-Checking prerequisites...
- - ERROR: DublinCore::Record is not installed
- - ERROR: MARC::Record is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'MARC-Crosswalk-DublinCore' version '0.02'
-Could not read '/root/.cpan/build/MARC-Crosswalk-DublinCore-0.02-xrMlqr/META.yml'. Falling back to other methods to determine 
-
-prerequisites
-----   Unsatisfied dependencies detected during   ----
----- BRICAS/MARC-Crosswalk-DublinCore-0.02.tar.gz ----
-    DublinCore::Record [requires]
-    MARC::Record [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[3]> install MARC::File::XML
-
-
-cpan[4]> install MARC::Record
-MARC::Record is up to date (2.0.0).
-
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-
-=== Install the "MIME::Lite" Perl Module === 
-|--------------------
-myhost:~/Koha-3.00.00 # yast -i perl-MIME-Lite
-|--------------------
-
-=== Install the "Mail::Sendmail" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-Mail-Sendmail
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-
-=== Install some "Net" Perl Modules ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Net::LDAP
-
-
-*** Module::AutoInstall version 1.03
-*** Checking for Perl dependencies...
-[Core Features]
-- Convert::ASN1    ...missing. (would need 0.07)
-==> Auto-install the 1 mandatory module(s) from CPAN? [y]
-[SASL authentication]
-- Authen::SASL     ...missing. (would need 2.00)
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[LDAP URLs]
-- URI::ldap        ...loaded. (1.11 >= 1.1)
-[LDAPS]
-- IO::Socket::SSL  ...missing. (would need 0.81)
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[Read/Write DSML files]
-- MIME::Base64     ...loaded. (3.07_01)
-- XML::SAX::Writer ...missing.
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[Read/Write LDIF files]
-- MIME::Base64     ...loaded. (3.07_01)
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-*** Module::AutoInstall configuration finished.
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Convert::ASN1 0.07 not found.
-Writing Makefile for Net::LDAP
-Could not read '/root/.cpan/build/perl-ldap-0.36-gUbl59/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        GBARR/perl-ldap-0.36.tar.gz       ----
-    Convert::ASN1 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[16]> install Net::LDAP::Filter
-Net::LDAP::Filter is up to date (0.15).
-
-
-cpan[7]> install Net::Z3950::ZOOM
-Running install for module 'Net::Z3950::ZOOM'
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
-Running make for M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-Checksum for /root/.cpan/sources/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz ok
-Net-Z3950-ZOOM-1.21/
-Net-Z3950-ZOOM-1.21/samples/
-Net-Z3950-ZOOM-1.21/samples/zoom/
-Net-Z3950-ZOOM-1.21/samples/zoom/trivial-async.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zdump.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/async.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomscan.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zhello.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zselect
-Net-Z3950-ZOOM-1.21/samples/zoom/update.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomtst3.pl
-Net-Z3950-ZOOM-1.21/samples/README
-Net-Z3950-ZOOM-1.21/samples/net-z3950/
-Net-Z3950-ZOOM-1.21/samples/net-z3950/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/records/
-Net-Z3950-ZOOM-1.21/samples/records/esdd0006.grs
-Net-Z3950-ZOOM-1.21/samples/ccl/
-Net-Z3950-ZOOM-1.21/samples/ccl/default.bib
-Net-Z3950-ZOOM-1.21/samples/cql/
-Net-Z3950-ZOOM-1.21/samples/cql/pqf.properties
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/async.pl
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/zoomtst3.pl
-Net-Z3950-ZOOM-1.21/README
-Net-Z3950-ZOOM-1.21/Changes
-Net-Z3950-ZOOM-1.21/META.yml
-Net-Z3950-ZOOM-1.21/MANIFEST
-Net-Z3950-ZOOM-1.21/ZOOM.xs
-Net-Z3950-ZOOM-1.21/MANIFEST.SKIP
-Net-Z3950-ZOOM-1.21/Makefile.PL
-Net-Z3950-ZOOM-1.21/t/
-Net-Z3950-ZOOM-1.21/t/29-events.t
-Net-Z3950-ZOOM-1.21/t/11-option-callback.t
-Net-Z3950-ZOOM-1.21/t/15-scan.t
-Net-Z3950-ZOOM-1.21/t/16-packages.t
-Net-Z3950-ZOOM-1.21/t/13-resultset.t
-Net-Z3950-ZOOM-1.21/t/24-sorting.t
-Net-Z3950-ZOOM-1.21/t/17-logging.t
-Net-Z3950-ZOOM-1.21/t/20-options.t
-Net-Z3950-ZOOM-1.21/t/12-query.t
-Net-Z3950-ZOOM-1.21/t/10-options.t
-Net-Z3950-ZOOM-1.21/t/1-Net-Z3950-ZOOM.t
-Net-Z3950-ZOOM-1.21/t/22-query.t
-Net-Z3950-ZOOM-1.21/t/27-logging.t
-Net-Z3950-ZOOM-1.21/t/25-scan.t
-Net-Z3950-ZOOM-1.21/t/19-events.t
-Net-Z3950-ZOOM-1.21/t/14-sorting.t
-Net-Z3950-ZOOM-1.21/t/28-charset.t
-Net-Z3950-ZOOM-1.21/t/23-resultset.t
-Net-Z3950-ZOOM-1.21/t/26-packages.t
-Net-Z3950-ZOOM-1.21/t/18-charset.t
-Net-Z3950-ZOOM-1.21/t/2-ZOOM.t
-Net-Z3950-ZOOM-1.21/t/21-option-callback.t
-Net-Z3950-ZOOM-1.21/typemap
-Net-Z3950-ZOOM-1.21/lib/
-Net-Z3950-ZOOM-1.21/lib/ZOOM.pm
-Net-Z3950-ZOOM-1.21/lib/ZOOM.pod
-Net-Z3950-ZOOM-1.21/lib/Net/
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950/
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950/ZOOM.pm
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950.pm
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-
-ERROR: Unable to call script: yaz-config
-If you are using a YAZ installation from the Debian package "yaz", you
-will also need to install "libyaz-dev" in order to build this module.
-Warning: No success on command[/usr/bin/perl Makefile.PL]
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-  /usr/bin/perl Makefile.PL -- NOT OK
-Running make test
-  Make had some problems, won't test
-Running make install
-  Make had some problems, won't install
-Could not read '/root/.cpan/build/Net-Z3950-ZOOM-1.21-gHBrEl/META.yml'. Falling back to other methods to determine 
-
-prerequisites
-Failed during this command:
- MIRK/Net-Z3950-ZOOM-1.21.tar.gz              : writemakefile NO '/usr/bin/perl Makefile.PL' returned status 512
-|--------------------
-
-== Installing libyaz, libyaz-devel and yaz for Net::Z3950::ZOOM ==
-
-OK... So we ran through a problem with a missing "yaz-config" while installing Net::Z3950::ZOOM. To solve this, let's first install the libyaz package:
-
-  * Install the libyaz package:
-|--------------------
-# yast -i libyaz
-|--------------------
-[This will also install 1 dependency: libxslt]
-
-We also have to install another package:libyaz-devel. libyaz-devel is NOT available in the openSUSE 11 DVD but it is available in the Official openSUSE 11 OSS Repository. If you have skipped that step, add that repository in yast first.
-
-  * Install the libyaz-devel package:
-|--------------------
-# yast -i libyaz-devel
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-Installing libyaz-devel will also add some other packages that libyaz-devel depends on, namely: 
-zlib-devel, tcpd-devel, tack, libgpg-error-devel, ncurses-devel, libopenssl-devel, libgcrypt-devel, readline-devel, libxml2-devel and libxslt-devel.
-
-  * Install the yaz package:
-|--------------------
-# yast -i yaz
-|--------------------
-
-(//15-Jul-2008: Thanks to Bob Ewart for catching this missing step of installing yaz//)
-
-
-Let's now install the Net::Z3950::ZOOM Perl Module:
-
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Net::Z3950::ZOOM
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-
-=== Install some "PDF" Perl Modules ===
-
-|--------------------
-myhost:~ # yast -i perl-PDF-API2
-
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install PDF::API2::Page
-PDF::API2::Page is up to date (2.001).
-
-cpan[2]> install PDF::API2::Util
-PDF::API2::Util is up to date (2.000).
-
-
-cpan[3]> install PDF::Reuse
-
-Warning: prerequisite Font::TTF 0 not found.
-Warning: prerequisite Text::PDF::TTFont0 0 not found.
-Writing Makefile for PDF::Reuse
-Could not read '/root/.cpan/build/PDF-Reuse-0.35-rBhjys/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----      LARSLUND/PDF-Reuse-0.35.tar.gz      ----
-    Text::PDF::TTFont0 [requires]
-    Font::TTF [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[4]> install PDF::Reuse::Barcode
-
-Warning: prerequisite Barcode::Code128 0 not found.
-Writing Makefile for PDF::Reuse::Barcode
----- Unsatisfied dependencies detected during ----
-----  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz  ----
-    Barcode::Code128 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-Barcode-Code128-2.01/lib/Barcode/
-Barcode-Code128-2.01/lib/Barcode/Code128.pm
-Barcode-Code128-2.01/META.yml
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build W/WR/WRW/Barcode-Code128-2.01.tar.gz
-
-Checking if your kit is complete...
-Looks good
-Writing Makefile for Barcode::Code128
-Could not read '/root/.cpan/build/Barcode-Code128-2.01-1g3s6u/META.yml'. Falling back to other methods to determine prerequisites
-cp lib/Barcode/Code128.pm blib/lib/Barcode/Code128.pm
-Manifying blib/man3/Barcode::Code128.3pm
-  WRW/Barcode-Code128-2.01.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
-t/barcode....ok
-t/gif........ok 1/0skipped
-        all skipped: no reason given
-t/png........FAILED test 2
-        Failed 1/2 tests, 50.00% okay
-Failed Test Stat Wstat Total Fail  List of Failed
--------------------------------------------------------------------------------
-t/png.t                    2    1  2
-1 test skipped.
-Failed 1/3 test scripts. 0/4 subtests failed.
-Files=3, Tests=4,  1 wallclock secs ( 0.17 cusr +  0.27 csys =  0.44 CPU)
-Failed 1/3 test programs. 0/4 subtests failed.
-make: *** [test_dynamic] Error 255
-  WRW/Barcode-Code128-2.01.tar.gz
-  /usr/bin/make test -- NOT OK
-//hint// to see the cpan-testers results for installing this module, try:
-  reports WRW/Barcode-Code128-2.01.tar.gz
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-  make test had returned bad status, won't install without force
-Running make for L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  Has already been unwrapped into directory /root/.cpan/build/PDF-Reuse-Barcode-0.05-xyOb8t
-
-  CPAN.pm: Going to build L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-
-Warning: Prerequisite 'Barcode::Code128 => 0' for 'L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz' failed when processing 'W/WR/WRW/Barcode-Code128-2.01.tar.gz' with 'make_test => NO'. Continuing, but chances to succeed are limited.
-cp Barcode.pm blib/lib/PDF/Reuse/Barcode.pm
-Manifying blib/man3/PDF::Reuse::Barcode.3pm
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-Iblib/lib" "-Iblib/arch" test.pl
-1..15
-# Running under perl version 5.010000 for linux
-# Current time local: Mon Dec  1 23:33:14 2008
-# Current time GMT:   Mon Dec  1 23:33:14 2008
-# Using Test.pm version 1.25
-ok 1
-ok 2
-ok 3
-ok 4
-ok 5
-ok 6
-ok 7
-ok 8
-ok 9
-ok 10
-ok 11
-ok 12
-ok 13
-Can't find Barcode::Code128 - can't produce those barcodes
-not ok 14
-# Failed test 14 in test.pl at line 18
-#  test.pl line 18 is: ok(find('Barcode::Code128'));
-ok 15
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-Tests succeeded but one dependency not OK (Barcode::Code128)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  [dependencies] -- NA
-Running make install
-  make test had returned bad status, won't install without force
-Failed during this command:
- WRW/Barcode-Code128-2.01.tar.gz              : make_test NO
- LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz       : make_test NO one dependency not OK (Barcode::Code128)
-
-|--------------------
-
-
-**01-Dec-2008**: Oh well... So, it seems that the installation of PDF::Reuse::Barcode failed due to a Perl Module dependency - "Barcode::Code128" - that, in turn, fails to install when doing some PNG related tests. According to Galen Charlton (from LibLime) - http://lists.katipo.co.nz/public/koha/2007-December/012843.html - "There seem to be various problems with Barcode::Code128 on various platforms, particularly with its test suite. The barcode generation functionality is used in only a couple places in Koha, so for quick-and-dirty testing, doing a force install of that module should be OK."
-
-On a related note, this "Barcode::Code128" installation bug is being tracked at:
-
-#28369: test result negative maybe due to library skew 
- http://rt.cpan.org/Public/Bug/Display.html?id=28369
-
-OK. So, let's do then a "force install" of the Barcode::Code128 Perl Module in the same CPAN prompt:
-
-|--------------------
-cpan[5]> force install "Barcode::Code128"
-|--------------------
-
-And still in the same CPAN prompt, let's now try again to install "PDF::Reuse::Barcode":
-|--------------------
-cpan[6]> install PDF::Reuse::Barcode
-|--------------------
-
-=== Install the "POE" Perl Module ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[5]> install POE
-
-
-Some of POE's tests require a functional network.
-You can skip these tests if you'd like.
-
-Would you like to skip the network tests? [n]
-
-*** Some optional features may not be available:
-***   Curses 1.08 could not be loaded.
-***   Event 1 could not be loaded.
-***   Gtk 0.7009 could not be loaded.
-***   IO::Pty 1.02 could not be loaded.
-***   Socket6 0.14 could not be loaded.
-***   Tk 800.027 could not be loaded.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite POE::Test::Loops 1.002 not found.
-Writing Makefile for POE
-Could not read '/root/.cpan/build/POE-1.003-0euNum/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----         RCAPUTO/POE-1.003.tar.gz         ----
-    POE::Test::Loops [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-|--------------------
-
-
-=== Install the "SMS::Send" Perl Module ===
-
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[6]> install SMS::Send
-
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Class::Adapter 1.00 not found.
-Warning: prerequisite Params::Util 0.14 not found.
-Writing Makefile for SMS::Send
-Could not read '/root/.cpan/build/SMS-Send-0.05-xGdd7H/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        ADAMK/SMS-Send-0.05.tar.gz        ----
-    Params::Util [requires]
-    Class::Adapter [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-cpan[7]> quit
-Lockfile removed.
-
-|--------------------
-
-=== Install the "Schedule::At" Perl Module ===
-
-  * Install "at":
-|--------------------
-# yast -i at
-|--------------------
-  * Install the Schedule::At Perl module:
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Schedule::At
-|--------------------
-
-=== Install some "Text" Perl Modules ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install Text::CSV
-
-
-cpan[3]> install Text::CSV_XS
-
-
-cpan[4]> install Text::Iconv
-
-cpan[5]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install some "XML" Perl Modules ===
-|--------------------
-myhost:~ # yast -i perl-XML-Dumper
-
-myhost:~ # yast -i perl-XML-LibXSLT
-
-
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-
-cpan[1]> install XML::RSS
-
-Warning: prerequisite DateTime 0 not found.
-Warning: prerequisite DateTime::Format::Mail 0 not found.
-Warning: prerequisite DateTime::Format::W3CDTF 0 not found.
-Warning: prerequisite Test::Manifest 0.9 not found.
-Writing Makefile for XML::RSS
-Could not read '/root/.cpan/build/XML-RSS-1.32-7BXl7q/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        SHLOMIF/XML-RSS-1.32.tar.gz       ----
-    DateTime [requires]
-    DateTime::Format::W3CDTF [requires]
-    Test::Manifest [requires]
-    DateTime::Format::Mail [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite DateTime::Locale 0.4 not found.
-Warning: prerequisite DateTime::TimeZone 0.59 not found.
-Warning: prerequisite Params::Validate 0.76 not found.
-Writing Makefile for DateTime
-Could not read '/root/.cpan/build/DateTime-0.4302-YXqzkk/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----      DROLSKY/DateTime-0.4302.tar.gz      ----
-    DateTime::Locale [requires]
-    DateTime::TimeZone [requires]
-    Params::Validate [requires]
-    Time::y2038 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Checking prerequisites...
- - ERROR: Params::Validate is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'DateTime-Locale' version '0.4001'
-Could not read '/root/.cpan/build/DateTime-Locale-0.4001-ThLGMW/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----   DROLSKY/DateTime-Locale-0.4001.tar.gz  ----
-    Params::Validate [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Checking prerequisites...
- - ERROR: Class::Singleton is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'DateTime-TimeZone' version '0.77'
-Could not read '/root/.cpan/build/DateTime-TimeZone-0.77-MPrKnn/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----   DROLSKY/DateTime-TimeZone-0.77.tar.gz  ----
-    Class::Singleton [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-B/BD/BDFOY/Test-Manifest-1.22.tar.gz is just needed temporarily during building or testing. Do you want to install it permanently? (Y/n) [yes]
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "YAML::Syck" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-YAML-Syck
-|--------------------
-
-
-==== Create the Koha User and Group ====
+== Create the Koha User and Group ==
 
 |--------------------
 # useradd koha
@@ -2621,53 +1126,49 @@ Password changed.
 # groupadd koha
 |--------------------
 
-
-
-==== Run make test ====
+== Run make test ==
 |--------------------
 myhost:~/Koha # make test
 cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png
 cp opac/opac-changelanguage.pl blib/OPAC_CGI_DIR/opac/opac-changelanguage.pl
-cp koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/liblime-kids/card.gif 
-
-blib/INTRANET_TMPL_DIR/prog/img/itemtypeimg/liblime-kids/card.gif
+cp koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/liblime-kids/card.gif blib/INTRANET_TMPL_DIR/prog/img/itemtypeimg/liblime-kids/card.gif
 cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif
-|--------------------
+
 [many more lines beginning with "cp" should appear...]
 
-|--------------------
-t/Amazon....................ok
-t/Barcodes_PrinterConfig....ok
-t/Bookfund..................ok
-t/Bookseller................ok
-t/Boolean...................ok
-t/Branch....................ok
-t/Calendar..................ok
-t/Charset...................ok
-t/Debug.....................# BEFORE use:     $debug is not defined
+t/Amazon.t .................. ok   
+t/Barcodes_PrinterConfig.t .. ok   
+t/Bookfund.t ................ ok   
+t/Bookseller.t .............. ok   
+t/Boolean.t ................. ok     
+t/Branch.t .................. ok   
+t/Calendar.t ................ ok   
+t/Charset.t ................. ok   
+t/Debug.t ................... # BEFORE use:     $debug is not defined
 # BEFORE use: $cgi_debug is not defined
-t/Debug.....................ok 1/3#  AFTER use:     $debug is 0
+t/Debug.t ................... 1/3 #  AFTER use:     $debug is 0
 #  AFTER use: $cgi_debug is 0
 # Done.
-t/Debug.....................ok
-t/dummy.....................ok
-t/Input.....................ok
-t/Koha......................ok
-t/Languages.................ok
-t/Maintainance..............ok
-t/Output....................ok
-t/Record....................ok
-t/Review....................ok
-t/Scrubber..................ok 1/10# Note: scrubber test output will have whitespace collapsed for readability
+t/Debug.t ................... ok   
+t/dummy.t ................... ok   
+t/Input.t ................... ok   
+t/Koha.t .................... ok   
+t/Languages.t ............... ok   
+t/Maintainance.t ............ ok   
+t/Output.t .................. ok   
+t/Record.t .................. ok   
+t/Review.t .................. ok   
+t/Scrubber.t ................ 1/10 # Note: scrubber test output will have whitespace collapsed for readability
 # done.
-t/Scrubber..................ok
-t/Stats.....................ok
+t/Scrubber.t ................ ok     
+t/Stats.t ................... ok   
 All tests successful.
-Files=19, Tests=47, 21 wallclock secs ( 4.82 cusr +  5.55 csys = 10.37 CPU)
+Files=19, Tests=47,  3 wallclock secs ( 0.06 usr  0.08 sys +  2.12 cusr  0.25 csys =  2.51 CPU)
+Result: PASS
 |--------------------
+So here it shows all is OK. I don't expect any problems to appear, otherwise you may need to read the document on installing Koha on openSUSE 11.0.
 
-
-=== Run "make install" ===
+== Run "make install" ==
 
 Now, we will run make install:
 
@@ -2676,12 +1177,13 @@ myhost:~/Koha # make install
 |--------------------
 [Several lines starting with "Manifying" and many lines starting with "Installing" will scroll by...]
 |--------------------
-Installing /usr/share/koha/man/man3/reports::catalogue_out.3pm
-Installing /usr/share/koha/man/man3/reports::dictionary.3pm
-Installing /usr/share/koha/man/man3/C4::Search::PazPar2.3pm
-Installing /usr/share/koha/man/man3/C4::Scrubber.3pm
-Installing /usr/share/koha/man/man3/reports::itemslost.3pm
-Installing /usr/share/koha/man/man3/C4::Barcodes::PrinterConfig.3pm
+Installing /usr/share/koha/man/man3/serials::serial-issues.3pm
+Installing /usr/share/koha/man/man3/C4::Context.3pm
+Installing /usr/share/koha/man/man3/cataloguing::value_builder::unimarc_field_123f.3pm
+Installing /usr/share/koha/man/man3/cataloguing::addbiblio.3pm
+Installing /usr/share/koha/man/man3/cataloguing::value_builder::unimarc_field_128c.3pm
+Installing /usr/share/koha/man/man3/tools::viewlog.3pm
+Installing /usr/share/koha/man/man3/admin::branches.3pm
 
 Koha's files have now been installed.
 
@@ -2697,18 +1199,18 @@ For other post-installation tasks, please consult the README.
 myhost:/etc #
 |--------------------
 
-==== Create /etc/bash.bashrc.local ====
+== Create /etc/bash.bashrc.local ==
 Create a file called bash.bashrc.local in the /etc directory:
 |--------------------
 myhost:/etc # vim /etc/bash.bashrc.local
 |--------------------
-add these 2 lines in the file:
+Add these 2 lines in the file:
 |--------------------
 export KOHA_CONF=/etc/koha/koha-conf.xml
 export PERL5LIB=/usr/share/koha/lib
 |--------------------
 
-- EXIT THE SHELL AND LOG BACK IN.
+Exit the shell and log back in.
 |--------------------
 myhost:/etc # exit
 |--------------------
@@ -2722,22 +1224,22 @@ myhost:~ # env | grep PERL5LIB
 PERL5LIB=/usr/share/koha/lib
 |--------------------
 
-=== Koha's Web Installer ===
+== Koha's Web Installer ==
 
 Access Koha's web installer at:
 
-http://192.168.0.2:8080/
+http://192.168.1.16:8080/
 
 Your browser will probably say that:
 |--------------------
-" The server at 192.168.0.2 is taking too long to respond."
+" The server at 192.168.1.16 is taking too long to respond."
 |--------------------
-OK... It seems that we have to do some things yet.
-
+OK... It seems that we have still have to do something.
 
 == Create a symbolic link to /etc/koha/koha-httpd.conf ==
 
-Let's create a symbolic link to the /etc/koha/koha-httpd.conf file in the /etc/apache2/vhosts.d directory:
+Let's create a symbolic link to the /etc/koha/koha-httpd.conf file in the /etc/apache2/vhosts.d directory
+:
 |--------------------
 myhost:~ # cd /etc/apache2/vhosts.d/
 
@@ -2748,18 +1250,17 @@ myhost:/etc/apache2/vhosts.d # ln -s /etc/koha/koha-httpd.conf koha-httpd.conf
 |--------------------
 myhost:/etc/apache2/conf.d # service apache2 restart
 Syntax error on line 28 of /etc/apache2/conf.d/koha-httpd.conf:
-Invalid command 'RewriteEngine', perhaps misspelled or defined by a module not included in the server configuration
+Invalid command 'RewriteEngine', perhaps misspelled or defined by a module
+not included in the server configuration
 |--------------------
 
+== Enable the mod_rewrite Apache module ==
 
-
-== Enable the mod_rewrite and mod_deflate Apache modules ==
-
-OK... It seems that we need to enable the mod_rewrite and the mod_deflate Apache module:
+OK... It seems that we need to enable the mod_rewrite Apache module:
 |--------------------
-myhost:/etc/sysconfig # a2enmod rewrite deflate
+myhost:/etc/sysconfig # a2enmod rewrite
 |--------------------
-[If the above command seems NOT to work, for some reason, do this - edit /etc/sysconfig/apache2 and add the words "rewrite" -and "deflate"- (without the quotes) at the end of the APACHE_MODULES line, right before the right quote]
+If the above command seems NOT to work, for some reason, do this - edit /etc/sysconfig/apache2 and add the word "rewrite" (without the quotes) at the end of the APACHE_MODULES line, right before the right quote
 |--------------------
 myhost:/etc/sysconfig # service apache2 restart
 Syntax OK
@@ -2767,16 +1268,14 @@ Shutting down httpd2 (waiting for all children to terminate)         done
 Starting httpd2 (prefork)                                            done
 |--------------------
 
-
 == Change koha-httpd.conf ==
 
-If you browsed again to http://192.168.0.2:8080 you would still get no answer. This is because we still have to do some changes to the koha-httpd.conf file.
+If you browsed again to http://192.168.1.16:8080 you would still get no answer. This is because we still have to do some changes to the koha-httpd.conf file. Unless you did not follow this tutorial and port 8080 is not open. Look back in this page to find out how.
 
 First, let's create a backup of this file:
 |--------------------
 myhost:/etc/apache2/vhosts.d # cp koha-httpd.conf koha-httpd.conf.ORIG
 
-
 myhost:/etc/koha # vim koha-httpd.conf
 |--------------------
 
@@ -2787,7 +1286,8 @@ Listen 8080
 In that file, you should find two VirtualHost sections: one for the OPAC area of Koha and the other one for the Intranet. 
 If the two virtualHost directives - the lines that start with <nowiki><VirtualHost</nowiki> - in that file are set for the IP Address 127.0.0.2, replace them by the correct IP address of your server.
 
-That file will have 2 ServerName directives (one for each of the 2 VirtualHosts). In those directives, you should have the IP of your server -or- the FQDN of your server (example: ServerName www.koha.test).
+That file will have 2 ServerName directives (one for each of the 2 VirtualHosts).
+In those directives, you should have the IP of your server -or- the FQDN of your server (example: ServerName koha-server.univ.org).
 
 Now, restart again Apache:
 |--------------------
@@ -2797,10 +1297,9 @@ Shutting down httpd2 (waiting for all children to terminate)         done
 Starting httpd2 (prefork)                                            done
 |--------------------
 
-
 Try to access the web page:
 
-http://192.168.0.2/
+http://192.168.1.16/
 
 If you get again the "It Works!" web page, you'll probably have to Refresh/Reload the page in your browser (press the F5 key).
 
@@ -2810,15 +1309,16 @@ Forbidden
 
 You don't have permission to access / on this server.
 
-Additionally, a 403 Forbidden error was encountered while trying to use an ErrorDocument to handle the request.
-Apache/2.2.4 (Linux/SUSE) Server at 192.168.0.2 Port 8080
+Additionally, a 403 Forbidden error was encountered while trying to use an
+ErrorDocument to handle the request.
+Apache/2.2.4 (Linux/SUSE) Server at 192.168.1.16 Port 8080
 |--------------------
 
 OK. Let's add then the following directive at the end of the koha-httpd.conf file:
 |--------------------
 <Directory /usr/share/koha>
-        Order allow,deny
-        Allow from all
+  Order allow,deny
+  Allow from all
 </Directory>
 |--------------------
 
@@ -2832,62 +1332,25 @@ Starting httpd2 (prefork)                                            done
 
 OK. Load again the following page in your web browser:
 
-http://192.168.0.2
+http://192.168.1.16
+
 
 After some seconds you should be redirected to:
 
 http://192.168.0.2/cgi-bin/koha/maintenance.pl
 
-
-and see a Koha page saying:
-|--------------------
-"System Maintenance ... we'll be back soon! If you have any questions, please contact the Site Administrator"
-|--------------------
+and see a Koha page with the following text:
+"System Maintenance... we'll be back soon! If you have any questions, please contact the Site Administrator"
 
 This is actually GOOD NEWS!  :)  It's now time to set up Koha in the Intranet interface.
 
-
 To do that, browse to:
 
-
 http://192.168.0.2:8080
 
+You should see a page with the title "Welcome to the Koha Web Installer", and with a "Username" and a "Password" textboxes.
 
-== Enable port 8080 in the firewall ==
-
-After a while the page will probably time out. This is because we now have to allow the 8080 port in the firewall.
-
-Let's run yast and do that:
-|--------------------
-myhost:/etc/apache2/vhosts.d # yast
-|--------------------
-Inside yast, go to "Security and Users" -> "Firewall"
-
-Scroll down to "Allowed Services" on the left side and press ENTER
-
-Press TAB several times until you reach the "Apache2" allowed service on the right side. When you do that, 
-press Alt+d to click the "Advanced..." button.
-
-A new window should open. Press Alt+T to go to the "TCP Ports" text box and enter the following values in that box:
-80 8080
-
-Press Alt+O to click the OK button. That will send you back to the "Firewall Configuration:Allowed Services" 
-screen. Press Alt+N to click the "Next" button. 
-
-You should now be in the "Firewall Configuration: Summary" screen. Press "Alt+F" to Finish.
-
-You should now be again in the "YaST Control Center" screen. Press "Alt+Q" to quit yast.
-
-
-Go again to:
-
-http://192.168.0.2:8080/
-
-... you should get redirected to:
-
-http://192.168.0.2:8080/cgi-bin/koha/installer/install.pl
-
-... and see a page with the Koha Logo and the heading: "Welcome to the Koha Web Installer"!  :)
+If not you may have forgotten to open the 8080 port.
 
 
 You may now login with your koha administrator username and password and reply to the several questions you will be asked.
-- 
1.7.2.5



From robin at catalyst.net.nz  Thu Jun  9 07:13:25 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  9 Jun 2011 17:13:25 +1200
Subject: [Koha-patches] [PATCH] Bug 6486 - add the koha-mysql command
Message-ID: <1307596405-8949-1-git-send-email-robin@catalyst.net.nz>

This lets you get into the mysql session for this library instance
really easily. Probably most useful for developers.
---
 debian/scripts/koha-mysql |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100755 debian/scripts/koha-mysql

diff --git a/debian/scripts/koha-mysql b/debian/scripts/koha-mysql
new file mode 100755
index 0000000..fb3fba9
--- /dev/null
+++ b/debian/scripts/koha-mysql
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# koha-mysql: provide an interactive mysql shell set up for the specified
+#   koha instance.
+# Copyright 2011  Catalyst IT, Ltd
+# 
+# This program 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 3 of the License, or
+# (at your option) any later version.
+# 
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+umask 0077
+
+die() {
+    echo "$@" 1>&2
+    exit 1
+}
+
+[ "$#" = 1 ] || die "Usage: $0 instancename"
+name="$1"
+kohaconfig="/etc/koha/sites/$name/koha-conf.xml"
+
+mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )"
+mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )"
+mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )"
+mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )"
+
+mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \
+    "$mysqldb"
+
-- 
1.7.4.1


From robin at catalyst.net.nz  Thu Jun  9 07:16:12 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  9 Jun 2011 17:16:12 +1200
Subject: [Koha-patches] [PATCH] Bug 6486 - make koha-mysql get installed
	with the packages
Message-ID: <1307596572-9048-1-git-send-email-robin@catalyst.net.nz>

A useful addition I overlooked.
---
 debian/koha-common.install |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/koha-common.install b/debian/koha-common.install
index a970719..58efe3a 100644
--- a/debian/koha-common.install
+++ b/debian/koha-common.install
@@ -17,6 +17,7 @@ debian/scripts/koha-email-enable            usr/sbin
 debian/scripts/koha-enable                  usr/sbin
 debian/scripts/koha-foreach                 usr/sbin
 debian/scripts/koha-list                    usr/sbin
+debian/scripts/koha-mysql                   usr/sbin
 debian/scripts/koha-rebuild-zebra           usr/sbin
 debian/scripts/koha-remove                  usr/sbin
 debian/scripts/koha-reset-passwd            usr/sbin
-- 
1.7.4.1


From colin.campbell at ptfs-europe.com  Thu Jun  9 16:11:30 2011
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu,  9 Jun 2011 15:11:30 +0100
Subject: [Koha-patches] [PATCH] Remove a typo from serials-edit template
Message-ID: <1307628690-7777-1-git-send-email-colin.campbell@ptfs-europe.com>

Rogue 'i' removed from template would show up in display
---
 .../prog/en/modules/serials/serials-edit.tt        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 145166d..8ffd32e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -178,7 +178,7 @@ $(document).ready(function() {
 	<div class="yui-b">
 
 <h1>Serial Edition <i>[% bibliotitle %]</i>
-	i[% IF location %] ( [% location %] ) [% END %]
+	[% IF location %] ( [% location %] ) [% END %]
     [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]</h1>
 <form method="post" name="f" action="serials-edit.pl" id="serials_edit">
 <!--onsubmit="return barcode_check()">-->
-- 
1.7.5.2


From oleonard at myacpl.org  Thu Jun  9 16:23:31 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  9 Jun 2011 10:23:31 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 6487 - No error explanation if
	patron expiration date is missing
Message-ID: <1307629411-11840-1-git-send-email-oleonard@myacpl.org>

The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.

I wonder if this line was supposed to catch this problem:

Line 233: if ( $warning_year*$warning_month*$warning_day==0

This patch adds "!$borrower->{'dateexpiry'} ||" to that line.
---
 circ/circulation.pl                                |    4 ++--
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8c359b1..c34db54 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -230,7 +230,7 @@ if ($borrowernumber) {
             0 , $borrower->{'enrolmentperiod'});
     }
     # if the expiry date is before today ie they have expired
-    if ( $warning_year*$warning_month*$warning_day==0 
+    if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
         || Date_to_Days($today_year,     $today_month, $today_day  ) 
          > Date_to_Days($warning_year, $warning_month, $warning_day) )
     {
@@ -238,7 +238,7 @@ if ($borrowernumber) {
         $template->param(
             flagged  => "1",
             noissues => "1",
-            expired     => format_date($borrower->{dateexpiry}),
+            expired => "1",
             renewaldate => format_date("$renew_year-$renew_month-$renew_day")
         );
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index afa6ec5..d2f6405 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -554,7 +554,7 @@ No patron matched <span class="ex">[% message %]</span>
 
 			[% IF ( expired ) %]
 			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
-			Patron's card expired on [% expiry %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
+			[% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
 
 			</li>
 			[% END %]
-- 
1.7.3


From oleonard at myacpl.org  Thu Jun  9 16:30:11 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  9 Jun 2011 10:30:11 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6280 : Don't generate
	invalid SQL in GetPendingIssues
Message-ID: <1307629811-11923-1-git-send-email-oleonard@myacpl.org>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Change to parameter list in GetPendingIssues made it
callable by an empty list resulting in invalid sql being
sent to server. As this was occuring on most issues error log
was filling up. Put safeguard in the routine
Also don't bother calling when you have no need

Some of the processing was needlessly obscure

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 C4/Members.pm         |   19 +++++++++++++------
 circ/circulation.pl   |    8 ++++++--
 members/moremember.pl |    9 ++++++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..6cc6557 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1023,13 +1023,19 @@ The keys include C<biblioitems> fields except marc and marcxml.
 
 #'
 sub GetPendingIssues {
-    my (@borrowernumbers) = @_;
+    my @borrowernumbers = @_;
+
+    unless (@borrowernumbers ) { # return a ref_to_array
+        return \@borrowernumbers; # to not cause surprise to caller
+    }
 
     # Borrowers part of the query
     my $bquery = '';
     for (my $i = 0; $i < @borrowernumbers; $i++) {
-        $bquery .= " borrowernumber = ?";
-        $bquery .= " OR" if ($i < (scalar(@borrowernumbers) - 1));
+        $bquery .= ' borrowernumber = ?';
+        if ($i < $#borrowernumbers ) {
+            $bquery .= ' OR';
+        }
     }
 
     # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
@@ -1070,9 +1076,10 @@ sub GetPendingIssues {
     $sth->execute(@borrowernumbers);
     my $data = $sth->fetchall_arrayref({});
     my $today = C4::Dates->new->output('iso');
-    foreach (@$data) {
-        $_->{date_due} or next;
-        ($_->{date_due} lt $today) and $_->{overdue} = 1;
+    foreach (@{$data}) {
+        if ($_->{date_due}  and $_->{date_due} lt $today) {
+            $_->{overdue} = 1;
+        }
     }
     return $data;
 }
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8c359b1..80b24da 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -463,8 +463,11 @@ if ($borrower) {
     #push @borrowernumbers, $borrower->{'borrowernumber'};
 
     # get each issue of the borrower & separate them in todayissues & previous issues
-    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
-    my ($relissueslist) = GetPendingIssues(@relborrowernumbers);
+    my $issueslist = GetPendingIssues($borrower->{'borrowernumber'});
+    my $relissueslist = [];
+    if ( @relborrowernumbers ) {
+        $relissueslist = GetPendingIssues(@relborrowernumbers);
+    }
 
     build_issue_data($issueslist, 0);
     build_issue_data($relissueslist, 1);
@@ -477,6 +480,7 @@ if ($borrower) {
     else {
         @todaysissues   = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
     }
+
     if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
         @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
     }
diff --git a/members/moremember.pl b/members/moremember.pl
index b766f2f..e1a5dbf 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -242,9 +242,12 @@ if ( C4::Context->preference('OPACPrivacy') ) {
 #
 my @borrowernumbers = GetMemberRelatives($borrowernumber);
 my $issue       = GetPendingIssues($borrowernumber);
-my $relissue    = GetPendingIssues(@borrowernumbers);
-my $issuecount = scalar(@$issue);
-my $relissuecount  = scalar(@$relissue);
+my $relissue    = [];
+if ( @borrowernumbers ) {
+    $relissue    = GetPendingIssues(@borrowernumbers);
+}
+my $issuecount     = @{$issue};
+my $relissuecount  = @{$relissue};
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
 my @issuedata;
-- 
1.7.3


From nengard at bywatersolutions.com  Wed Jun  8 16:07:32 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed,  8 Jun 2011 10:07:32 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 6487 - No error
	explanation if patron expiration date is missing
Message-ID: <1307542052-6210-1-git-send-email-nengard@bywatersolutions.com>

From: Owen Leonard <oleonard at myacpl.org>

The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.

I wonder if this line was supposed to catch this problem:

Line 233: if ( $warning_year*$warning_month*$warning_day==0

This patch adds "!$borrower->{'dateexpiry'} ||" to that line.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 circ/circulation.pl                                |    4 ++--
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8c359b1..c34db54 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -230,7 +230,7 @@ if ($borrowernumber) {
             0 , $borrower->{'enrolmentperiod'});
     }
     # if the expiry date is before today ie they have expired
-    if ( $warning_year*$warning_month*$warning_day==0 
+    if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
         || Date_to_Days($today_year,     $today_month, $today_day  ) 
          > Date_to_Days($warning_year, $warning_month, $warning_day) )
     {
@@ -238,7 +238,7 @@ if ($borrowernumber) {
         $template->param(
             flagged  => "1",
             noissues => "1",
-            expired     => format_date($borrower->{dateexpiry}),
+            expired => "1",
             renewaldate => format_date("$renew_year-$renew_month-$renew_day")
         );
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index afa6ec5..d2f6405 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -554,7 +554,7 @@ No patron matched <span class="ex">[% message %]</span>
 
 			[% IF ( expired ) %]
 			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
-			Patron's card expired on [% expiry %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
+			[% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
 
 			</li>
 			[% END %]
-- 
1.7.2.3


From tdavis at uttyler.edu  Thu Jun  9 21:49:04 2011
From: tdavis at uttyler.edu (Elliott Davis)
Date: Thu, 9 Jun 2011 14:49:04 -0500
Subject: [Koha-patches] Patch for bug 6491
Message-ID: <8754F6E19960C249BB9C8FFECA627740013C44F033@dogbert>

Added: id in opac-privacy around the privacy policy div container

Testing: An ID should appear in the container for the privacy rules saying userprivacy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110609/97ad0ede/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Added-id-in-opac-privacy-around-the-privacy-policy-d.patch
Type: application/octet-stream
Size: 1077 bytes
Desc:  0001-Added-id-in-opac-privacy-around-the-privacy-policy-d.patch
URL: </pipermail/koha-patches/attachments/20110609/97ad0ede/attachment.obj>

From nengard at bywatersolutions.com  Wed Jun  8 18:16:00 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed,  8 Jun 2011 12:16:00 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6491 Added: id in
	opac-privacy around the privacy policy div container Testing:
	An ID should appear in the container for the privacy rules
	saying userprivacy
Message-ID: <1307549760-6789-1-git-send-email-nengard@bywatersolutions.com>

From: Elliott Davis <tdavis at uttyler.edu>


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index ec880d3..de34e02 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Privacy management for [% firstname %] [% surname %]
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
-<body>
+<body id="opac-privacy">
 <div id="doc3" class="yui-t1">
    <div id="bd">
 [% INCLUDE 'masthead.inc' %]
-- 
1.7.2.3


From pianohacker at gmail.com  Fri Jun 10 01:24:55 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Thu,  9 Jun 2011 17:24:55 -0600
Subject: [Koha-patches] [PATCH] Bug 6492 - Deleted biblios cause
	rebuild_zebra to fail
Message-ID: <1307661895-18087-1-git-send-email-pianohacker@gmail.com>

This both adds a bit of a failsafe to get_raw_biblio, and prevents
records that have been deleted from being updated by the same instance
of rebuild_zebra.
---
 misc/migration_tools/rebuild_zebra.pl |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 5be01cf..71d614b 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -191,7 +191,7 @@ sub index_records {
     my ($record_type, $directory, $skip_export, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $server_dir) = @_;
 
     my $num_records_exported = 0;
-    my $num_records_deleted = 0;
+    my $records_deleted;
     my $need_reset = check_zebra_dirs($server_dir);
     if ($need_reset) {
     	print "$0: found broken zebra server directories: forcing a rebuild\n";
@@ -212,12 +212,12 @@ sub index_records {
         if ($process_zebraqueue) {
             my $entries = select_zebraqueue_records($record_type, 'deleted');
             mkdir "$directory/del_$record_type" unless (-d "$directory/del_$record_type");
-            $num_records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml);
+            $records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml);
             mark_zebraqueue_batch_done($entries);
             $entries = select_zebraqueue_records($record_type, 'updated');
             mkdir "$directory/upd_$record_type" unless (-d "$directory/upd_$record_type");
             $num_records_exported = export_marc_records_from_list($record_type, 
-                                                                  $entries, "$directory/upd_$record_type", $as_xml, $noxml);
+                                                                  $entries, "$directory/upd_$record_type", $as_xml, $noxml, $records_deleted);
             mark_zebraqueue_batch_done($entries);
         } else {
             my $sth = select_all_records($record_type);
@@ -239,7 +239,7 @@ sub index_records {
 	my $record_fmt = ($as_xml) ? 'marcxml' : 'iso2709' ;
     if ($process_zebraqueue) {
         do_indexing($record_type, 'delete', "$directory/del_$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt) 
-            if $num_records_deleted;
+            if %$records_deleted;
         do_indexing($record_type, 'update', "$directory/upd_$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt)
             if $num_records_exported;
     } else {
@@ -361,12 +361,14 @@ sub export_marc_records_from_sth {
 }
 
 sub export_marc_records_from_list {
-    my ($record_type, $entries, $directory, $as_xml, $noxml) = @_;
+    my ($record_type, $entries, $directory, $as_xml, $noxml, $records_deleted) = @_;
 
     my $num_exported = 0;
     open (OUT, ">:utf8 ", "$directory/exported_records") or die $!;
     my $i = 0;
-    my %found = ();
+
+    # Skip any deleted records. We check for this anyway, but this reduces error spam
+    my %found = %$records_deleted;
     foreach my $record_number ( map { $_->{biblio_auth_number} }
                                 grep { !$found{ $_->{biblio_auth_number} }++ }
                                 @$entries ) {
@@ -391,7 +393,7 @@ sub export_marc_records_from_list {
 sub generate_deleted_marc_records {
     my ($record_type, $entries, $directory, $as_xml) = @_;
 
-    my $num_exported = 0;
+    my $records_deleted = {};
     open (OUT, ">:utf8 ", "$directory/exported_records") or die $!;
     my $i = 0;
     foreach my $record_number (map { $_->{biblio_auth_number} } @$entries ) {
@@ -409,11 +411,12 @@ sub generate_deleted_marc_records {
         }
 
         print OUT ($as_xml) ? $marc->as_xml_record(C4::Context->preference("marcflavour")) : $marc->as_usmarc();
-        $num_exported++;
+
+        $records_deleted->{$record_number} = 1;
     }
-    print "\nRecords exported: $num_exported\n" if ( $verbose_logging );
+    print "\nRecords exported: $i\n" if ( $verbose_logging );
     close OUT;
-    return $num_exported;
+    return $records_deleted;
     
 
 }
@@ -457,7 +460,7 @@ sub get_raw_marc_record {
             }
         } else {
             eval { $marc = GetMarcBiblio($record_number); };
-            if ($@) {
+            if ($@ || !defined($marc)) {
                 # here we do warn since catching an exception
                 # means that the bib was found but failed
                 # to be parsed
-- 
1.7.4.1


From peter at oslo.ie  Fri Jun 10 14:50:39 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:50:39 +0100
Subject: [Koha-patches] [PATCH 1/4] Initial SetUP Test
In-Reply-To: <Scooter>
References: <Scooter>
Message-ID: <1307710239-14551-1-git-send-email-peter@oslo.ie>

---
 members/moremember.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/moremember.pl b/members/moremember.pl
index b766f2f..2d79dda 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -31,7 +31,7 @@
  needs html removed and to use the C4::Output more, but its tricky
 
 =cut
-
+ 
 use strict;
 #use warnings; FIXME - Bug 2505
 use CGI;
-- 
1.7.4.1


From peter at oslo.ie  Fri Jun 10 14:54:23 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:54:23 +0100
Subject: [Koha-patches] [PATCH 1/4] Initial SetUP Test
In-Reply-To: <Scooter>
References: <Scooter>
Message-ID: <1307710466-14605-1-git-send-email-peter@oslo.ie>

---
 members/moremember.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/moremember.pl b/members/moremember.pl
index b766f2f..2d79dda 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -31,7 +31,7 @@
  needs html removed and to use the C4::Output more, but its tricky
 
 =cut
-
+ 
 use strict;
 #use warnings; FIXME - Bug 2505
 use CGI;
-- 
1.7.4.1


From peter at oslo.ie  Fri Jun 10 14:54:24 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:54:24 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_2/4=5D_Bug_5806=3A_Consortium_f?=
	=?utf-8?q?ilter_-_added_Branch_filtering_on_intranet_so_that_once_?=
	=?utf-8?q?a_librarian_chooses_a_branch=2C_details_of_any_other_bra?=
	=?utf-8?q?nch_will_be_hidden_until_another_branch_is_selected=2E_T?=
	=?utf-8?q?his_is_a_system_pref_called_searchMyLibraryOnly_that_can?=
	=?utf-8?q?_be_toggled_on_or_off?=
In-Reply-To: <1307710466-14605-1-git-send-email-peter@oslo.ie>
References: <Scooter>
 <1307710466-14605-1-git-send-email-peter@oslo.ie>
Message-ID: <1307710466-14605-2-git-send-email-peter@oslo.ie>

---
 C4/Biblio.pm                                       |    9 +-
 C4/Branch.pm                                       |   15 +
 C4/Members.pm                                      |    3 +-
 C4/Search.pm                                       |   10 +-
 INSTALL                                            |  147 -
 INSTALL.debian                                     |  387 ---
 INSTALL.fedora7                                    | 1264 ---------
 INSTALL.opensuse                                   | 2894 --------------------
 INSTALL.ubuntu                                     |  439 ---
 INSTALL.ubuntu.lucid                               |  368 ---
 LICENSE                                            |  339 ---
 MANIFEST.SKIP                                      |   12 -
 Makefile.PL                                        | 1583 -----------
 README                                             |   11 -
 README.robots                                      |   18 -
 admin/authorised_values.pl                         |   16 +-
 admin/branches.pl                                  |   14 +-
 admin/categorie.pl                                 |   14 +-
 admin/itemtypes.pl                                 |   22 +-
 catalogue/detail.pl                                |   29 +-
 catalogue/search.pl                                |   36 +-
 cataloguing/additem.pl                             |   29 +-
 fix-perl-path.PL                                   |  117 -
 install-CPAN.pl                                    |   45 -
 .../prog/en/modules/admin/preferences/admin.pref   |   11 +
 .../prog/en/modules/catalogue/results.tt           |    2 +-
 koha_perl_deps.pl                                  |  150 -
 members/member.pl                                  |   19 +-
 members/memberentry.pl                             |   24 +-
 misc/cronjobs/crontab.example                      |    2 +-
 rewrite-config.PL                                  |  196 --
 31 files changed, 229 insertions(+), 7996 deletions(-)
 delete mode 100644 INSTALL
 delete mode 100644 INSTALL.debian
 delete mode 100644 INSTALL.fedora7
 delete mode 100644 INSTALL.opensuse
 delete mode 100644 INSTALL.ubuntu
 delete mode 100644 INSTALL.ubuntu.lucid
 delete mode 100644 LICENSE
 delete mode 100644 MANIFEST.SKIP
 delete mode 100644 Makefile.PL
 delete mode 100644 README
 delete mode 100644 README.robots
 delete mode 100644 fix-perl-path.PL
 delete mode 100644 install-CPAN.pl
 delete mode 100755 koha_perl_deps.pl
 delete mode 100644 rewrite-config.PL

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index c9590c2..6e14a2c 100755
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -356,11 +356,13 @@ sub _strip_item_fields {
     # delete any item fields from incoming record to avoid
     # duplication or incorrect data - use AddItem() or ModItem()
     # to change items
+if (defined $record)
+{
     foreach my $field ( $record->field($itemtag) ) {
         $record->delete_field($field);
     }
 }
-
+}
 =head2 ModBiblioframework
 
    ModBiblioframework($biblionumber,$frameworkcode);
@@ -2679,7 +2681,10 @@ sub EmbedItemsInMarcBiblio {
         my $item_marc = C4::Items::GetMarcItem($biblionumber, $itemnumber);
         push @item_fields, $item_marc->field($itemtag);
     }
-    $marc->insert_fields_ordered(@item_fields);
+        if (defined $marc)
+        {
+             $marc->insert_fields_ordered(@item_fields);
+        }   
 }
 
 =head1 INTERNAL FUNCTIONS
diff --git a/C4/Branch.pm b/C4/Branch.pm
index abcdbd6..bf8703d 100644
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -141,6 +141,21 @@ sub GetBranches {
     return ( \%branches );
 }
 
+
+sub homeBranchFromItem
+{
+my $item = $_[0];
+
+my $dbh = C4::Context::dbh();
+my $sql = "SELECT homebranch FROM items WHERE itemnumber = ?";
+my $sth = $dbh->prepare($sql);
+$sth->execute($item);
+my @row = $sth->fetchrow_array();
+
+return $row[0];    
+}
+
+
 sub onlymine {
     return 
     C4::Context->preference('IndependantBranches') &&
diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..98ad5b8 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1403,9 +1403,10 @@ to category descriptions.
 
 #'
 sub GetborCatFromCatType {
-    my ( $category_type, $action ) = @_;
+    my ( $category_type, $action,$categorycode ) = @_;
 	# FIXME - This API  seems both limited and dangerous. 
     my $dbh     = C4::Context->dbh;
+    
     my $request = qq|   SELECT categorycode,description 
             FROM categories 
             $action
diff --git a/C4/Search.pm b/C4/Search.pm
index ab7cb59..fdaf26a 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1423,7 +1423,15 @@ sub searchResults {
     #find branchname
     #get branch information.....
     my %branches;
-    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches"); # FIXME : use C4::Branch::GetBranches
+    my $bsth;
+              if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+            $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = '". C4::Branch::mybranch() ."' "); # FIXME : use C4::Branch::GetBranches
+            }
+            else
+            {
+             $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");                
+            }
     $bsth->execute();
     while ( my $bdata = $bsth->fetchrow_hashref ) {
         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 339f667..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,147 +0,0 @@
-Koha 3.2 - the next-generation release of the award-winning Koha open-source
-integrated library system.
-
-Koha is the first open-source Integrated Library System. Developed initially in
-New Zealand by Katipo Communications, Ltd and first deployed in January of 2000
-for the Horowhenua Library Trust, it is currently maintained by a team of
-software providers and library technology staff from around the globe. Learn
-more about the Koha project at http://koha-community.org.
-
-INSTALLATION
-============
-
-You need to have a server running Perl 5.8.8 or later, MySQL 5, Zebra
-2.0.22 or greater and a webserver (preferably Apache2) before installing
-Koha.
-
-MySQL 5: Create a database called 'koha,' owned by 'kohaadmin'
-user, with a password set. Note: kohaadmin must have at least the
-following privileges: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP,
-ALTER, and LOCK TABLES.
-
-Default installation instructions:
-
-1. perl Makefile.PL
-  (you will be prompted to answer a number of questions and you will
-  need to install some Perl dependencies)
-  WARNING:
-
-  1.1 recent versions of CGI::Session have caused some issues for users;
-  as of this release date, we suggest downloading the CGI::Session::serialize::yaml
-  tarball direct from CPAN and install it directly rather than using the cpan command
-
-2. make
-3.(optional) make test 
-4. sudo make install
-5. sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
-  (note that the path to koha-httpd.conf may be different depending on your
-  installation choices)
-6. sudo a2enmod rewrite deflate
-7. sudo a2ensite koha && /etc/init.d/apache2 reload
-8. sudo zebrasrv -f /etc/koha/koha-conf.xml
-  (note that you will want to run Zebra in daemon mode for a production
-  system)
-9. Browse to http://servername:8080/ and answer the questions
-10. Optionally add a robots.txt file.  See README.robots for details
-
-OR if you want to install all dependencies from CPAN and are root, you can
-replace steps 1-3 with "perl install-CPAN.pl" but this is non-standard and
-may not be safe.  Nevertheless, it's pretty cool when it works.
-
-The defaults will install Koha to places that follow relevant standards,
-such as the File Hierarchy Standard.  If you want to install Koha to a
-different directory like /opt/koha, then replace step 1 with (for example):
-
-1. perl Makefile.PL INTRANET_CGI_DIR=/www/cgi-bin
-
-You can change most of the defaults in a similar way, such as DB_HOST.
-For full instructions on how to override the default settings, run
-
-$ perldoc rewrite-config.PL
-
-UPGRADE
-=======
-If you are upgrading from a previous installation of Koha 3.x, you can
-use the following:
-
- ./koha_perl_deps.pl -u -m # to identify new Perl dependencies
-
-Install any missing modules
-IMPORTANT: Koha 3.4.x uses Template::Toolkit, this must be installed
-before the webinstaller can run
-
-On debian/ubuntu
- sudo apt-get install libtemplate-perl
-
-Other Linux/Unix platforms
-Use the packaged version or install from CPAN
-  cpan Template
-
- perl Makefile.PL --prev-install-log /path/to/koha-install-log
- make
- make test
- sudo make upgrade
-
-Koha 3.4.x no longer stores items in biblio records so as part of the
-upgrade you will need to do the following two steps, they can take a
-long time (several hours) to complete for large databases
-
- misc/maintenance/remove_items_from_biblioitems.pl --run
- misc/migration_tools/rebuild_zebra.pl -b -r
-
-WHAT NEXT?
-
-1. Running the Web Installer allows you to install sample data for libraries, patrons, etc.
-    but you may want to install additional data such as bibliographic and authorities.
-
-    Once the installer has completed, you can import and index MARC records from the
-    command line thusly (Note: you can also use the 'Stage MARC records for import' from
-    the Tools area of Koha's Staff Client to import a batch of MARC records):
-
-    $ export KOHA_CONF=/usr/share/koha/etc/koha-conf.xml
-      (note: use the correct path to your koha-conf.xml)
-
-2. Import:
-    Bibliographic data in MARC21 format
-    $ misc/migration_tools/bulkmarcimport.pl -file /path/to/marc.iso2709
-    Authority data in MARC21 format
-    $ misc/migration_tools/bulkauthimport.pl -file /path/to/auth.iso2709
-
-3. Fast Index:
-    $ misc/migration_tools/rebuild_zebra.pl -b -w
-
-    Once the indexing has completed, you will be able to search for records in your
-    system. NOTE: if you don't run the Fast Index utility, and you have the index
-    updates scheduled as per 7.3 the indexing process will happen in the background,
-    Once the indexing has completed, you will be able to search for records in your
-    system. NOTE: if you don't run the Fast Index utility, and you have the index
-    updates scheduled as per 7.3 the indexing process will happen in the background,
-    but it will be orders of magnitude slower.
-
-4. Schedule regular index updates
-    run rebuild_zebra.pl -b -a -z as a regular cron job, check misc/cronjobs/crontab.example
-    for usage examples
-
-5. To enable public Z39.50/SRU servers, you'll need to edit your koha-conf.xml and
-    change the <listen> options to listen on a TCP port; then restart the zebra daemon.
-
-
-IF YOU HAVE PROBLEMS
-====================
-
-IF THIS IS A PRE-RELEASE TREE: please contact developers by email via
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-or
-http://dir.gmane.org/gmane.education.libraries.koha.devel
-
-IF THIS IS A RELEASED VERSION: please see the support pages at
-http://www.koha-community.org/
-
-Released versions usually have three-digit numbers, like 3.02.00,
-while other version number styles are usually snapshots or previews.
-
-
-DEVELOPER NOTES
-===============
-
-For instructions on how to package releases, run perldoc Makefile.PL
diff --git a/INSTALL.debian b/INSTALL.debian
deleted file mode 100644
index a418829..0000000
--- a/INSTALL.debian
+++ /dev/null
@@ -1,387 +0,0 @@
-=============================
-Installation Guide for Installing Koha on Debian Lenny with MySQL 5
-=============================
-
-Some parts copyright 2010 Chris Nighswonger
-
-Feedback/bug reports: Koha Developer's List:
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-
-This document last modified: October 8, 2010
-
-Installation Instructions
-=============================
-
-All commands can be performed as a system user with sudo privileges,
-as indicated or by running the command directly as root.
-
-1. Prepare System and Install Dependencies
-
-1.1 Install Debian Lenny via Businesscard CD
-
-    See http://www.debian.org/releases/lenny/debian-installer/
-
-1.2 Set up Indexdata apt sources for Yaz and Zebra packages
-
-Edit your /etc/apt/sources.list file and add the following:
-
-    # Index Data
-    deb http://ftp.indexdata.dk/debian lenny main
-    deb-src http://ftp.indexdata.dk/debian lenny main
-
-The Index Data packages are signed with a key you can install as follows:
-
-    $ wget -O- http://ftp.indexdata.dk/debian/indexdata.asc | sudo apt-key add -
-
-Finally, update your apt sources:
-    $ sudo apt-get update
-
-1.3 Get Koha
-Choose one of these options:
-
-1.3.1 Option A: Download Koha via Git (optional)
-
-    $ sudo apt-get install git-core git-email
-    $ git clone git://git.koha-community.org/koha.git koha
-    $ cd koha
-    $ git checkout -b myinstall origin
-
-Note: for more information about Git, please see the Koha Git Usage Guide:
-
-    http://wiki.koha-community.org/wiki/Version_Control_Using_Git
-
-1.3.2 Option B: Download Koha from http://download.koha-community.org
-
-Find the latest Koha stable version on http://download.koha-community.org
-and get it:
-
-    $ wget <URL> found on download.koha-community.org
-
-1.4 Install additional Debian dependencies
-
-IMPORTANT:  You should only use CPAN for Perl dependencies which are NOT
-            available from the package maintainer. You have been warned!
-
-Run shell script installing all necessary Debian packages, MySQL Server,
-Zebra and all Debian packaged Perl module required by Koha:
-
-    $ sudo install_misc/apt-get-debian-lenny.sh
-
-1.5 Install Perl dependencies that aren't packaged into Debian Lenny
-sources
-
-Run the following command:
-
-    $ sudo cpan Algorithm::CheckDigits SMS::Send HTTP::OAI IPC::Cmd \
-      Memoize::Memcached PDF::API2::Simple PDF::Table Storable Test::More \
-      Locale::Currency::Format DateTime Lingua::Stem::Snowball Text::CSV::Encoded \
-      UNIVERSAL::require YAML Authen::CAS::Client
-
-Note: you may need to run CPAN initialization if you've not run cpan
-before:
-
-    /etc/perl/CPAN/Config.pm initialized.
-
-    CPAN is the world-wide archive of perl resources. It consists of about
-    100 sites that all replicate the same contents all around the globe.
-    Many countries have at least one CPAN site already. The resources
-    found on CPAN are easily accessible with the CPAN.pm module. If you
-    want to use CPAN.pm, you have to configure it properly.
-    
-    If you do not want to enter a dialog now, you can answer 'no' to this
-    question and I'll try to autoconfigure. (Note: you can revisit this
-    dialog anytime later by typing 'o conf init' at the cpan prompt.)
-    
-    Are you ready for manual configuration? [yes]
-
-When the configuration is completed CPAN will install the Perl modules.
-
-2. Configuration of dependencies
-
-2.1 Create the Koha database
-
- Create the database and user with associated privileges (information inside <> brackets is
- data you assign specifically to your installation. Do not include the <>'s when entering the commands):
-
-    $ mysqladmin -uroot -p<password> create <kohadatabasename>
-    $ mysql -uroot -p<password>
-
-    Welcome to the MySQL monitor.  Commands end with ; or \g.
-    Your MySQL connection id is 22
-    Server version: 5.0.51a-24 (Debian)
-
-    Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-    mysql> grant all on <kohadatabasename>.* to '<kohadatabaseuser>'@'localhost' identified by '<kohadatabaseuserpassword>';
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> flush privileges;
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> quit
-
-You may want to document the database name, the database username, and the database password you just set.
-Step 3 will require them.
-
-2.2 Test your SAX Parser and correct where necessary
-
-You must be sure you're using the XML::LibXML SAX parser, not Expat or
-PurePerl, both of which have outstanding bugs with pre-composed characters.
-You can test your SAX parser by running:
-
-    $ cd koha
-    $ misc/sax_parser_print.pl 
-
-You should see something like:
-
-    XML::LibXML::SAX::Parser=HASH(0x81fe220)
-
-If you are configured to use PurePerl or Expat, the script will say you have a problem and 
-you'll need to edit your ini file to correct it.
-
-The file is typically located at:
-
-    /etc/perl/XML/SAX/ParserDetails.ini
-
-The correct parser entry will need to be moved to the bottom of the file.
-The following is the entry you are looking for:
-
-    [XML::LibXML::SAX::Parser]
-	http://xml.org/sax/features/namespaces = 1
-
-2.3 Create your Koha system user (if you haven't created one already)
-
-    $ sudo adduser koha
-
-You can substitute any username for "koha," just be sure to write it down, you will need to know what it is in step 3.
-
-3. Run the Koha installer
-
-    $ perl Makefile.PL
-      ( answer questions )
-    $ make
-    $ make test
-    $ sudo make install
-
-3.1 Export the environment variables
-Make install will tell you what the proper path for these environment variables is.
-In case you missed it at the end of make install, here are some examples:
-
-Example (for standard install):
-    $ export KOHA_CONF=/etc/koha/koha-conf.xml
-    $ export PERL5LIB=/usr/share/koha/lib
-
-Example (for dev install. These paths are set during Makefile.PL.):
-    $ export KOHA_CONF=/path/to/your/koha-conf.xml
-    $ export PERL5LIB=/path/to/koha/lib
-
-4. Configure and start Apache
-    $ sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
-(note that the path to koha-httpd.conf may be different if you chose a dev install)
-
-Add the following lines to /etc/apache2/ports.conf:
-
-    Listen 80
-    Listen 8080
-
-Run the following commands:
-
-    $ sudo a2enmod rewrite deflate
-    $ sudo a2ensite koha
-    $ sudo apache2ctl restart
-
-Note: you may still see the usual Apache default site if your VirtualHost
-      configuration isn't correct.  If Koha is the only web application running on the server,
-      the command "sudo a2dissite default" may be a quick fix. For servers running other sites
-      alongside Koha, see the Apache HTTPD manual section on virtual hosts for full
-      instructions (http://httpd.apache.org/docs/2.0/vhosts/).
-
-5. Run the Web Installer, populate the database, initial configuration of settings
-
-Point your browser to http://<servername>:8080/
-
-Note: <servername> is (usually) the IP of your server, or localhost (if you are connecting
-      from the same machine Koha is installed on. You can verify the location by checking 
-      the VirtualHost settings for both the opac and intranet virtual hosts in koha-httpd.conf
-
-Koha will redirect you to the Web Installer where you can continue the setup. You will be prompted to enter in your DATABASE username and password. It is through this interface 
-that 
-you can install the sample data for libraries, patrons, and much more.
-
-Be aware that removing sample data at a later time (when you may want to take the 
-server into production) may not be easy, and if your intent is to take this 
-install from testing to production, go with minimal sample data (no patrons or bibliographic records).
-
-6. Configure and start Zebra
-
-Note: it's recommended that you daemonize the Zebra process and add it to your
-      startup profile. For a non-production test/development installation, running
-      Zebra from the command line can be useful. Pick one of the options below (or roll your own).
-
-Note: it's also recommended that you create a Koha system user, which you will
-      have specified during the install process. Alternatively, Zebra can be
-      configured to run as the root user.
-
-Option 1: run the Zebra processes from the command line (manual indexing):
-
-6.1.1 Zebra Search Server
-
-This process send responses to search requests sent by Koha or
-Z39.50/SRU/SRW clients.
-
-    $ sudo -u <kohauser> zebrasrv -f /etc/koha/koha-conf.xml
-    (note that the path to koha-conf.xml may be different if you chose a dev install, and that
-    <kohauser> refers to the user you set up in step 2.3)
-
-Note: the user you run Zebra as will be the only user with write permission
-      on the Zebra index; in development mode, you may wish to use your
-      system user.
-
-
-6.1.2 Zebra Indexer
-
-Added/updated/deleted records in Koha MySQL database must be indexed
-into Zebra. A specific script must be launched each time a bibliographic
-or an authority record is edited.
-
-    $ sudo -u <kohauser> misc/migration_tools/rebuild_zebra.pl -z -b -a
-
-Note: This script should be run as the kohauser (the default is 'koha', but
-this is the user you set up in step 2.3).
-
-Option 2: run the Zebra process as a daemon (automatic indexing):
-
-Note: References to <script_dir> refer to the directory where
-      Koha's command-line scripts are installed, the path
-      is /usr/share/koha/bin/ by default in a standard install.
-
-6.2.1 Zebra Search Server
-
-    $ sudo ln -s <script_dir>/koha-zebra-ctl.sh  /etc/init.d/koha-zebra-daemon
-    (Note: <script_dir> is /usr/share/koha/bin/ by default in a standard install)
-    $ sudo update-rc.d koha-zebra-daemon defaults
-
-    $ sudo <script_dir>/koha-zebra-ctl.sh start
-    (Note: <script_dir> is /usr/share/koha/bin/ by default in a standard install)
-
-
-6.2.2 Zebra Indexer
-
-Add an entry in Koha user crontab to process scheduled added/updated/deleted records
-indexing by Zebra. <script_dir>cronjobs/crontab.example contains examples for these cron jobs (and many more).
-
-NOTE: The cronjobs should be setup under the kohauser (the default is 'koha', but
-this is the user you set up in step 2.3).
-
-Edit the crontab for the koha user by running
-    $ sudo -u <kohauser> crontab -e
-
-For Zebra indexing, you are looking for the example that begins with
-    
-    # ZEBRA INDEX UPDATES with -z option, incremental index updates throughout the day
-    # for both authorities and bibs
-
-It may be easiest to copy/paste the example into your own crontab and modify as necessary.
-
-
-7. What next?
-
-    Once the installer has completed, you can import and index MARC records from the
-    command line thusly (Note: you can also use the 'Stage MARC records for import' from
-    the Tools area of Koha's Staff Client to import a batch of MARC records):
-
-    $ export KOHA_CONF=/usr/share/koha/etc/koha-conf.xml
-      (note: use the correct path to your koha-conf.xml)
-
-7.1 Import:
-
-Bibliographic data in MARC21 format
-
-    $ misc/migration_tools/bulkmarcimport.pl -file /path/to/marc.iso2709
-
-Authority data in MARC21 format
-
-    $ misc/migration_tools/bulkmarcimport.pl -a -file /path/to/auth.iso2709
-
-7.2 Fast Index:
-    $ misc/migration_tools/rebuild_zebra.pl -b -w
-
-    Once the indexing has completed, you will be able to search for records in your system.
-    NOTE: This script should be run as the kohauser (the default is 'koha', this is the user we set up in step 2.3).
-
-7.3 Schedule regular index updates
-    You need to run rebuild_zebra.pl -b -a -z as a regular cron job in orde to pick up new bibs
-    and items as you add them. Check misc/cronjobs/crontab.example for usage examples. See 7.0 above.
-    NOTE: This job should be setup under the kohauser (the default is 'koha', this is the user we set up in step 2.3).
-
-7.4 To enable public Z39.50/SRU servers, you'll need to edit your koha-conf.xml and
-    change the <listen> options to listen on a TCP port; then restart the zebra daemon.
-
-UPGRADE
-=======
-If you are upgrading from a previous installation of Koha 3.x, you can
-use the following:
-
- ./koha_perl_deps.pl -u -m # to identify new Perl dependencies
-
-Install any missing modules
-IMPORTANT: Koha 3.4.x uses Template::Toolkit, this must be installed
-before the webinstaller can run
-
- sudo apt-get install libtemplate-perl
-
- perl Makefile.PL --prev-install-log /path/to/koha-install-log
- make
- make test
- sudo make upgrade
-
-Koha 3.4.x no longer stores items in biblio records so as part of the
-upgrade you will need to do the following two steps, they can take a
-long time (several hours) to complete for large databases
-
- misc/maintenance/remove_items_from_biblioitems.pl --run
- misc/migration_tools/rebuild_zebra.pl -b -r
-
-Uninstall Instructions
-=============================
-1) Stop Services:
-   $ sudo a2dissite koha
-   $ sudo rm /etc/apache2/sites-available/koha
-   $ sudo apache2ctl restart
-
-   $ sudo update-rc.d koha-zebra-daemon remove
-   $ sudo rm /etc/init.d/koha-zebra-daemon
-
-2) Remove Database and Indexes
-
-   # MySQL
-   $ mysql -u<kohauser> -p<kohapassword>
-   > drop database koha;
-
-   # Zebra Indexes
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-authorities.cfg -g iso2709 -d authorities init
-
-3) Remove Koha Install Directories and Configuration Files
-   Don't forget about any crontab entries
-
-Tested on the following operating environments
-==============================================
-- Debian Lenny 5.0
-
-Other Notes
-=====================
-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
-
diff --git a/INSTALL.fedora7 b/INSTALL.fedora7
deleted file mode 100644
index 6694eb7..0000000
--- a/INSTALL.fedora7
+++ /dev/null
@@ -1,1264 +0,0 @@
-=============================
-Installation Guide for Installing Koha on Fedora Core 7
-=============================
-
-Copyright (C) 2008, Department of Computer and Information
-Science, Library of the University Lyon 2, France
-
-Translated by: Google with help from Joshua Ferraro
-(jmf AT liblime DOT com)
-
-Feedback/bug reports: Koha Developer's List: 
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-
-This document last modified: 30 April 2008
-
-Installation Instructions
-=============================
-This document was prepared in order to help you discover (or
-test) Koha (Integrated Library System).
-
-The installation of Linux system described below is a basic, 
-it is not designed for a production server (e.g., security, 
-load balancing .. are not described).
-
-This document describes the different stages of installing 
-the software to version 3.00 koha beta on a Fedora 7 Linux.
-Your mileage may vary with different RedHat distributions.
-
-1. LINUX SYSTEM INSTALLATION
-
-System: Linux Fedora 7 (May 2007) Linux Redhat
-The Linux distribution Fedora 7 is downloadable from the 
-Fedora website:
-
-http://fedoraproject.org/
-
-The Fedora website also offers additional content such as
-documentation, FAQ, etc.
-
-Using the entire disk (removal of existing partitions and 
-therefore permanent loss of data stored on the disk) is
-the easiest method; This is not the best practice for a 
-production system, but is useful for testing purposes.
-
-Check that the computer is able to boot from a CD or DVD,
-perhaps by changing the boot order in the bios.
-
-Place the CD or DVD in the drive and restart the machine.
-
-Settings when installing Linux (French specific, may not apply)
-
-Language: French (French)
-Choice of keyboard: French (Latin9) recognized by default.
-Removal of existing Linux partitions
-Host Name: NomMachine.NomDomaine.fr
-Time zone: Europe/Paris. Click on the map or select from the
-list and check system clock to UTC.
-Informing the root password, which is the administrator account.
-
-The installation of the system will automatically start and may
-take between 15 to 30 minutes to complete.
-
-Click Restart.
-
-Enter the default options.
-For Firewall, check www http server (configuration of the firewall).
-Create a user koha with the password kohakoha (eg)
-The koha is therefore created and the group koha which this user belongs.
-
-Setting the homepage
-Enter root, then the password root.
-
-With Fedora, GNOME is the default environment.
-
-To use KDE default (as we at Lyon 2 have done), close the session,
-having recovered the KDE packages on Add/Remove software. For the
-french interface,  go through the package manager and seek, then
-install kde-french.
-
-On the login prompt, go to Options ? Select Session and choose KDE. A
-the next connection, the system will ask if you want to use KDE or 
-GNOME by default. Also on the login prompt, go to Languages and 
-choose the French.
-
-The installation of Linux system is complete. 
-
-1.2 Verification of system settings
-
-You must be logged in as administrator of the system (root).
-
--- Make sure the environment is KDE. The taskbar is at the
-bottom of the screen and left of this bar is the menu K.
-
--- Check that the system is in french and click on K.
-
--- Create a few shortcuts in making a drag and drop the following
-items in the taskbar:
-
-Menu K ? ? Internet Firefox Web Browser
-Menu K ? ? Terminal System
-Menu K ? ? Services System Management Services
-
--- Check that the koha and the group koha are created:
-Menu K ? ? System Users and Groups
-
--- Check that web servers Apache and MySQL are installed.
-Menu K ? ? Services System Management Services
-
-The lines httpd (demon Apache) and mysqld (demon MySQL) must be 
-included in the line of services. You must configure these two 
-services so that they are lan??s automatically at boot. Check th
-e box to the left of the service, click the Start button at the 
-top of the list, if the two services start without any problem, 
-validate the change of manager services by clicking on Save or 
-File menu ? save changes
-
-Close the services manager.
-
-If one or both services are absent, it is necessary to install Apache
-and/or MySQL. To do so, go in the Package Manager, choose and 
-select Apache server and/or MySQL. In the case of MySQL, we must
-not forget MySQL-devel (available in packages optional). Finally,
-start the installation.
-
-1.3 Installation of additional software
-
-The software installation Koha requires adding additional programs
-to your system linux based on a standard installation. This list may
-be slightly different depending on the version and support (Live
-CD or DVD).
-
-List of software to add
-Libxml2-devel
-Libxslt-devel
-TCL
-Bzip2-devel
-GCC
-Perl-CPAN
-Perl-ExtUtils-AutoInstall
-Ncftp
-Wget
-Gdbm-devel
-Expat-devel
-Tcp_wrappers-devel
-Libicu (see below)
-git-1.5.3.7-1.fc8 [is not necessary for the installation of koha, but
-  useful if one participates in the development of koha.]
-PhPMyAdmin
-Libicu
-Libicu-devel
-
-To add software Linux Fedora, you have two tools
-
-A graphical tool
-Menu K ? ? System Add/Remove software
-
-Click on the Search tab
-Enter the name of the software in the zone entry and click the
-Search button;
-
-The software that match your search are listed.
-Make sure the check box is checked if the tick and click Apply to
-add software to your system.
-
-A tool mode Terminal YUM
-The YUM documentation is available on the Fedora site
-
-Open a terminal window (K Menu ? ? Terminal System)
-
-Examples of using YUM:
-Is the web browser Firefox installed?
-Type the command: yum list firefox
-This command will launch the software yum, and asked it to list
-the information on the Firefox.
-Yum visit the various deposits of software for Fedora (fedora,
-updates, etc.). And said that the firefox software is installed
-on this machine (version 2.0.0.3-4.fc7) and there is a
-downloadable version newer ( version 2.0.0.10-2.fc7)
-
-************************************************** ****************
-Screenshot
-[root @ nomduserveur ~] # yum list firefox
-Loading "installonlyn" plugin
-fedora 100% |=========================| 2.1 kB 00:00
-updates 100% |=========================| 2.3 kB 00:00
-Installed Packages
-firefox.i386 2.0.0.3-4.fc7 installed
-Packages Available
-firefox.i386 2.0.0.10-2.fc7 updates
-************************************************** ****************
-
-Updated software firefox by the command yum update firefox.
-YUM inspect the system to check whether it is necessary to update
-other software used by firefox.
-confirm your request y
-
-Installation of new software by the command yum install firefox.
-
-
-Verification
-Check whether these programs are installed using the command rpm
-with option-q followed by the name of the software, possibly separated
-by a space.
-Example:
-rpm-q libxml2-devel libxslt-devel tcl bzip2-devel gcc mysql-devel-perl CPAN perl-ExtUtils-AutoInstall ncftp wget gdbm devel-expat-devel tcp_wrappers-devel
-
-NB: The tool rpm (Redhat Package Manager) allows facilities
-management software under the Linux distribution Fedora.
-
-Special case: the library libicu under Fedora 8
-Under Fedora 8:
-The library libicu, is standard in the distribution Fedora.
-Version 3.8 of this library installed with Fedora 8 is too recent
-and poses a problem when installing software and ZEBRA YAZ, the
-company Indexdata who compiled these two programs with version 3.6
-of the library, it is therefore necessary to remove the libicu 3.8
-library and replace it with version 3.6.
-
-Uninstall the library libicu - 3.8-1.fc8
-
-With the web browser, download the library libicu-3.6-18.fc7.i386.rpm
-(old version, choose the version Fedora 7 for i386) here:
-
-  HYPERLINK "http://rpmfind.net/linux/rpm2html/search.php?query=libicutu.so.36" http://rpmfind.net/linux/rpm2html/search.php?query=libicutu.so.36
-
-Download the package rpm
-Open a terminal window, a menu K> System> Terminal
-find the file libicu-3.6-18.fc7.i386.rpm
-Desktop CD
-ls-l
-
-decompress the archive with the command: rpm-ivh libicu-3.6-18.fc7.i386.rpm
-
-Setting 1.4 for the use of unicode
-
-VERY IMPORTANT
-UNICODE must be set up correctly before installing Koha.
-
-1.4.1 The Linux system is it configured to use UNICODE?
-
-For more information:
-  HYPERLINK "http://wiki.koha-community.org/wiki/Encoding_and_Character_Sets_in_Koha" http://wiki.koha-community.org/wiki/Encoding_and_Character_Sets_in_Koha
-
-To check, open a terminal window and type the locale.
-You must obtain:
-LANG = en_GB.UTF-8
-...
-
-1.4.2 The web server Apache 2 is it configured to use UNICODE?
-
-To verify, using a text editor, open the httpd.conf file located
-in /etc/httpd/conf and look if it contains the directive:
-
-AddDefaultCharset UTF-8
-
-1.4.3 The MySQL server is it configured to use UNICODE?
-
-NB: mysqld service must be started.
-In a Terminal window, type the command mysql, then an SQL
-to display variables content server configuration.
-Text of query:
-
-show where variable_name variables like 'char%';
-
-******************************************************************
-Screenshot
-mysql> show where variable_name variables like 'char%';
-+--------------------------+----------------------------+
-| Variable_name            | Value |
-+--------------------------+----------------------------+
-| Character_set_client     | latin1 |
-| Character_set_connection | latin1 |
-| Character_set_database   | latin1 |
-| Character_set_filesystem | Binary |
-| Character_set_results    | latin1 |
-| Character_set_server     | latin1 |
-| Character_set_system     | utf8   |
-| Character_sets_dir       | /usr/share/mysql/charsets/ |
-+--------------------------+----------------------------+
-8 rows in set (0.00 sec)
-******************************************************************
-
-Some variables are not properly configured (latin1), so we have to
-change the configuration file server MySQL.
-Leaving the mysql client by the command quit.
-
-Using a text editor, open the file my.cnf located in the directory /
-etc and add these 3 lines in the section [mysqld]:
-
-default-character-set = utf8
-character-set-server = utf8
-skip-character-set-client-handshake
-
-To ensure that this change is taken into account, restart the server
-Mysql using the following command in a terminal window:
-mysqld restart service
-
-Check that changing the parameters was taken into account by reconnecting
-the MySQL server with the command mysql, then typing the query:
-
-show where variable_name variables like 'char%';
-The variables contain well utf8 /
-Quit MySQL by the command quit
-
-******************************************************************
-Screenshot
-  MySQL
-Welcome to the MySQL monitor. Commands end with; or \g.
-Your MySQL connection id is 2
-Server version: 5.0.45 Source distribution
-
-Type 'help,' or '\h' for help. Type '\c' to clear the buffer.
-
-mysql> show where variable_name variables like 'char%';
-+--------------------------+----------------------------+
-| Variable_name            | Value |
-+--------------------------+----------------------------+
-| Character_set_client     | utf8   |
-| Character_set_connection | utf8   |
-| Character_set_database   | utf8   |
-| Character_set_filesystem | Binary |
-| Character_set_results    | utf8   |
-| Character_set_server     | utf8   |
-| Character_set_system     | utf8   |
-| Character_sets_dir       | /usr/share/mysql/charsets/ |
-+--------------------------+----------------------------+
-8 rows in set (0.00 sec)
-
-MySQL> quit
-Bye
-******************************************************************
-
-Some information for the use of MySQL here: HYPERLINK "http://doc.ubuntu-fr.org/mysql" http://doc.ubuntu-fr.org/mysql
-
-2 INSTALLATION OF ZEBRA SERVER INDEXING
-
-For libraries that must manage several tens of thousands of bib records
-it is recommended that you install the server indexing ZEBRA. Otherwise
-(far fewer records to manage), it is not necessary to install ZEBRA.
-
-The software installation ZEBRA requires prior installation of software
-modules YAZ client and server Z3950.
-
-The installation is as administrator (root).
-
-NB: the creation of files yaz and zebra is only necessary if you use
-the graphical
-
-Website for downloads: HYPERLINK "http://www.indexdata.dk/software/" http://www.indexdata.dk/software/
-
-
-2.1 Installation of the software YAZ
-
-Creating a file needed for the installation of Yaz
-Create files redhat in the directory /usr/src
-SOURCES Create a folder in the directory /usr/src/redhat
-NB: redhat lowercase and uppercase SOURCES.
-
-Installing Yaz by the command:
-rpm-ivh ftp://ftp.indexdata.dk/pub/yaz/redhat/fc6/ *- 3.0.24 *.*. rpm
-Check the final published version and replace -3.0.24 by the number
-of the current version.
-
-Check the installation by the command:
-rpm-q libyaz3 libyaz3-devel yaz yaz-debuginfo yaz-icu-yaz illclient yaz-3.0.24-1.src
-
-
-2.2 Installation of the software ZEBRA
-
-To install packages from the version 2.0.26-1:
-rpm-ivh ftp://ftp.indexdata.dk/pub/zebra/redhat/fc6/ *- 2.0.26-1 .*. rpm
-Check dern?re published version and replace -2.0.26-1 by the
-number of the current version.
-
-Check the installation by the command:
-rpm-q libidzebra-2.0-2.0-libidzebra modules idzebra-2.0 idzebra-2.0-debuginfo libidzebra-2.0-devel idzebra-2.0
-
-3 INSTALLATION OF KOHA 3.0
-
-Important Reminder:
-Make sure, BEFORE you install koha, that the system Linux, the MySQL
-server and the Apache server are configured to use the Unicode
-format (cf. 1.4).
-
-
-Download koha here: HYPERLINK "http://download.koha-community.org/koha-3.00.00-beta2.tar.gz" http://download.koha-community.org/koha-3.00.00-beta2.tar.gz
-
-3.1 Decompression of the archive koha 3.0
-
-Save the file in the directory /usr/share.
-Opening a window Terminal, and placing himself in the directory /usr/share by the command:
-cd /usr/share
-verify the presence of compressed file koha by the command:
-ls-l * Koha
-Unzip the file with the command tar:
-tar-xvf koha-3.00.00-beta2.tar.gz
-You get a folder koha-3.00.00-beta2, which contains folders and files needed for the installation of software koha.
-
-NB: the installation procedure is described in the text files "INSTALL"
-and "INSTALL debian", the second is more complete.
-
-
-3.2 Protect access to the database server MySQL
-
-Update the password root server MySQL (by default, unprotected access to databases)
-In a Terminal window:
-sudo password mysqladmin Koha
-
-3.3 Creation of a database MySQL test
-
-The basic test is immediately under Fedora. We must remove the existing basic
-test and then create a basic test MySQL provisional, which will be deleted
-after installing koha.
-
-mysql-u root-p
-Enter password: kohakoha (eg)
-
-mysql> drop test database;
-Query OK, 0 rows affected (0.06 sec)
-
-mysql> create database test;
-Query OK, 1 row affected (0.00 sec)
-
-mysql> grant all on test .* to 'test' @ 'localhost' identified by 'test';
-Query OK, 0 rows affected (0.00 sec)
-
-MySQL> flush privileges;
-Query OK, 0 rows affected (0.00 sec)
-
-MySQL> quit
-Bye
-
-
-3.4 Creation of the MySQL database koha
-
-Creation of the database, a user kohaadmin with password and defining its
-privileges.
-
-In a Terminal window:
-mysql-u root-p
-Enter password: type kohakoha (eg a password for root)
-Create Database Koha;
-grant all on koha .* to 'kohaadmin' @ 'localhost' identified by 'kohakoha';
-flush privileges;
-quit;
-
-3.5 Configuration CPAN
-
-The koha software is written in Perl. You have access to deposits modules
-written in perl (CPAN) to download some libraries on your system. The Perl
-language of origin is installed on most Linux distributions, but some modules
-must be installed.
-During the first use of cpan, you must configure.
-
-Open a terminal window and type the command cpan
-
-During the installation of modules, validate the additions of modules when
-necessary. Indicate the continent and the country. Select 3 or 4 CPAN deposits
-in the proposed list.
-
-It is possible to force the installation of a module. In this case, in a
-Terminal window, type:
-
-cpan
-then force install NomDuModule
-then quit
-
-******************************************************************
-Screenshot:
-/usr/lib/perl5/5.8.8/CPAN/Config.pm initialized.
-
-
-CPAN is the world-wide archive of perl resources. It consists of about
-100 sites that all replicate the same contents all around the globe.
-Many countries have at least one CPAN site already. The resources
-found on CPAN are easily accessible with the CPAN.pm module. If you
-want to use CPAN.pm, you have to configure it properly.
-
-If you do not want to enter a dialog now, you can answer 'no' to this
-question and I'll try to autoconfigure. (Note: you can revisit this
-dialog anytime later by typing 'o conf init' at the cpan prompt.)
-
-Are you ready for manual configuration? [yes]
-
-
-The following questions are intended to help you with the
-configuration. The CPAN module needs a directory of its own to cache
-important index files and maybe keep a temporary mirror of CPAN files.
-This may be a site-wide directory or a personal directory.
-
-
-
-First of all, I'd like to create this directory. Where?
-
-CPAN build and cache directory? [/ root/.cpan]
-
-
-If you want, I can keep the source files after a build in the cpan
-Home directory. If you choose so then future builds will take the
-files from there. If you do not want to keep them, answer to the 0
-Next question.
-
-
-
-How big should the disk cache be for keeping the build directories
-with all the intermediate files?
-
-Cache size for build directory (in MB)? [10]
-
-
-By default, each time the CPAN module is started, scanning cache
-is performed to keep the cache size in sync. To prevent from this,
-disable the cache scanning with 'never'.
-
-Perform cache scanning (atstart or never)? [atstart]
-
-
-To considerably speed up the initial CPAN shell startup, it is
-Storable possible to use to create a cache of metadata. If Storable
-is not available, the normal index mechanism will be used.
-
-Cache metadata (yes/no)? [yes]
-
-
-The next option deals with the charset your terminal supports. In
-general CPAN is English speaking territory, thus the charset does not
-matter much, but some of the aliens out there who upload their
-software to CPAN bear names that are outside the ASCII range. If your
-terminal supports UTF-8, you say no to the next question, if it
-supports ISO-8859-1 (also known as LATIN1) then you say yes, and if it
-neither supports nor, your answer does not matter, you will not be
-able to read the names of some authors anyway. If you answer no, names
-will be output in UTF-8.
-Your terminal expects iso-8859-1 (yes/no) [yes]
-
-If you have one of the readline packages (Term: ReadLine: Perl,
-Term: ReadLine: Gnu, possibly others) installed, the interactive CPAN
-Shell will have history support. The next two questions deal with the
-filename of the history file and with its size. If you do not want to
-set this variable, please hit SPACE RETURN to the following question.
-
-File to save your history? [/root/.cpan/histfile]
-Number of lines to save? [100]
-
-
-The CPAN module can detect when a module that which you are trying to
-build depends on prerequisites. If this happens, it can build the
-prerequisites for you automatically ('follow'), ask you for
-confirmation ('ask'), or just ignore them ('ignore'). Please set your
-policy to one of the three values.
-
-Policy on building prerequisites (follow, ask or ignore)? [ask]
-
-
-The CPAN module will need a few external programs to work properly.
-Please correct me, if I guess the wrong path for a program. Do not
-panic if you do not have some of them, just press ENTER for those. To
-disable the use of a download program, you can type a space followed
-by ENTER.
-
-
-Where is your gzip program?          [/bin/gzip]
-Where is your tar program?           [/bin/tar]
-Where is your unzip program?         [/usr/bin/unzip]
-Where is your make program?          [/usr/bin/make]
-Where is your links program?         [/usr/bin/links]
-Where is your wget program?          [/usr/bin/wget]
-Where is your ncftpget program?      [/usr/bin/ncftpget]
-Where is your ftp program?           [/usr/bin/ftp]
-Where is your gpg program?           [/usr/bin/gpg]
-What is your favorite pager program? [/usr/bin/less]
-What is your favorite shell?         [/bin/bash]
-
-
-Every Makefile.PL is run by perl in a separate process. Likewise we
-run 'make' and 'make install' in processes. If you have any
-parameters (eg PREFIX, LIB, UNINST or the like) you want to pass
-to the calls, please specify them here.
-
-If you do not understand this question, just press ENTER.
-
-Parameters for the 'perl Makefile.PL' command?
-Typical frequently used settings:
-
-     PREFIX = ~/perl non-root users (please see manual for more hints)
-
-
-Every Makefile.PL is run by perl in a separate process. Likewise we
-run 'make' and 'make install' in processes. If you have any
-parameters (eg PREFIX, LIB, UNINST or the like) you want to pass
-to the calls, please specify them here.
-
-If you do not understand this question, just press ENTER.
-
-Parameters for the 'perl Makefile.PL' command?
-Typical frequently used settings:
-
-     PREFIX = ~/perl non-root users (please see manual for more hints)
-
-Your choice: []
-Parameters for the 'make' command?
-Typical frequently used setting:
-
-     J3 dual-processor system
-
-Your choice: []
-Parameters for the 'make install' command?
-Typical frequently used setting:
-
-     UNINST = 1 to always uninstall potentially conflicting files
-
-Your choice: []
-
-
-Sometimes you may wish to leave the processes run by CPAN alone
-without caring about them. As sometimes contains the Makefile.PL
-question you're expected to answer, you can set a timer that will
-kill a 'perl Makefile.PL' process after the specified time in seconds.
-
-If you set this value to 0, these processes will wait forever. This is
-the default and recommended setting.
-
-
-Timeout for inactivity during Makefile.PL? [0]
-
-
-If you're accessing the net via proxies, you can specify them in the
-CPAN configuration or via environment variables. The variable in
-the $ CPAN:: Config takes precedence.
-
-Your ftp_proxy?
-Your http_proxy?
-Your no_proxy?
-You have no/root/.cpan/sources/MIRRORED.BY
-   I'm trying to fetch one
-CPAN: LWP:: UserAgent loaded ok
-Fetching with LWP:
-   ftp://ftp.perl.org/pub/CPAN/MIRRORED.BY
-Fetching with LWP:
-   ftp://ftp.perl.org/pub/CPAN/MIRRORED.BY.gz
-Fetching with Net: FTP:
-   ftp://ftp.perl.org/pub/CPAN/MIRRORED.BY
-
-
-Now we need to know where your favorite CPAN sites are located. Push
-a few sites onto the array (just in case the first on the array will not
-work). If you are mirroring CPAN to your local workstation, specify a
-file: URL.
-
-First, pick a nearby continent and country (you can pick several of
-each, separated by spaces, or none if you just want to keep your
-existing selections). Then, you will be presented with a list of URLs
-CPAN of mirrors in the countries you selected, along with previously
-selected URLs. Select some of those URLs, or just keep the old list.
-Finally, you will be prompted for any extra URLs - file:, ftp:, or
-http:-- that host a CPAN mirror.
-
-(1) Africa
-(2) Asia
-(3) Central America
-(4) Europe
-(5) North America
-(6) Oceania
-(7) South America
-Select your continent (or several nearby continents) [] 4
-Sorry! since you do not have any existing picks, you must make a
-Geographic selection.
-
-(1) Austria
-(2) Belgium
-(3) Bosnia and Herzegovina
-(4) Bulgaria
-(5) Croatia
-(6) Czech Republic
-(7) Denmark
-(8) Finland
-(9) France
-(10) Germany
-(11) Greece
-(12) Hungary
-(13) Iceland
-(14) Ireland
-(15) Italy
-(16) Latvia
-15 more items, hit SPACE RETURN to show them
-Select your country (or several nearby countries) [] 9
-Sorry! since you do not have any existing picks, you must make a
-Geographic selection.
-
-(1) ftp://cpan.cict.fr/pub/CPAN/
-(2) ftp://cpan.mirrors.easynet.fr/pub/ftp.cpan.org/
-(3) ftp://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/cpan/
-(4) ftp://ftp.crihan.fr/mirrors/ftp.cpan.org/
-(5) ftp://ftp.erasme.org/pub/CPAN/
-(6) ftp://ftp.inria.fr/pub/CPAN/
-(7) ftp://ftp.oleane.net/pub/CPAN/
-(8) ftp://ftp.pasteur.fr/pub/computing/CPAN/
-(9) ftp://ftp.u-strasbg.fr/CPAN
-(10) ftp://mir1.ovh.net/ftp.cpan.org
-(11) ftp://miroir-francais.fr/pub/cpan/
-(12) http://cpan.ebsd.net/
-(13) http://cpan.enstimac.fr/
-(14) http://cpan.univ-paris.com
-Select URLs as many as you like (by number),
-put them on one line, separated by blanks, e.g. '1 4 5 [] 1 2 4 10
-
-Enter another URL or RETURN to quit: []
-New set of picks:
-   ftp://cpan.cict.fr/pub/CPAN/
-   ftp://cpan.mirrors.easynet.fr/pub/ftp.cpan.org/
-   ftp://ftp.crihan.fr/mirrors/ftp.cpan.org/
-   ftp://mir1.ovh.net/ftp.cpan.org
-
-
-commit: wrote /usr/lib/perl5/5.8.8/CPAN/Config.pm
-Terminal does not support AddHistory.
-
-cpan shell - CPAN exploration and modules installation (v1.7602)
-ReadLine support available (try 'install Bundle: CPAN')
-
-cpan> quit
-************************************************** ****************
-
-Type quit to break cpan
-
-
-
-3.6 Installation of additional modules from CPAN
-
-3.6.1 modules installation
-
-Install Command: cpan NomDuModule to install and validate the default
-choice for each question.
-
-List of modules required to koha need to install:
-Class::Accessor
-XML::SAX
-XML::RSS
-XML::LibXML::SAX
-MARC::Record
-MARC::Charset
-MARC::Charset::Constants
-MARC::File::XML
-MARC::Crosswalk::DublinCore
-Net::Z3950::ZOOM
-Net::LDAP::Filter
-HTML::Template::Pro
-Data::ICal
-GD::Barcode::UPCE
-Algorithm::CheckDigits::M43_001
-Biblio::EndnoteStyle
-Schedule::At
-Barcode::Code128
-CGI::Session
-Class::Factory::Util
-Date::ICal
-Date::Manip
-Lingua::Stem
-List::MoreUtils
-PDF::Reuse
-PDF::Reuse::Barcode
-PDF::API2
-PDF::API2::Util
-Text::CSV
-Text::CSV_XS
-XML::Dumper
-XML::LibXSLT
-XML::Simple
-YAML::Syck
-Unix::Syslog
-POE
-Date::Calc
-
-
-3.6.2 Installation of modules - Cases difficult
-
-In some cases, we must force the installation of modules. The two
-modules (and sometimes others) need to force the installation.
-Type the command cpan, then:
-
-force install Mail: Sendmail ======= force install ok For this unit
-should be Ctrl + C, when he attempted to send an e-mail.
-force install Net:: LDAP ======= force install ok
-
-
-
-3.6.3 Installing module access MySQL DBMS
-
-Installation of the connector DBD::mysql for perl
-
-We will have to rebuild this module because koha requires the latest version.
-
-In a window Terminal:
-cpan
-cpan> o conf makepl_arg
-     (search parameters for the CPAN)
-
-cpan> o conf makepl_arg "- testdb = test - testuser = test - testpass = test"
-
-cpan> install DBD:: mysql
-
-cpan> o conf makepl_arg''
-     (clean to avoid interference with future installations modules).
-
-cpan> quit
-
-
-Destruction of the basis of test MySQL
-
-In a terminal window
-mysql-u root-p
-Enter password: kohakoha
-Database drop test;
-quit
-
-
-3.7 Test SAX Parser
-
-In a Terminal window, go to the installation directory koha.
-CD /usr/share/koha-3.00.00-alpha/misc
-launch the script sax_parser_print.pl
-./sax_parser_print.pl
-which returns: XML::LibXML::SAX = HASH (0x895a3fc)
-
-The file /usr/lib/perl5/site_perl/5.8.8/XML/SAX/ParserDetails.ini should be amended to
-contain the final (save the other lines to comment or delete):
-[XML::LibXML::SAX::Parser]
-Http://xml.org/sax/features/namespaces = 1
-
-
-3.8 Installation of Koha
-
-Opening a window Terminal and placed in the directory koha
-CD /usr/share/koha-3.00.00-alpha
-launch the script Makefile.PL
-perl Makefile.PL
-
-Most options are to be validated by default. The data to information are
-password based koha, format Marc (Marc21 or Unimarc), language indexing
-Zebra (or en). It should be noted that the three ports will be open:
-3306, 9998, 9999.
-
-************************************************** ****************
-Screenshot
-By default, Koha can be installed in one of three ways:
-
-Standard: Install files in conformance with the Filesystem
-           Hierarchy Standard (FHS). This is the default mode
-           and should be used when installing a production
-           Koha system. On Unix systems, root access is
-           needed to complete a standard installation.
-
-single: Install files under a single directory. This option
-           is useful for installing Koha without root access, eg,
-           on a web host that allows CGI scripts and MySQL databases
-           but requires the user to keep all files under the user's
-           HOME directory.
-
-dev: Create a set of symbolic links and configuration files to
-           Koha allow to run directly from the source distribution.
-           This mode is useful for developers who want to run
-           Koha from a git clone.
-
-Installation mode (dev, single, standard) [standard]
-
-Please specify the directory under which most Koha files
-will be installed.
-
-Note that if you are planning in installing more than
-one instance of Koha, you may want to modify the last
-component of the directory path, which will be used
-as the package name in the FHS layout.
-
-Base installation directory [/usr/share/koha]
-
-Since you are using the 'standard' install
-mode, you should run 'make install' as root.
-However, it is recommended that a non-root
-user (on Unix and Linux platforms) have
-ownership of Koha's files, including the
-Zebra indexes if applicable.
-
-Please specify a user account. This
-user account does not need to exist
-right now, but it needs to exist
-before you run 'make install'. Please
-note that for security reasons, this
-user should not be the same as the user
-account Apache runs under.
-
-User account [koha]
-
-Please specify the group that should own
-Koha's files. As above, this group need
-not exist right now, but should be created
-before you run 'make install'.
-
-Group [koha]
-
-Please specify which database engine you will use
-to store data in Koha. The choices are MySQL and
-PostgreSQL; please note that at the moment
-PostgreSQL support is highly experimental.
-
-DBMS to use (Pg, mysql) [mysql]
-
-Please specify the name or address of your
-database server. Note that the database
-does not have to exist at this point, it
-can be created after running 'make install'
-and before you try using Koha for the first time.
-
-Database server [localhost]
-
-Please specify the port used to connect to the
-DMBS [3306]
-
-Please specify the name of the database to be
-used by Koha [koha]
-
-Please specify the user that owns the database to be
-used by Koha [kohaadmin]
-
-Please specify the password of the user that owns the
-database to be used by Koha [katikoan] kohakoha
-
-Koha can use the Zebra search engine for high-performance
-searching of bibliographic and authority records. If you
-have installed the Zebra software and would like to use it,
-please answer 'yes' to the following question. Otherwise,
-Koha will default to using its internal search engine.
-
-Please note that if you choose *NOT* to install Zebra,
-koha-conf.xml will still contain some references to Zebra
-settings. Those references will be ignored by Koha.
-
-
-Install the Zebra configuration files? (no, yes) [yes]
-
-Since you've chosen to use Zebra with Koha,
-you must specify the primary MARC format of the
-records to be indexed by Zebra.
-
-Koha provides Zebra configuration files for MARC 21
-and UNIMARC.
-
-MARC format for Zebra indexing (marc21, unimarc) [marc21] unimarc
-
-Koha supplies Zebra configuration files tuned for
-searching either English (en) or French (fr) MARC
-records.
-
-
-Primary language for Zebra indexing (en, fr) [en] fr
-
-Please specify Zebra database user [kohauser]
-
-Please specify the Zebra database password [zebrastripes]
-
-Since you've chosen to use Zebra, you can enable the SRU/
-Z39.50 Server if you so choose, but you must specify a
-few configuration options for it.
-
-Please note that if you choose *NOT* to configure SRU,
-koha-conf.xml will still contain some references to SRU
-settings. Those references will be ignored by Koha.
-
-
-Install the SRU configuration files? (no, yes) [yes]
-
-SRU Database host? [localhost]
-
-SRU port for bibliographic data? [9998]
-
-SRU port for authority data? [9999]
-
-
-
-
-Koha will be installed with the following configuration parameters:
-
-DB_HOST localhost
-DB_NAME koha
-DB_PASS koha
-DB_PORT 3306
-DB_TYPE mysql
-DB_USER kohaadmin
-INSTALL_BASE /usr/share/koha
-INSTALL_MODE standard
-INSTALL_SRU yes
-INSTALL_ZEBRA yes
-KOHA_GROUP koha
-KOHA_USER koha
-ZEBRA_LANGUAGE fr
-ZEBRA_MARC_FORMAT unimarc
-ZEBRA_PASS zebrastripes
-ZEBRA_SRU_AUTHORITIES_POR9999
-ZEBRA_SRU_BIBLIOS_PORT 9998
-ZEBRA_SRU_HOST localhost
-ZEBRA_USER kohauser
-
-and in the following directories:
-
-DOC_DIR /usr/share/koha/doc
-INTRANET_CGI_DIR /usr/share/koha/intranet/cgi-bin
-INTRANET_TMPL_DIR /usr/share/koha/intranet/htdocs/intranet-tmpl
-INTRANET_WWW_DIR /usr/share/koha/intranet/htdocs
-KOHA_CONF_DIR /etc/koha
-LOG_DIR /var/log/koha
-MAN_DIR /usr/share/koha/man
-MISC_DIR /usr/share/koha/misc
-OPAC_CGI_DIR /usr/share/koha/opac/cgi-bin
-OPAC_TMPL_DIR /usr/share/koha/opac/htdocs/opac-tmpl
-OPAC_WWW_DIR /usr/share/koha/opac/htdocs
-PERL_MODULE_DIR /usr/share/koha/lib
-SCRIPT_DIR /usr/share/koha/bin
-ZEBRA_CONF_DIR /etc/koha/zebradb
-ZEBRA_DATA_DIR /var/lib/koha/zebradb
-ZEBRA_LOCK_DIR /var/lock/koha/zebradb
-ZEBRA_RUN_DIR /var/run/koha/zebradb
-
-
-To change any configuration setting, please run
-perl Makefile.PL again. To override one of the target
-directories, you can do so on the command line like this:
-
-perl Makefile.PL PERL_MODULE_DIR=/usr/share/perl/5.8
-
-You can also set different default values for parameters
-or override directory locations by using environment variables.
-
-For example:
-
-export DB_USER=my_koha
-perl Makefile.PL
-
-or
-
-DB_USER=my_koha DOC_DIR=/usr/local/info perl Makefile.PL
-
-Checking if your kit is complete...
-Looks good
-Writing Makefile for koha
-************************************************** ****************
-
-Taper la commande make
-
-Taper la commande make test (ne pas tenir compte des erreurs list?es)
-
-Taper la commande make install
-
-
-
-4 CONFIGURATION POST INSTALLATION
-
-.1 Saving environment variables
-
-As indicated at the end of the installation (see screen shot), we must add two environment variables:
-
-Entering the two lines below a window in Terminal:
-export KOHA_CONF=/etc/koha/koha-conf.xml
-export PERL5LIB=/usr/share/koha/lib
-
-Seizures of this event, both variables are recorded on a temporary basis. If these variables are definitely enr
-egistr?es we must add these two lines in the file. bash_profile or. bashrc users root and koha.
-
-
-4.2 Creation of the database
-The base is not created. It is a bug, we must launch a script to recreate it. In a Terminal window, type:
-mysql -user=kohaadmin -password=kohakoha koha </usr/share/koha-3.00.00-alpha/installer/data/mysql/kohastructure.sql;
-
-Explanation:
-mysql ? launches client mysql
--- user = kohaadmin ? behalf of the user base
--- password = kohakoha ? password for this user
-koha ? the name of the database
-<? means setting the result of a script (here, the base koha)
-/usr/share/koha-3.00.00-alpha/installer/data/mysql/kohastructure.sql ? address sql script to execute
-Do not forget the sign at the end of the investigation.
-
-To check if the base is well rebuilt: mysql-u-p kohaadmin
-Enter password: kohakoha
-
-
-******************************************************************
-Screenshot
-Welcome to the MySQL monitor. Commands end with; or \g.
-Your MySQL connection id is 51
-Server version: 5.0.45 Source distribution
-
-Type 'help,' or '\h' for help. Type '\c' to clear the buffer.
-
-MySQL> use Koha;
-Reading table information for completion of table and column names
-You can turn off this feature to get a quicker startup with A -
-
-Database changed
-MySQL> show tables;
-+----------------------------+
-| Tables_in_koha |
-+----------------------------+
-| accountlines |
-| accountoffsets |
-| action_logs |
-| alert |
-| aqbasket |
-| aqbookfund |
-| aqbooksellers |
-| aqbudget |
-| aqorderbreakdown |
-| aqorderdelivery |
-| aqorders |
-| auth_header |
-| auth_subfield_structure |
-| auth_tag_structure |
-| auth_types |
-| authorised_values |
-| biblio |
-| biblio_framework |
-| biblioitems |
-| borrowers |
-| branchcategories |
-| branches |
-| branchrelations |
-| branchtransfers |
-| browser |
-| categories |
-| cities |
-| class_sort_rules |
-| class_sources |
-| currency |
-| deletedbiblio |
-| deletedbiblioitems |
-| deletedborrowers |
-| deleteditems |
-| ethnicity |
-| import_batches |
-| import_biblios |
-| import_items |
-| import_record_matches |
-| import_records |
-| issues |
-| issuingrules |
-| items |
-| itemtypes |
-| labels |
-| labels_conf |
-| labels_templates |
-| language_descriptions |
-| language_rfc4646_to_iso639 |
-| language_script_bidi |
-| language_script_mapping |
-| language_subtag_registry |
-| letter |
-| marc_matchers |
-| marc_subfield_structure |
-| marc_tag_structure |
-| matchchecks |
-| matcher_matchpoints |
-| matchpoint_component_norms |
-| matchpoint_components |
-| matchpoints |
-| notifys |
-| nozebra |
-| opac_news |
-| overduerules |
-| printers |
-| repeatable_holidays |
-| reports_dictionary |
-| reserveconstraints |
-| reserves |
-| reviews |
-| roadtype |
-| saved_reports |
-| saved_sql |
-| serial |
-| services_throttle |
-| sessions |
-| special_holidays |
-| statistics |
-| stopwords |
-| subscription |
-| subscriptionhistory |
-| subscriptionroutinglist |
-| suggestions |
-| systempreferences |
-| tags |
-| userflags |
-| virtualshelfcontents |
-| virtualshelves |
-| z3950servers |
-| zebraqueue |
-+----------------------------+
-94 rows in set (0.00 sec)
-
-mysql> quit
-******************************************************************
-
-4.3 Changing the configuration of the Apache server
-
-Create a link koha in the directory /etc/httpd/conf.d/ pointing to the configuration file of koha for apache.
-Open /etc/koha/koha-httpd.conf and paste the contents of this file at the end of /etc/httpd/conf/httpd.conf
-
-Editing httpd.conf located in the directory /etc/httpd/conf, so the Apache web server is reachable on port 8
-0 (standard) and also on port 8080.
-Find string Listen 80 and add a new line below with the string Listen 8080
-Restarting the service httpd. On a Terminal window, type service httpd restart.
-
-Lancer Zebra Server
-zebrasrv east /usr/bin
-with the name zebrasrv-2.0
-go to the directory /usr/bin
-cd /usr/bin
-koha become user by typing the command su:
-su Koha
-zebra start the server by the command:
-./zebrasrv-2.0-f /etc/koha/koha-conf.xml
-
-Starting the daemon Zebraqueue
-zebraqueue_daemon.pl is in /usr/share/koha/bin
-go in /usr/share/koha/bin
-cd /usr/share/koha/bin
-and launch the script zebraqueue_daemon.pl
-. /zebraqueue_daemon.pl
-
-
-4.4 loading data for tests
-
-This step helps to have some input in Koha for testing purposes (table cataloguing default, etc.).
-
-Disable temporarily SElinux
-SE-LINUX blocking access to KOHA.
-Menu K Hotel ? ? SElinux
-Then turn off Selinux and relaunch the service iptables
-
-Unlocking ports
-It must grant access to ports 3306, 9998 and 9999
-Menu K Hotel ? ? Firewall and SElinux
-Other ports and click Add button.
-When the 3 ports are added, click Apply, then click the button.
-
-Using the Web installer
-We must move the fr located in /usr/share/koha/intranet/cgi-bin/data/mysql en-US (installer points to the directory
-en-ing and not en).
-
-Connect to Koha: HYPERLINK "http://localhost:8080/" http://localhost:8080 and use the Web installer french (en-US).
-
--- Validate Step 1 (dependencies);
--- Step 2 (settings of the database on two screens);
--- A Phase 3, click on Install the basic settings (screen 1), select the declination Marc (Unimarc_complet in our
-Where Unimarc_lecture_pub; screen 2), select default settings and then click on Import (only settings obligat
-oires are checked by default; screen 3);
--- The screen 4 summarizes what has been imported, while low demand to opt for a configuration Zebra (our choice) or NoZebra;
--- Finally, the screen 5 indicates the end of the installation; then you just have to click Finish.
-
-Complements
-Connect to PhPMyadmin: HYPERLINK "http://localhost/phpmyadmin" http://localhost/phpmyadmin
-Connect to interface professional Koha: HYPERLINK "http://localhost:8080/" http://localhost:8080
-Connect to online catalogue Koha: HYPERLINK "http://localhost:80/" http://localhost:80
-
-Zebra is in /etc/koha
-The files perl Koha professional can be found in /usr/share/koha/intranet/cgi-bin (then a large repertoire by fonctionnal
-ities of SIGB)
-The files perl Koha public are in /usr/share/koha/koha/cgi-bin
diff --git a/INSTALL.opensuse b/INSTALL.opensuse
deleted file mode 100644
index 2ffb2fc..0000000
--- a/INSTALL.opensuse
+++ /dev/null
@@ -1,2894 +0,0 @@
-====== Installation Guide for Installing Koha 3 on openSUSE 11 ======
-
-Original version created by Ricardo Dias Marques - koha at ricmarques.net
-
-No liability for the contents of this document can be accepted.
-
-Feedback/bug reports: Koha Developer's List: 
-
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-
-This document last modified: 02 December 2008
-
-
-===== Installation Instructions =====
-
-This document was prepared in order to help you discover (or test) Koha (Integrated Library System).
-
-The installation of Linux system described below is a basic, it is not designed for a production server (e.g., security, load balancing ... are not described).
-
-This document describes the different stages of installing the software Koha 3 on the openSUSE 11 Linux distribution 
-in a "new" computer, that is, a computer that will have its hard disk contents COMPLETELY ERASED to install openSUSE and Koha!
-
-In this example, it's assumed that your server gets an IP address by DHCP that will be later changed to 192.168.0.2. 
-
-You'll have to change this to the real IP address that your machine should get (or use DHCP, if that's the case).
-
-This tutorial assumes a Koha installation that does NOT use Zebra ("Zebra is a high-performance, general-purpose structured text indexing and retrieval engine" - http://www.indexdata.dk/zebra/). Additional steps would be required to set up Zebra for Koha.
-
-==== LINUX System Installation ====
-
-
-Download openSUSE 11 DVD at: 
-http://software.opensuse.org/
-
-Place the DVD in the drive and restart the machine.
-
-
-After the "Welcome" screen, you'll get a First menu, with the following options:
-
-----
-Boot from Hard Disk 
-
-Installation
-
-Repair Installed System
-
-Rescue System
-
-Firmware Test 
-
-Memory Test
-----
-
-Choose "Installation" (second command)
-
-
-=== "Initializing" screen ===
-
-(Dialog box appears saying "Probing Mouse")
-
-
-=== "Welcome" screen ===
-
-You'll see two Dropdown Lists: "Language" and "Keyboard Layout"
-
-This depends of your place and preference, naturally. 
-I live in Portugal, so I want a Portuguese Keyboard Layout but I prefer an Operating System in English. 
-So I leave the default option selected for "Language" (English (US)) 
-and change "Keyboard Layout" to "Portuguese".
-
-Check the "I Agree to the License Terms" checkbox (under the "License Agreement" textbox).
-
-Click the "Next" button.
-
-
-
-=== "System Probing" screen ===
-
-
-[just watch it...]
-
-
-
-=== "Installation Mode" screen ===
-
-
-Leave "New Installation" radio button checked
-
-Click the "Next" button
-
-
-=== "Initializing" screen ===
-
-
-[just watch it...]
-
-
-
-
-=== "Clock and Time Zone" screen ===
-
-
-Again, I live in Portugal, so I select the following options:
-
-"Region" listbox: click on "Europe"
-
-"Time Zone" listbox: click on "Portugal"
-
-I leave the "Hardware Clock Set To UTC" checkbox checked.
-
-Click the "Next" button
-
-
-=== "Desktop Selection" screen ===
-
-
-You should see four radio buttons: "GNOME", "KDE 4.0", "KDE 3.5" and "Other".
-
-Click on the "Other" radio button.
-
-Three radio buttons should become visible then:
-
-"XFCE Desktop"
-
-"Minimal X Window"
-
-"Minimal Server Selection (Text Mode)"
-
-click on this last "Minimal Server Selection (Text Mode)" radio button.
-
-Click the "Next" button
-
-
-
-=== "Suggested Partitioning" screen ===
-
-
-Partitioning choices are really up to you. In this example, I will create a 9 GB / ("root") partition and a 712 Swap Megs partition.
-
-So, to do this I click on the "Create Partition Setup..." button.
-
-=== "Preparing Hard Disk: Step 1" screen ===
-
-
-I click on the first radio button:
-"1: 1.IDE 10.0 GB,/dev/sda"
-
-I click the "Next" button
-
-
-=== "Preparing Hard Disk: Step 2" screen ===
-
-
-I uncheck the "Propose separate Home Partition" checkbox.
-
-I click the "Next" button.
-
-This takes me back to the Suggested Partitioning screen.
-
-
-=== "Suggested Partitioning" screen ===
-
-
-In my case, I now have this:
-
-- Create swap partition /dev/sda1 (760.8 MB)
-
-- Create root partition /dev/sda2 (9.2 GB with ext3)
-
-I click the "Next" button.
-
-
-=== "Create New User" screen ===
-
-
-I use this screen to create a regular user.
-
-User's full name: Your Full name (e.g: John Smith)
-
-Username: Your preferred username (e.g.: jsmith)
-
-Password:
-
-Confirm Password:
-
-I uncheck the "Use this password for System Administrator" checkbox.
-
-I uncheck the "Automatic Login" checkbox.
-
-I click the "Next" button (you may be "nagged" with a dialog box by the YAST2 installer warning that you selected a password that it considers to be too simple. Click "Yes" to keep the password you chose, or "No" to change it).
-
-
-
-
-
-=== Password for the System Administrator "root" screen ===
-
-
-Enter your password (in the "Password for root User" text box) and repeat it (in the "Confirm Password" text box).
-
-Click the "Accept" button to return to the "Installation Settings" screen.
-
-
-=== "Installation Settings" screen ===
-
-
-Click on the "Software" link
-
-
-=== "Software Selection and System Tasks" screen ===
-
-
-Scroll down the listbox (that begins with the "Base Technologies" group) until you find the "Server Functions" group.
-
-In that "Server Functions" group click on the "Web and LAMP Server" checkbox (to check it)
-
-Click on the "OK" button to return to "Installation Settings"
-
-
-
-=== "Installation Settings" screen ===
-
-
-Click on the "Install" button (placed in the same place where usually appear the "Accept" or "Next" button).
-
-You should see a "Confirm Installation" dialog box. Click on the "Install" button of that dialog box.
-
-
-=== "Preparing Your Hard Disk" screen ===
-
-
-[just watch it...]
-
-
-=== "Deploying Installation Images" screen ===
-
-
-[just watch it... ]
-
-
-
-=== "Package Installation" screen ===
-
-
-
-[just watch it... or click on the "Details" tab if you want to see what packages are being installed.]
-
-
-=== "Finishing Basic Installation" screen ===
-
-
-[just watch it... ]
-
-After some time you'll see a dialog box warning that the system will reboot in 10 seconds.
-
-
-
-=== After reboot ===
-
-
-Leave "Boot from Hard Disk" selected and click ENTER
-
-You'll have to wait a while (or press ESC to see what the operating system is "doing"). After some moments, you'll 
-be taken to the "Yast2 - installation @ Linux" screen (a text installer).
-
-
-=== "Writing the System Configuration" screen ===
-
-
-[just watch it... ]
-
-After a while you'll see a prompt:
-|--------------------
-Welcome to openSUSE 11.0 (i586) - Kernel 2.6.25.4-8-default (tty1)
-
-linux-3r10 login:
-|--------------------
-
-You may now login with your "root" user.
-
-
-
-
-==== Changing the Hostname and Domain Name ====
- 
-
-I want to change my hostname, domain name and switch from DHCP to a Static IP address.
-
-So, the first thing I do, is to run yast (the setup tool) by entering the yast command in the command prompt:
-|--------------------
-linux-3r10:~ # yast
-|--------------------
-
-Yast should appear.
-
-On the listbox of the left hand side select "Network Devices" (press TAB to turn focus on that listbox, and press the down arrow key several times to reach it). Then, on the listbox of the right hand side, select "Network Settings" (you'll have again to press TAB to turn focus on that listbox, and press the down arrow key several times to reach it).
-
-Press the ENTER key.
-
-
-=== "Initializing Network Configuration" screen ===
-
-
-[just watch it...]
-
-=== "Network Settings" screen ===
-
-
-I want to disable IPv6, so I first go to the "Global Options" section (by pushing the key combination ALT+G to press the "G" letter in Global Options that is highlighted). In the next screen, I push ALT+E to uncheck the "Enable IPv6" checkbox. I'll get a dialog box with a Warning saying that "To apply this change a reboot is needed.". I just press ENTER on that dialog box, but I do NOT reboot (at least not yet). 
-
-Then I press Alt+O to go to the "Overview" (still in "Network Settings"). Then I press ALT+i to "Edit" the information for this Network Card.
-
-=== "Network Card Setup" screen ===
-
-
-I check the "Statically assigned IP Address" checkbox, and enter the following info for "IP Address", "Subnet Mask" and "Hostname" (you should use the values defined by your network administrator):
-
-IP Address: 192.168.0.2
-Subnet Mask: 255.255.255.0
-Hostname: myhost
-
-Then I press ALT+N to click the "Next" button. After a few seconds, I will be taken again to the "Network Settings" screen.
-
-
-=== "Network Settings" screen ===
-
-
-I press ALT+s to go to the "Hostname/DNS" screen.
-
-I check the "Change /etc/resolv.conf manually" checkbox and enter the IP Address of my DNS Server in the "Name Server 1" text box:
-
-
-Name Server 1: 192.168.0.1
-
-Then I press ALT+u to go to the "Routing" configuration.
-
-=== "Routing" screen ===
-
-
-In the "Default Gateway" text box, I enter the IP Address of my Default Gateway:
-
-Default Gateway: 192.168.0.1
-
-Then I press ALT+F to Finish
-
-
-
-=== "Saving Network Configuration" screen ===
-
-
-[just watch it...]
-
-
-After a few seconds, you should be taken back to the "YaST2 Control Center" screen.
-
-
-
-
-==== Enabling access to SSH (Secure Shell) and Apache2 (Web Server) ====
-
-I want to administer remotely this server with a SSH (Secure Shell) client. So, while still in the "YaST2 Control Center, I will enable SSH in the Firewall (running by default). In the listbox of the left hand side, I select "Security and Users" and then, on the listbox of the right side, I select "Firewall" (first option) and press the ENTER key.
-
-=== "yast2 - firewall" screen ===
-
-In the list box of the left side, I select "Allowed Services" and press ENTER.
-
-Then, on the "Service to Allow" dropdown list (on the right side), I leave the "Apache 2" option selected and press "ALt+A" to add it. After adding Apache, I'll press "Alt+S" to see the available services to add. Then, I use the down key in that list until I see "Secure Shell Server" and press ENTER to select it. This will close that list and put "Secure Shell Server" as the selected option. I'll press Alt+A again to add it.
-
-Then I click on ALT+N click on the "Next" button.
-
-
-=== "Firewall Configuration: Summary" screen ===
-
-
-Click on the "Finish" button.
-
-When you get sent back to the "YaST2 Control Center" screen, press ALT+Q to Quit Yast.
-
-
-This time seems to be a good time to reboot your server:
-|--------------------
-linux-3r10:~ # reboot
-|--------------------
-After rebooting the machine, if you wish, you may go to another machine and connect to your newly created server using a SSH (Secure Shell) client. In Windows, I like to use putty to do ssh sessions to my Linux servers.
-
-
-==== Configure Software Repositories ===
-
-After the system has rebooted, log in as root.
-
-Later on, you will need to add some software packages from the openSUSE 11 Distribution. Some of those packages are NOT available in the openSUSE 11.0 DVD (libyaz-devel is one of those packages). So, we'll now set up openSUSE to add the "Official openSUSE 11.0 OSS (Open Source Software) Repository" using yast.
-
-First, run the yast command in the Linux command line (shell):
-
-|--------------------
-# yast
-|--------------------
-
-Inside yast, select Software -> Software Repositories
-
-
-=== "Configured Software Repositories" screen ===
-
-If on this screen, you already see a table that has: 
-
-  * as configured repositories (in the "Name" column) - "openSUSE-DVD 11.0", "openSUSE-11.0-Non.Oss", "openSUSE-11.0-Debug" and "openSUSE-11.0-Oss" ... 
-  * ... and, at least "openSUSE-DVD 11.0" and "openSUSE-11.0-Oss" have an "x" in the "Enabled" column ... 
-  * ... then you may leave yast, as the required repositories have already been configured.
-
-If not, you'll have to add the "openSUSE-11.0-Oss" repository. Click on the "Add" button.
-
-=== "Media type" screen ===
-
-
-Click on the Specify URL... radio button.
-
-Click on the "Next" button.
-
-
-=== "Repository URL" screen ===
-
-
-In the "Repository Name" textbox enter some descriptive text like:
-openSUSE 11.0 Official OSS Repository
-
-In the "URL" textbox enter:
-http://download.opensuse.org/distribution/11.0/repo/oss/
-
-
-Click on the "Next" button.
-
-
-=== "License Agreement" screen ===
-
-
-Check the "Yes, I Agree to the License Agreement" radio button.
-
-Click on the "Next" button to return to the "Configured Software Repositories" screen.
-
-
-=== "Configured Software Repositories" screen ===
-
-
-You should see now the "openSUSE 11 Official OSS Repository" listed as an entry.
-
-Click on the "Finish" button.
-
-When you get sent back to the "Yast Control Center" click on the "Quit" button (to return to the shell).
-
-
-==== Install some useful / necessary programs ===
-
-By this time, I'll install some of the programs I regularly use, by using yast:
-
-
-  * To install locate:
-|--------------------
-# yast -i findutils-locate
-|--------------------
-A YaST screen may appear saying:
-|--------------------
-Starting the Package Manager.
-|--------------------
-If that screen appears, it will download some information from http://download.opensuse.org (and set several Software Repositories "behind the scenes)
-
-
-  * To install ncftp (command-line ftp client):
-|--------------------
-# yast -i ncftp
-|--------------------
-
-
-Install some packages that are needed to install Koha:
-
-  * To install make :
-|--------------------
-# yast -i make
-|--------------------
-
-  * To install gcc :
-|--------------------
-# yast -i gcc
-|--------------------
-(this will also install some packages that gcc depend on, like glibc-devel).
-
-
-==== Download Koha ====
-
-|--------------------
-# wget http://download.koha-community.org/koha-3.00.00.tar.gz
-|--------------------
-
-[FIXME: Check what will be the exact URL of the .tar.gz file for Koha 3]
-
-
-==== Extract Koha ====
-
-|--------------------
-# tar -xzvf koha-3.00.00.tar.gz
-|--------------------
-
-
-==== Set up Locale for root user ====
-
-If you run the locale command, you'll probably get this output:
-|--------------------
-# locale
-LANG=POSIX
-LC_CTYPE=en_US.UTF-8
-LC_NUMERIC="POSIX"
-LC_TIME="POSIX"
-LC_COLLATE="POSIX"
-LC_MONETARY="POSIX"
-LC_MESSAGES="POSIX"
-LC_PAPER="POSIX"
-LC_NAME="POSIX"
-LC_ADDRESS="POSIX"
-LC_TELEPHONE="POSIX"
-LC_MEASUREMENT="POSIX"
-LC_IDENTIFICATION="POSIX"
-LC_ALL=
-|--------------------
-
-We want to have en_US.UTF-8 in all LC_* variables. So, we'll do the following:
-|--------------------
-# yast
-|--------------------
-System -> Language
-
-The "Languages" screen should appear. 
-
-In the first section (Primary Language Settings):
-
-Leave "English (US)" selected as the option for Primary Language
-
-
-Click on the "Details..." link
-
-Change the Locale Settings for user root from the default option ("ctype Only") to "Yes"
-
-Make sure the "Use UTF-8 Encoding" checkbox is checked (it should already be).
-
-Leave the "Detailed Locale Setting" en_US selected
-
-Click on the OK button to return to the "Languages" screen
-
-Click on the "Accept" button.
-
-
-
-When you get back to the "Yast2 Control Center" screen, click on the "Quit" button
-
-
-
-==== Putty configuration to use Unicode (UTF-8 encoding) ====
-
-If you use Putty, set up Putty to use UTF-8 encoding. To do this, click on the upper left corner of the PuTTy window, 
-to expand the menu. Scroll down until you find the "Change Settings..." command and click on it.
-
-This should open the "PuTTy Reconfiguration" screen. Here expand the "Window" category and click on "Translation"
-
-When you do this, you'll see that the "Received data assumed to be in which character set" dropdown list probably reads:
-
-"ISO-8859-1:1998 (Latin-1, West Europe)
-
-change it to: "UTF-8"
-
-Click on the "Apply" button
-
-
-Now, it's a good time to SAVE this PuTTy session. To do this, click again on the upper left corner of the PuTTy window, to expand the menu, and click on the "Change Settings..." command like you did before.
-
-This should open the "PuTTy Reconfiguration" screen. Go to the right hand side of that screen and type a name in the "Saved Sessions" textbox (e.g: koha). Then click on the "Save" button and, after doing that, click on the "Apply" button.
-
-
-IMPORTANT!!! Now it's the time to EXIT the login shell, by typing the exit command:
-|--------------------
-# exit
-|--------------------
-
-Now you'll reopen PuTTy, but when you do that, open the Saved Session that you have created in order to use the "UTF-8" configuration you have done.
-
-
-After logging in again with the root user, type the locale command again. Now it should read like the following:
-
-|--------------------
-# locale
-LANG=en_US.UTF-8
-LC_CTYPE="en_US.UTF-8"
-LC_NUMERIC="en_US.UTF-8"
-LC_TIME="en_US.UTF-8"
-LC_COLLATE="en_US.UTF-8"
-LC_MONETARY="en_US.UTF-8"
-LC_MESSAGES="en_US.UTF-8"
-LC_PAPER="en_US.UTF-8"
-LC_NAME="en_US.UTF-8"
-LC_ADDRESS="en_US.UTF-8"
-LC_TELEPHONE="en_US.UTF-8"
-LC_MEASUREMENT="en_US.UTF-8"
-LC_IDENTIFICATION="en_US.UTF-8"
-LC_ALL=
-|--------------------
-
-
-==== Apache configuration (for UTF-8) ====
-
-Create a file called /etc/apache2/httpd.conf.local with vim (or your preferred text editor):
-|--------------------
-myhost:~ # vim /etc/apache2/httpd.conf.local
-|--------------------
-Add this line:
-|--------------------
-AddDefaultCharset UTF-8
-|--------------------
-
-
-==== Configure Apache to start at boot time and start the service ====
-|--------------------
-# chkconfig apache2 on
-
-# service apache2 start
-Starting httpd2 (prefork)                                            done
-|--------------------
-
-Go to a browser and type:
-
-http://192.168.0.2
-
-You should see a page that reads:
-
-"It works!"
-
-
-
-==== MySQL configuration ====
-
-1 - Configure MySQL to start at boot time and start the service:
-|--------------------
-# chkconfig mysql on
-
-# service mysql start
-|--------------------
-
-2 - Change the password for the "root" user of MySQL:
-|--------------------
-# /usr/bin/mysqladmin -u root password 'chosenpassword'
-|--------------------
-
-3 - Check the encoding variables of MySQL
-
-To check the encoding variables of MySQL, will type the 
-show variables like 'char%'; command in a mysql prompt:
-|--------------------
-# mysql -p
-Enter password:
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 7
-Server version: 5.0.51a SUSE MySQL RPM
-
-
-Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-mysql> show variables like 'char%';
-+--------------------------+----------------------------+
-| Variable_name            | Value                      |
-+--------------------------+----------------------------+
-| character_set_client     | latin1                     |
-| character_set_connection | latin1                     |
-| character_set_database   | latin1                     |
-| character_set_filesystem | binary                     |
-| character_set_results    | latin1                     |
-| character_set_server     | latin1                     |
-| character_set_system     | utf8                       |
-| character_sets_dir       | /usr/share/mysql/charsets/ |
-+--------------------------+----------------------------+
-8 rows in set (0.00 sec)
-
-mysql> quit
-Bye
-|--------------------
-
-We want to have utf8 in the above character_set_* variables above (and NOT latin1)!
-
-In order to do this:
-
-1 - Create a backup of the MySQL configuration file (my.cnf):
-|--------------------
-# cd /etc
-myhost:/etc # cp my.cnf my.cnf.ORIG
-|--------------------
-
-2 - Use vim to add these 3 lines in the section [mysqld] of the my.cnf file:
-|--------------------
-default-character-set = utf8
-character-set-server = utf8
-skip-character-set-client-handshake
-|--------------------
-
-3 - Restart MySQL:
-|--------------------
-myhost:/etc # service mysql restart
-Restarting service MySQL
-Shutting down service MySQL                                           done
-Starting service MySQL                                                done
-|--------------------
-
-Now, let's type again the show variables like 'char%' mysql command to see if 
-the character_set_variables have changed from latin1 to utf8 (character_set_filesystem 
-will still read "binary" but I think that's OK:
-|--------------------
-myhost:/etc # mysql -p
-Enter password:
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 1
-Server version: 5.0.51a SUSE MySQL RPM
-
-
-Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-mysql> show variables like 'char%';
-+--------------------------+----------------------------+
-| Variable_name            | Value                      |
-+--------------------------+----------------------------+
-| character_set_client     | utf8                       |
-| character_set_connection | utf8                       |
-| character_set_database   | utf8                       |
-| character_set_filesystem | binary                     |
-| character_set_results    | utf8                       |
-| character_set_server     | utf8                       |
-| character_set_system     | utf8                       |
-| character_sets_dir       | /usr/share/mysql/charsets/ |
-+--------------------------+----------------------------+
-8 rows in set (0.01 sec)
-
-mysql> quit
-Bye
-|--------------------
-
-==== Create the Koha database ====
-
-=== Create the koha database and user with associated privileges ===
-|--------------------
-# mysqladmin -uroot create koha -p 
-|--------------------
-(you may name the koha database something different from koha)
-
-
-=== Grant privileges to a MySQL user to the koha database === 
-
-Assuming that you want to have a MySQL user called "kohaadmin" to administer a database called "koha" with the password "kohapassword", you'd enter this:
-|--------------------
-myhost:~ # mysql -p
-Enter password:
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 3
-Server version: 5.0.51a SUSE MySQL RPM
-
-Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-mysql> grant all on koha.* to 'kohaadmin'@'localhost' identified by 'kohapassword';
-Query OK, 0 rows affected (0.00 sec)
-
-mysql> flush privileges;
-Query OK, 0 rows affected (0.08 sec)
-
-mysql> quit
-Bye
-|--------------------
-
-
-==== Test your SAX Parser and correct where necessary ====
-
-
-  * Install the XML::SAX and XML::LibXML perl Modules:
-|--------------------
-# yast -i perl-XML-SAX 
-
-# yast -i perl-XML-LibXML
-|--------------------
-
-You must be sure you're using the XML::LibXML SAX parser, not Expat or PurePerl, both of which have outstanding bugs with pre-composed characters. You can test your SAX parser by running:
-|--------------------
-# cd /root/koha-3.00.00/
-
-myhost:~/koha-3.00.00 # misc/sax_parser_print.pl 
-|--------------------
-
-You will probably see this:
-|--------------------
-XML::SAX::PurePerl=HASH(0x8356a4c)
-|--------------------
-
-If you're using PurePerl (you probably are) or Expat, you'll need to edit your ParserDetails.ini file to use the LibXML Parser. 
-To find the ParserDetails.ini file, you may use locate. To do this, first update the locate database by running the updatedb command:
-|--------------------
-# updatedb
-|--------------------
-
-Then find ParserDetails.ini using locate:
-|--------------------
-# locate ParserDetails.ini
-/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX/ParserDetails.ini
-|--------------------
-
-OK. So, let's first do a backup of this ini file:
-|--------------------
- # cd /usr/lib/perl5/vendor_perl/5.10.0/XML/SAX/
-
-myhost:/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX # cp ParserDetails.ini ParserDetails.ini.ORIG
-|--------------------
-
-Edit this ParserDetails.ini file (with vim or other editor)
-
-See if the first line contains this:
-|--------------------
-[XML::SAX::PurePerl]
-|--------------------
-If it does, replace this first line by the following:
-|--------------------
-[XML::LibXML::SAX::Parser]
-|--------------------
-
-Run the /root/koha-3.00.00/misc/sax_parser_print.pl command again. This time, you should get the following output:
-|--------------------
-XML::LibXML::SAX::Parser=HASH(0x8356e0c)
-|--------------------
-
-
-
-
-
-
-==== Run Koha's perl installer ====
-|--------------------
-myhost:/usr/lib/perl5/vendor_perl/5.10.0/XML/SAX # cd /root/koha-3.00.00
-|--------------------
-We will now run perl Makefile.PL to run the installer. 
-
-My installation is a UNIMARC installation, so I'm answering unimarc to the "MARC format for Zebra indexing (marc21, unimarc) [marc21]" question below. If your Library uses the MARC21 format instead of UNIMARC, you should press ENTER to accept the default (which is marc21). 
-
-Because my bibliographic catalog will have mainly records in Portuguese, and Portuguese is more similar to French than to English, I'm answering "fr" (French) to the "Primary language for Zebra indexing (en, fr) [en]" question below.
-
-Although I'm NOT using Zebra, I'm answering "yes" (the default choice) to the "Install the Zebra configuration files? (no, yes) [yes]" so I can set up Zebra later, if I decide to.
-
-OK. So here's the result of running the  perl Makefile.PL  command (including my answers to the several questions):
-
-|--------------------
-myhost:~/koha-3.00.00 # perl Makefile.PL
-
-By default, Koha can be installed in one of three ways:
-
-standard: Install files in conformance with the Filesystem
-          Hierarchy Standard (FHS).  This is the default mode
-          and should be used when installing a production
-          Koha system.  On Unix systems, root access is
-          needed to complete a standard installation.
-
-single:   Install files under a single directory.  This option
-          is useful for installing Koha without root access, e.g.,
-          on a web host that allows CGI scripts and MySQL databases
-          but requires the user to keep all files under the user's
-          HOME directory.
-
-dev:      Create a set of symbolic links and configuration files to
-          allow Koha to run directly from the source distribution.
-          This mode is useful for developers who want to run
-          Koha from a git clone.
-
-Installation mode (dev, single, standard) [standard]
-
-Please specify the directory under which most Koha files
-will be installed.
-
-Note that if you are planning in installing more than
-one instance of Koha, you may want to modify the last
-component of the directory path, which will be used
-as the package name in the FHS layout.
-
-Base installation directory [/usr/share/koha]
-
-Since you are using the 'standard' install
-mode, you should run 'make install' as root.
-However, it is recommended that a non-root
-user (on Unix and Linux platforms) have
-ownership of Koha's files, including the
-Zebra indexes if applicable.
-
-Please specify a user account.  This
-user account does not need to exist
-right now, but it needs to exist
-before you run 'make install'.  Please
-note that for security reasons, this
-user should not be the same as the user
-account Apache runs under.
-
-User account [koha]
-
-Please specify the group that should own
-Koha's files.  As above, this group need
-not exist right now, but should be created
-before you run 'make install'.
-
-Group [koha]
-
-Please specify which database engine you will use
-to store data in Koha.  The choices are MySQL and
-PostgreSQL; please note that at the moment
-PostgreSQL support is highly experimental.
-
-DBMS to use (Pg, mysql) [mysql]
-
-Please specify the name or address of your
-database server.  Note that the database
-does not have to exist at this point, it
-can be created after running 'make install'
-and before you try using Koha for the first time.
-
-Database server [localhost]
-
-Please specify the port used to connect to the
-DMBS [3306]
-
-Please specify the name of the database to be
-used by Koha [koha]
-
-Please specify the user that owns the database to be
-used by Koha [kohaadmin]
-
-Please specify the password of the user that owns the
-database to be used by Koha [katikoan] kohapassword
-
-Koha can use the Zebra search engine for high-performance
-searching of bibliographic and authority records.  If you
-have installed the Zebra software and would like to use it,
-please answer 'yes' to the following question.  Otherwise,
-Koha will default to using its internal search engine.
-
-Please note that if you choose *NOT* to install Zebra,
-koha-conf.xml will still contain some references to Zebra
-settings.  Those references will be ignored by Koha.
-
-Install the Zebra configuration files? (no, yes) [yes]
-
-Unable to find the Zebra programs 'zebrasrv' and 'zebraidx'
-in your PATH or in some of the usual places.  If you haven't
-installed Zebra yet, please do so and run Makefile.PL again.
-
-
-Since you've chosen to use Zebra with Koha,
-you must specify the primary MARC format of the
-records to be indexed by Zebra.
-
-Koha provides Zebra configuration files for MARC 21
-and UNIMARC.
-
-MARC format for Zebra indexing (marc21, unimarc) [marc21] unimarc
-
-Koha supplies Zebra configuration files tuned for
-searching either English (en) or French (fr) MARC
-records.
-
-Primary language for Zebra indexing (en, fr) [en] fr
-
-Koha can use one of  two different indexing modes
-for the MARC authorities records:
-
-grs1 - uses the Zebra GRS-1 filter, available
-       for legacy support
-dom  - uses the DOM XML filter; offers improved
-       functionality.
-
-Authorities indexing mode (dom, grs1) [grs1] dom
-
-Please specify Zebra database user [kohauser]
-
-Please specify the Zebra database password [zebrastripes] zebrapassword
-
-Since you've chosen to use Zebra, you can enable the SRU/
-Z39.50 Server if you so choose, but you must specify a
-few configuration options for it.
-
-Please note that if you choose *NOT* to configure SRU,
-koha-conf.xml will still contain some references to SRU
-settings.  Those references will be ignored by Koha.
-
-Install the SRU configuration files? (no, yes) [yes] no
-
-Since you've chosen to use Zebra, you can also choose to
-install PazPar2, which is a metasearch tool.  With PazPar2,
-Koha can perform on-the-fly merging of bibliographic
-records during searching, allowing for FRBRization of
-the results list.
-
-Install the PazPar2 configuration files? [no] no
-
-Would you like to run the database-dependent test suite? (no, yes) [no]
-
-
-
-
-Koha will be installed with the following configuration parameters:
-
-AUTH_INDEX_MODE          dom
-DB_HOST                  localhost
-DB_NAME                  koha
-DB_PASS                  kohapassword
-DB_PORT                  3306
-DB_TYPE                  mysql
-DB_USER                  kohaadmin
-INSTALL_BASE             /usr/share/koha
-INSTALL_MODE             standard
-INSTALL_PAZPAR2          no
-INSTALL_SRU              no
-INSTALL_ZEBRA            yes
-KOHA_GROUP               koha
-KOHA_INSTALLED_VERSION   3.00.00.096
-KOHA_USER                koha
-RUN_DATABASE_TESTS       no
-ZEBRA_LANGUAGE           fr
-ZEBRA_MARC_FORMAT        unimarc
-ZEBRA_PASS               zebrapassword
-ZEBRA_USER               kohauser
-
-and in the following directories:
-
-DOC_DIR                  /usr/share/koha/doc
-INTRANET_CGI_DIR         /usr/share/koha/intranet/cgi-bin
-INTRANET_TMPL_DIR        /usr/share/koha/intranet/htdocs/intranet-tmpl
-INTRANET_WWW_DIR         /usr/share/koha/intranet/htdocs
-KOHA_CONF_DIR            /etc/koha
-LOG_DIR                  /var/log/koha
-MAN_DIR                  /usr/share/koha/man
-MISC_DIR                 /usr/share/koha/misc
-OPAC_CGI_DIR             /usr/share/koha/opac/cgi-bin
-OPAC_TMPL_DIR            /usr/share/koha/opac/htdocs/opac-tmpl
-OPAC_WWW_DIR             /usr/share/koha/opac/htdocs
-PAZPAR2_CONF_DIR         /etc/koha/pazpar2
-PERL_MODULE_DIR          /usr/share/koha/lib
-SCRIPT_DIR               /usr/share/koha/bin
-SCRIPT_NONDEV_DIR        /usr/share/koha/bin
-ZEBRA_CONF_DIR           /etc/koha/zebradb
-ZEBRA_DATA_DIR           /var/lib/koha/zebradb
-ZEBRA_LOCK_DIR           /var/lock/koha/zebradb
-ZEBRA_RUN_DIR            /var/run/koha/zebradb
-
-
-To change any configuration setting, please run
-perl Makefile.PL again.  To override one of the target
-directories, you can do so on the command line like this:
-
-perl Makefile.PL PERL_MODULE_DIR=/usr/share/perl/5.8
-
-You can also set different default values for parameters
-or override directory locations by using environment variables.
-
-For example:
-
-export DB_USER=my_koha
-perl Makefile.PL
-
-or
-
-DB_USER=my_koha DOC_DIR=/usr/local/info perl Makefile.PL
-
-If installing on a Win32 platform, be sure to use:
-'dmake -x MAXLINELENGTH=300000'
-
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Algorithm::CheckDigits 0.5 not found.
-Warning: prerequisite Biblio::EndnoteStyle 0.05 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite CGI::Session 4.10 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Class::Accessor 0.3 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Class::Factory::Util 1.6 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite DBD::mysql 4.004 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Data::ICal 0.13 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::Calc 5.4 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::ICal 1.72 not found.
-[Tue Oct 14 23:40:25 2008] Makefile.PL: Warning: prerequisite Date::Manip 5.44 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Email::Date 1.103 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite GD 2.39 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite GD::Barcode::UPCE 1.1 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite HTML::Scrubber 0.08 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite HTML::Template::Pro 0.69 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Lingua::Stem 0.82 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite List::MoreUtils 0.21 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Charset 0.98 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Crosswalk::DublinCore 0.02 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::File::XML 0.88 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MARC::Record 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite MIME::Lite 3 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Mail::Sendmail 0.79 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::LDAP 0.33 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::LDAP::Filter 0.14 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Net::Z3950::ZOOM 1.16 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2::Page 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::API2::Util 2 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::Reuse 0.33 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite PDF::Reuse::Barcode 0.05 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite POE 0.9999 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite SMS::Send 0.05 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Schedule::At 1.06 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::CSV 0.01 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::CSV_XS 0.32 not found.
-[Tue Oct 14 23:40:26 2008] Makefile.PL: Warning: prerequisite Text::Iconv 1.7 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::Dumper 0.81 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::LibXSLT 1.59 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite XML::RSS 1.31 not found.
-[Tue Oct 14 23:40:27 2008] Makefile.PL: Warning: prerequisite YAML::Syck 0.71 not found.
-Writing Makefile for koha
-
-
-myhost:~/koha-3.00.00 #
-|--------------------
-
-OK... Lots of missing dependencies (Perl Modules). Let's build some of these modules in CPAN to fix this:
-
-
-==== CPAN Configuration ====
-If you don't already know, "CPAN is the Comprehensive Perl Archive Network, a large collection of Perl software and documentation". For additional info, you may browse the official CPAN web site is at http://www.cpan.org/
-
-Enter the "cpan" command to configure CPAN:
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-
-CPAN is the world-wide archive of perl resources. It consists of about
-300 sites that all replicate the same contents around the globe. Many
-countries have at least one CPAN site already. The resources found on
-CPAN are easily accessible with the CPAN.pm module. If you want to use
-CPAN.pm, lots of things have to be configured. Fortunately, most of
-them can be determined automatically. If you prefer the automatic
-configuration, answer 'yes' below.
-
-If you prefer to enter a dialog instead, you can answer 'no' to this
-question and I'll let you configure in small steps one thing after the
-other. (Note: you can revisit this dialog anytime later by typing 'o
-conf init' at the cpan prompt.)
-Would you like me to configure as much as possible automatically? [yes]
-|--------------------
-
-[Just press ENTER here to set all CPAN settings to the default values. 
-After doing this CPAN will scroll lots of messages with questions that 
-it will automatically answer]
-
-[Let's now set up CPAN for Internet access to enable it to download packages. 
-Because I live in Portugal, I'm choosing Portuguese mirrors here. Choose the 
-mirrors that are nearer to you:]
-
-|--------------------
-cpan[2]> o conf init urllist
-You have no /root/.cpan/sources/MIRRORED.BY
-  I'm trying to fetch one
-CPAN: LWP::UserAgent loaded ok (v5.810)
-
-I would like to connect to one of the following sites to get 'MIRRORED.BY':
-
- http://www.perl.org/CPAN/
- ftp://ftp.perl.org/pub/CPAN/
-
-Is it OK to try to connect to the Internet? [yes]
-Fetching with LWP:
-  http://www.perl.org/CPAN/MIRRORED.BY
-
-
-Now we need to know where your favorite CPAN sites are located. Push
-a few sites onto the array (just in case the first on the array won't
-work). If you are mirroring CPAN to your local workstation, specify a
-file: URL.
-
-First, pick a nearby continent and country by typing in the number(s)
-in front of the item(s) you want to select. You can pick several of
-each, separated by spaces. Then, you will be presented with a list of
-URLs of CPAN mirrors in the countries you selected, along with
-previously selected URLs. Select some of those URLs, or just keep the
-old list. Finally, you will be prompted for any extra URLs -- file:,
-ftp:, or http: -- that host a CPAN mirror.
-
-(1) Africa
-(2) Asia
-(3) Central America
-(4) Europe
-(5) North America
-(6) Oceania
-(7) South America
-Select your continent (or several nearby continents) [] 4
-
-(1) Austria
-(2) Belgium
-(3) Bosnia and Herzegovina
-(4) Bulgaria
-(5) Croatia
-(6) Czech Republic
-(7) Denmark
-(8) Finland
-(9) France
-(10) Germany
-(11) Greece
-(12) Hungary
-(13) Iceland
-(14) Ireland
-(15) Italy
-(16) Latvia
-15 more items, hit RETURN to show them
-Select your country (or several nearby countries) []
-Sorry! since you don't have any existing picks, you must make a
-geographic selection.
-
-(17) Lithuania
-(18) Malta
-(19) Netherlands
-(20) Norway
-(21) Poland
-(22) Portugal
-(23) Romania
-(24) Russia
-(25) Slovakia
-(26) Slovenia
-(27) Spain
-(28) Sweden
-(29) Switzerland
-(30) Ukraine
-(31) United Kingdom
-Select your country (or several nearby countries) [] 22
-
-(1) ftp://cpan.ip.pt/pub/cpan/
-(2) ftp://ftp.dei.uc.pt/pub/CPAN
-(3) ftp://ftp.isr.ist.utl.pt/pub/CPAN/
-(4) ftp://ftp.nfsi.pt/pub/cpan/
-(5) ftp://neacm.fe.up.pt/pub/CPAN/
-(6) ftp://perl.di.uminho.pt/pub/CPAN/
-(7) http://cpan.dcc.fc.up.pt/
-Select as many URLs as you like (by number),
-put them on one line, separated by blanks, hyphenated ranges allowed
- e.g. '1 4 5' or '7 1-4 8' [] 3 2 6 4 5 7 1
-
-Enter another URL or RETURN to quit: []
-New set of picks:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/
-  ftp://ftp.dei.uc.pt/pub/CPAN
-  ftp://perl.di.uminho.pt/pub/CPAN/
-  ftp://ftp.nfsi.pt/pub/cpan/
-  ftp://neacm.fe.up.pt/pub/CPAN/
-  http://cpan.dcc.fc.up.pt/
-  ftp://cpan.ip.pt/pub/cpan/
-
-
-Please remember to call 'o conf commit' to make the config permanent!
-
-
-cpan[3]> o conf commit
-commit: wrote '/usr/lib/perl5/5.10.0/CPAN/Config.pm'
-
-cpan[4]> quit
-Lockfile removed.
-|--------------------
-
-==== Installing Prerequisite Modules ====
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-CPAN: File::HomeDir loaded ok (v0.69)
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-|--------------------
-
-=== Install Algorithm::CheckDigits ===
-[Let's install the first package called "Algorithm::CheckDigits". Here I will leave the complete output. For the next installations, I will only show the prompts for dependencies and snip out the remaining output]:
-|--------------------
-cpan[1]> install Algorithm::CheckDigits
-CPAN: Storable loaded ok (v2.18)
-CPAN: LWP::UserAgent loaded ok (v5.810)
-CPAN: Time::HiRes loaded ok (v1.9711)
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/01mailrc.txt.gz
-Going to read /root/.cpan/sources/authors/01mailrc.txt.gz
-CPAN: Compress::Zlib loaded ok (v2.008)
-............................................................................DONE
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/modules/02packages.details.txt.gz
-Going to read /root/.cpan/sources/modules/02packages.details.txt.gz
-  Database was generated on Mon, 07 Jul 2008 04:02:45 GMT
-............................................................................DONE
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/modules/03modlist.data.gz
-Going to read /root/.cpan/sources/modules/03modlist.data.gz
-............................................................................DONE
-Going to write /root/.cpan/Metadata
-Running install for module 'Algorithm::CheckDigits'
-CPAN: Data::Dumper loaded ok (v2.121_14)
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
-Running make for M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-CPAN: Digest::SHA loaded ok (v5.45)
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MA/MAMAWE/CHECKSUMS
-Checksum for /root/.cpan/sources/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz ok
-Scanning cache /root/.cpan/build for sizes
-DONE
-Algorithm-CheckDigits-0.50/
-Algorithm-CheckDigits-0.50/t/
-Algorithm-CheckDigits-0.50/t/valid.data
-Algorithm-CheckDigits-0.50/t/valid.t
-Algorithm-CheckDigits-0.50/t/iban.t
-Algorithm-CheckDigits-0.50/t/isbn13.t
-Algorithm-CheckDigits-0.50/t/ecno.t
-Algorithm-CheckDigits-0.50/t/upc.t
-Algorithm-CheckDigits-0.50/t/imei.t
-Algorithm-CheckDigits-0.50/t/pod-coverage.t
-Algorithm-CheckDigits-0.50/t/pod.t
-Algorithm-CheckDigits-0.50/t/checkdigits.t
-Algorithm-CheckDigits-0.50/CheckDigits.pm
-Algorithm-CheckDigits-0.50/Changes
-Algorithm-CheckDigits-0.50/CheckDigits/
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_005.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_005.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M97_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_012.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_010.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_015.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M07_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_008.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M23_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_013.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_009.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M09_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M16_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_008.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_016.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_003.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_011.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M23_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M43_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_017.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_007.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_011.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_006.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M89_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M97_002.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_004.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MBase_001.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M11_010.pm
-Algorithm-CheckDigits-0.50/CheckDigits/M10_009.pm
-Algorithm-CheckDigits-0.50/CheckDigits/MXX_001.pm
-Algorithm-CheckDigits-0.50/META.yml
-Algorithm-CheckDigits-0.50/.perltidyrc
-Algorithm-CheckDigits-0.50/README
-Algorithm-CheckDigits-0.50/MANIFEST
-Algorithm-CheckDigits-0.50/Makefile.PL
-CPAN: File::Temp loaded ok (v0.18)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build M/MA/MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-
-Checking if your kit is complete...
-Looks good
-Writing Makefile for Algorithm::CheckDigits
-Could not read '/root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/META.yml'. Falling back to other methods to determine prerequisites
-cp CheckDigits/M11_001.pm blib/lib/Algorithm/CheckDigits/M11_001.pm
-cp CheckDigits/M11_010.pm blib/lib/Algorithm/CheckDigits/M11_010.pm
-cp CheckDigits/M97_002.pm blib/lib/Algorithm/CheckDigits/M97_002.pm
-cp CheckDigits/M23_001.pm blib/lib/Algorithm/CheckDigits/M23_001.pm
-cp CheckDigits/M97_001.pm blib/lib/Algorithm/CheckDigits/M97_001.pm
-cp CheckDigits/M16_001.pm blib/lib/Algorithm/CheckDigits/M16_001.pm
-cp CheckDigits/M10_006.pm blib/lib/Algorithm/CheckDigits/M10_006.pm
-cp CheckDigits/M11_013.pm blib/lib/Algorithm/CheckDigits/M11_013.pm
-cp CheckDigits/M07_001.pm blib/lib/Algorithm/CheckDigits/M07_001.pm
-cp CheckDigits/MXX_006.pm blib/lib/Algorithm/CheckDigits/MXX_006.pm
-cp CheckDigits/M10_008.pm blib/lib/Algorithm/CheckDigits/M10_008.pm
-cp CheckDigits/M11_017.pm blib/lib/Algorithm/CheckDigits/M11_017.pm
-cp CheckDigits/M10_003.pm blib/lib/Algorithm/CheckDigits/M10_003.pm
-cp CheckDigits/M11_016.pm blib/lib/Algorithm/CheckDigits/M11_016.pm
-cp CheckDigits/M11_003.pm blib/lib/Algorithm/CheckDigits/M11_003.pm
-cp CheckDigits/MXX_002.pm blib/lib/Algorithm/CheckDigits/MXX_002.pm
-cp CheckDigits/M10_001.pm blib/lib/Algorithm/CheckDigits/M10_001.pm
-cp CheckDigits/M10_004.pm blib/lib/Algorithm/CheckDigits/M10_004.pm
-cp CheckDigits/MXX_004.pm blib/lib/Algorithm/CheckDigits/MXX_004.pm
-cp CheckDigits/MBase_003.pm blib/lib/Algorithm/CheckDigits/MBase_003.pm
-cp CheckDigits/M43_001.pm blib/lib/Algorithm/CheckDigits/M43_001.pm
-cp CheckDigits/M10_005.pm blib/lib/Algorithm/CheckDigits/M10_005.pm
-cp CheckDigits/MXX_005.pm blib/lib/Algorithm/CheckDigits/MXX_005.pm
-cp CheckDigits/M11_006.pm blib/lib/Algorithm/CheckDigits/M11_006.pm
-cp CheckDigits/M11_004.pm blib/lib/Algorithm/CheckDigits/M11_004.pm
-cp CheckDigits/M11_012.pm blib/lib/Algorithm/CheckDigits/M11_012.pm
-cp CheckDigits/M09_001.pm blib/lib/Algorithm/CheckDigits/M09_001.pm
-cp CheckDigits/MXX_003.pm blib/lib/Algorithm/CheckDigits/MXX_003.pm
-cp CheckDigits/M11_008.pm blib/lib/Algorithm/CheckDigits/M11_008.pm
-cp CheckDigits/M89_001.pm blib/lib/Algorithm/CheckDigits/M89_001.pm
-cp CheckDigits/MBase_002.pm blib/lib/Algorithm/CheckDigits/MBase_002.pm
-cp CheckDigits/M11_011.pm blib/lib/Algorithm/CheckDigits/M11_011.pm
-cp CheckDigits/MBase_001.pm blib/lib/Algorithm/CheckDigits/MBase_001.pm
-cp CheckDigits/M10_009.pm blib/lib/Algorithm/CheckDigits/M10_009.pm
-cp CheckDigits/M11_002.pm blib/lib/Algorithm/CheckDigits/M11_002.pm
-cp CheckDigits.pm blib/lib/Algorithm/CheckDigits.pm
-cp CheckDigits/MXX_001.pm blib/lib/Algorithm/CheckDigits/MXX_001.pm
-cp CheckDigits/M10_011.pm blib/lib/Algorithm/CheckDigits/M10_011.pm
-cp CheckDigits/M11_007.pm blib/lib/Algorithm/CheckDigits/M11_007.pm
-cp CheckDigits/M11_015.pm blib/lib/Algorithm/CheckDigits/M11_015.pm
-cp CheckDigits/M23_002.pm blib/lib/Algorithm/CheckDigits/M23_002.pm
-cp CheckDigits/M10_002.pm blib/lib/Algorithm/CheckDigits/M10_002.pm
-cp CheckDigits/M11_009.pm blib/lib/Algorithm/CheckDigits/M11_009.pm
-cp CheckDigits/M10_010.pm blib/lib/Algorithm/CheckDigits/M10_010.pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_010.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M97_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M23_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M97_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M16_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_013.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M07_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_008.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_017.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_016.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M43_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_005.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_005.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_006.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_004.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_012.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M09_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_003.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_008.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M89_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_011.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MBase_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_009.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_011.3pm
-Manifying blib/man3/Algorithm::CheckDigits::MXX_001.3pm
-Manifying blib/man3/Algorithm::CheckDigits.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_007.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_015.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M11_009.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M23_002.3pm
-Manifying blib/man3/Algorithm::CheckDigits::M10_010.3pm
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
-t/checkdigits.....ok
-t/ecno............ok
-t/iban............ok
-t/imei............ok
-t/isbn13..........ok
-t/pod-coverage....skipped
-        all skipped: Test::Pod::Coverage 1.00 required for testing POD coverage
-t/pod.............skipped
-        all skipped: Test::Pod 1.00 required for testing POD
-t/upc.............ok
-t/valid...........ok
-All tests successful, 2 tests skipped.
-Files=9, Tests=448,  2 wallclock secs ( 0.35 cusr +  0.80 csys =  1.15 CPU)
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make test -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-Prepending /root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/blib/arch /root/.cpan/build/Algorithm-CheckDigits-0.50-mL1o1L/blib/lib to PERL5LIB for 'install'
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_011.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_005.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_009.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M43_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_010.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_004.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_010.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M23_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M09_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_013.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_008.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M07_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M23_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MBase_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_016.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_017.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M97_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_007.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_008.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_015.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M16_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_003.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_011.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_005.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M89_001.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M10_009.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/MXX_006.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M97_002.pm
-Installing /usr/lib/perl5/site_perl/5.10.0/Algorithm/CheckDigits/M11_012.pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_016.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_009.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_004.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_015.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_011.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M09_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_013.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_010.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MBase_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_017.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M97_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_005.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M23_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_008.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_009.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_006.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M23_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M43_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M07_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_003.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M16_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_011.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_005.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_008.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_007.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_010.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M89_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_012.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M11_001.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M10_004.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::M97_002.3pm
-Installing /usr/share/man/man3/Algorithm::CheckDigits::MXX_004.3pm
-Writing /usr/lib/perl5/site_perl/5.10.0/i586-linux-thread-multi/auto/Algorithm/CheckDigits/.packlist
-Appending installation info to /usr/lib/perl5/5.10.0/i586-linux-thread-multi/perllocal.pod
-  MAMAWE/Algorithm-CheckDigits-0.50.tar.gz
-  /usr/bin/make install  -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-|--------------------
-
-
-=== Install Biblio::EndnoteStyle ===
-|--------------------
-cpan[2]> install Biblio::EndnoteStyle
-|--------------------
-
-
-
-
-=== Install the "CGI::Session::Serialize::yaml" Perl Module ===
-
-[Install CGI::Session::Serialize::yaml "instead" of CGI::Session to avoid problems related to JSON::Syck when installing CGI::Session. Don't worry: by installing CGI::Session::Serialize::yaml you are also installing CGI::Session]:
-|--------------------
-cpan[3]> install CGI::Session::Serialize::yaml
-
-[...]
-CGI-Session-Serialize-yaml-4.24/README
-CGI-Session-Serialize-yaml-4.24/Build.PL
-CGI-Session-Serialize-yaml-4.24/Makefile.PL
-CPAN: File::Temp loaded ok (v0.18)
-CPAN: Module::Build loaded ok (v0.280801)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build R/RS/RSAVAGE/CGI-Session-Serialize-yaml-4.24.tgz
-
-Checking whether your kit is complete...
-Looks good
-
-Checking prerequisites...
- - ERROR: Test::Pod is not installed
- - ERROR: CGI::Session is not installed
- - ERROR: CGI::Session::ErrorHandler is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'CGI-Session-Serialize-yaml' version '4.24'
-Could not read '/root/.cpan/build/CGI-Session-Serialize-yaml-4.24-YmsZPx/META.yml'. Falling back to other methods to determine prerequisites
-----   Unsatisfied dependencies detected during  ----
----- RSAVAGE/CGI-Session-Serialize-yaml-4.24.tgz ----
-    CGI::Session [requires]
-    CGI::Session::ErrorHandler [requires]
-    Test::Pod [build_requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-Checking prerequisites...
- - ERROR: Test::Pod is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'CGI-Session' version '4.38'
-Could not read '/root/.cpan/build/CGI-Session-4.38-RYliaM/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     MARKSTOS/CGI-Session-4.38.tar.gz     ----
-    Test::Pod [build_requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-All tests successful, 1 test skipped.
-Files=11, Tests=19,  2 wallclock secs ( 0.83 cusr +  1.08 csys =  1.91 CPU)
-  PETDANCE/Test-Pod-1.26.tar.gz
-  /usr/bin/make test -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-P/PE/PETDANCE/Test-Pod-1.26.tar.gz is just needed temporarily during building or testing. Do you want to install it permanently? (Y/n) [yes]
-
-cpan[4]> quit
-Lockfile removed.
-|--------------------
-
-
-=== Install some "Class" Perl Modules ===
-To install the Class::Accessor Perl Module we'll use the available software package in openSUSE 11.0 (using yast) instead of downloading it from CPAN:
-|--------------------
-myhost:~/Koha-3.00.00 # yast -i perl-Class-Accessor
-|--------------------
-
-[this will also install a dependency: perl-Carp-Assert]
-
-|--------------------
-myhost:~/Koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Class::Factory::Util
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install DBD::MySQL ===
-|--------------------
-myhost:~/koha-3.00.00 # yast -i perl-DBD-mysql
-|--------------------
-[this will also install a dependency: perl-Data-Showtable]
-
-=== Install some "Data" Perl Modules ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-CPAN: File::HomeDir loaded ok (v0.69)
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Data::ICal
-
-CPAN: File::Temp loaded ok (v0.18)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build J/JE/JESSE/Data-ICal-0.13.tar.gz
-
-*** Module::AutoInstall version 1.03
-*** Checking for Perl dependencies...
-[Core Features]
-- Test::More          ...loaded. (0.72)
-- Test::Warn          ...missing.
-- Test::NoWarnings    ...missing.
-- Test::LongString    ...missing.
-- Class::Accessor     ...loaded. (0.31)
-- Text::vFile::asData ...missing.
-- MIME::QuotedPrint   ...loaded. (3.07)
-- Class::ReturnValue  ...missing.
-==> Auto-install the 5 mandatory module(s) from CPAN? [y]
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-*** Module::AutoInstall configuration finished.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Class::ReturnValue 0 not found.
-Warning: prerequisite Test::LongString 0 not found.
-Warning: prerequisite Test::NoWarnings 0 not found.
-Warning: prerequisite Test::Warn 0 not found.
-Warning: prerequisite Text::vFile::asData 0 not found.
-Writing Makefile for Data::ICal
-Could not read '/root/.cpan/build/Data-ICal-0.13-X1jsxc/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        JESSE/Data-ICal-0.13.tar.gz       ----
-    Test::LongString [requires]
-    Class::ReturnValue [requires]
-    Test::NoWarnings [requires]
-    Text::vFile::asData [requires]
-    Test::Warn [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
----- Unsatisfied dependencies detected during ----
-----    JESSE/Class-ReturnValue-0.55.tar.gz   ----
-    Devel::StackTrace [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite Test::Tester 0.103 not found.
-Writing Makefile for Test::NoWarnings
-Could not read '/root/.cpan/build/Test-NoWarnings-0.084-DMJBk3/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----    FDALY/Test-NoWarnings-0.084.tar.gz    ----
-    Test::Tester [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-Running install for module 'Text::vFile::asData'
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
----- Unsatisfied dependencies detected during ----
-----   RCLAMP/Text-vFile-asData-0.05.tar.gz   ----
-    Class::Accessor::Chained [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Warning: prerequisite Array::Compare 0 not found.
-Warning: prerequisite Sub::Uplevel 0.12 not found.
-Warning: prerequisite Test::Exception 0 not found.
-Warning: prerequisite Tree::DAG_Node 0 not found.
-Writing Makefile for Test::Warn
-Could not read '/root/.cpan/build/Test-Warn-0.10-9ekdi2/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----       CHORNY/Test-Warn-0.10.tar.gz       ----
-    Test::Exception [requires]
-    Sub::Uplevel [requires]
-    Array::Compare [requires]
-    Tree::DAG_Node [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
----- Unsatisfied dependencies detected during ----
-----      ADIE/Test-Exception-0.27.tar.gz     ----
-    Sub::Uplevel [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install some "Date" Perl Modules ===
-|--------------------
-myhost:~/koha-3.00.00 # yast -i perl-Date-Calc
-|--------------------
-[This will also install 2 other dependencies: perl-Carp-Clan and perl-Bit-Vector]
-
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Date::ICal
-
-
-Warning: prerequisite Date::Leapyear 1.03 not found.
-Writing Makefile for Date::ICal
----- Unsatisfied dependencies detected during ----
-----        RBOW/Date-ICal-1.72.tar.gz        ----
-    Date::Leapyear [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[2]> quit
-Lockfile removed.
-
-myhost:~/koha-3.00.00 # yast -i perl-DateManip
-|--------------------
-
-
-=== Install the "Email::Date" Perl Module ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Email::Date
-
-
-Warning: prerequisite Email::Abstract 2.10 not found.
-Warning: prerequisite Email::Date::Format 1.000 not found.
-Writing Makefile for Email::Date
-Could not read '/root/.cpan/build/Email-Date-1.103-LsgMdE/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----       RJBS/Email-Date-1.103.tar.gz       ----
-    Email::Abstract [requires]
-    Email::Date::Format [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite Email::Simple 1.91 not found.
-Writing Makefile for Email::Abstract
-Could not read '/root/.cpan/build/Email-Abstract-2.134-zLB1QI/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     RJBS/Email-Abstract-2.134.tar.gz     ----
-    Email::Simple [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "GD" Perl Module ===
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-[many lines scroll by...] 
-
-**UNRECOVERABLE ERROR**
-Could not find gdlib-config in the search path. Please install libgd 2.0.28 or higher.
-If you want to try to compile anyway, please rerun this script with the option --ignore_missing_gd.
-Warning: No success on command[/usr/bin/perl Makefile.PL]
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  LDS/GD-2.41.tar.gz
-  /usr/bin/perl Makefile.PL -- NOT OK
-Running make test
-  Make had some problems, won't test
-Running make install
-  Make had some problems, won't install
-Could not read '/root/.cpan/build/GD-2.41-4ZLPXP/META.yml'. Falling back to other methods to determine prerequisites
-Failed during this command:
- LDS/GD-2.41.tar.gz                           : writemakefile NO '/usr/bin/perl Makefile.PL' returned status 512
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-OK. It seems that we need to install the GD software packages. Let's do that:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i gd
-
-myhost:~/koha-3.00.00 # yast -i gd-devel
-|--------------------
-
-And now let's try again to install the "GD" Perl Module
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-[many lines scroll by...]
-
-/usr/lib/gcc/i586-suse-linux/4.3/../../../../i586-suse-linux/bin/ld: cannot find -lXpm
-collect2: ld returned 1 exit status
-make: *** [blib/arch/auto/GD/GD.so] Error 1
-  LDS/GD-2.41.tar.gz
-  /usr/bin/make -- NOT OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-  Can't test without successful make
-Running make install
-  Make had returned bad status, install seems impossible
-Failed during this command:
- LDS/GD-2.41.tar.gz                           : make NO
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-OK. We got another error, mentioning "-lXpm". Apparently, this is related to libXpm (the "X.Org Xpm Library"). Let's install the "xorg-x11-libXpm-devel" software package:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i xorg-x11-libXpm-devel
-|--------------------
-
-[This will also install 9 other xorg-x11-....-devel software packages: xorg-x11-proto-devel, xorg-x11-xtrans-devel, xorg-x11-libXdmcp-devel ...]
-
-If you'd try now to install again the "GD" perl module, you'd get another error, now concerning "ljpeg" (and in other attempt to "lfontconfig"... and yet in another to "lpng12"). So, let's first install the "libjpeg-devel", "fontconfig-devel" and "libpng-devel" software packages:
-
-|--------------------
-myhost:~/koha-3.00.00 # yast -i libjpeg-devel
-
-myhost:~/koha-3.00.00 # yast -i fontconfig-devel
-
-myhost:~/koha-3.00.00 # yast -i libpng-devel
-|--------------------
-
-[Installing fontconfig-devel will also install some other dependencies: zlib-devel, libexpat-devel and freetype2-devel]
-
-And now, finally, we can install the "GD" Perl Module:
-|--------------------
-myhost:~/koha-3.00.00 # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "GD::Barcode::UPCE" Perl Module ===
-|--------------------
-myhost:~/Koha # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install GD::Barcode::UPCE
-|--------------------
-
-=== Install the "HTML::Template::Pro" Perl Module ===
-
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install HTML::Template::Pro
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-
-
-
-
-=== Install the "Lingua::Stem" Perl Module ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Lingua::Stem
-
-
-Checking prerequisites...
- - ERROR: Lingua::PT::Stemmer is not installed
- - ERROR: Lingua::Stem::It is not installed
- - ERROR: Lingua::Stem::Snowball::No is not installed
- - ERROR: Text::German is not installed
- - ERROR: Lingua::Stem::Snowball::Se is not installed
- - ERROR: Lingua::Stem::Fr is not installed
- - ERROR: Lingua::GL::Stemmer is not installed
- - ERROR: Lingua::Stem::Snowball::Da is not installed
- - ERROR: Lingua::Stem::Ru is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'Lingua-Stem' version '0.83'
-Could not read '/root/.cpan/build/Lingua-Stem-0.83-cmPLcK/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----     SNOWHARE/Lingua-Stem-0.83.tar.gz     ----
-    Lingua::PT::Stemmer [requires]
-    Lingua::Stem::It [requires]
-    Lingua::Stem::Snowball::No [requires]
-    Text::German [requires]
-    Lingua::Stem::Snowball::Se [requires]
-    Lingua::Stem::Fr [requires]
-    Lingua::GL::Stemmer [requires]
-    Lingua::Stem::Snowball::Da [requires]
-    Lingua::Stem::Ru [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-|--------------------
-
-
-=== Install the "HTML::Scrubber" Perl Module ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install HTML::Scrubber
-
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "List::MoreUtils" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-List-MoreUtils
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-
-
-=== Install some "MARC" Perl Modules ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install MARC::Charset
-MARC::Charset is up to date (1.0).
-
-cpan[2]> install MARC::Crosswalk::DublinCore
-
-
-Checking prerequisites...
- - ERROR: DublinCore::Record is not installed
- - ERROR: MARC::Record is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'MARC-Crosswalk-DublinCore' version '0.02'
-Could not read '/root/.cpan/build/MARC-Crosswalk-DublinCore-0.02-xrMlqr/META.yml'. Falling back to other methods to determine 
-
-prerequisites
-----   Unsatisfied dependencies detected during   ----
----- BRICAS/MARC-Crosswalk-DublinCore-0.02.tar.gz ----
-    DublinCore::Record [requires]
-    MARC::Record [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[3]> install MARC::File::XML
-
-
-cpan[4]> install MARC::Record
-MARC::Record is up to date (2.0.0).
-
-
-cpan[3]> quit
-Lockfile removed.
-|--------------------
-
-
-=== Install the "MIME::Lite" Perl Module === 
-|--------------------
-myhost:~/Koha-3.00.00 # yast -i perl-MIME-Lite
-|--------------------
-
-=== Install the "Mail::Sendmail" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-Mail-Sendmail
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-
-=== Install some "Net" Perl Modules ===
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Net::LDAP
-
-
-*** Module::AutoInstall version 1.03
-*** Checking for Perl dependencies...
-[Core Features]
-- Convert::ASN1    ...missing. (would need 0.07)
-==> Auto-install the 1 mandatory module(s) from CPAN? [y]
-[SASL authentication]
-- Authen::SASL     ...missing. (would need 2.00)
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[LDAP URLs]
-- URI::ldap        ...loaded. (1.11 >= 1.1)
-[LDAPS]
-- IO::Socket::SSL  ...missing. (would need 0.81)
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[Read/Write DSML files]
-- MIME::Base64     ...loaded. (3.07_01)
-- XML::SAX::Writer ...missing.
-==> Auto-install the 1 optional module(s) from CPAN? [n]
-[Read/Write LDIF files]
-- MIME::Base64     ...loaded. (3.07_01)
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-*** Module::AutoInstall configuration finished.
-
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Convert::ASN1 0.07 not found.
-Writing Makefile for Net::LDAP
-Could not read '/root/.cpan/build/perl-ldap-0.36-gUbl59/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        GBARR/perl-ldap-0.36.tar.gz       ----
-    Convert::ASN1 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[16]> install Net::LDAP::Filter
-Net::LDAP::Filter is up to date (0.15).
-
-
-cpan[7]> install Net::Z3950::ZOOM
-Running install for module 'Net::Z3950::ZOOM'
-'YAML' not installed, falling back to Data::Dumper and Storable to read prefs '/root/.cpan/prefs'
-Running make for M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-Fetching with LWP:
-  ftp://ftp.isr.ist.utl.pt/pub/CPAN/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-Checksum for /root/.cpan/sources/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz ok
-Net-Z3950-ZOOM-1.21/
-Net-Z3950-ZOOM-1.21/samples/
-Net-Z3950-ZOOM-1.21/samples/zoom/
-Net-Z3950-ZOOM-1.21/samples/zoom/trivial-async.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zdump.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/async.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomscan.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zhello.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zselect
-Net-Z3950-ZOOM-1.21/samples/zoom/update.pl
-Net-Z3950-ZOOM-1.21/samples/zoom/zoomtst3.pl
-Net-Z3950-ZOOM-1.21/samples/README
-Net-Z3950-ZOOM-1.21/samples/net-z3950/
-Net-Z3950-ZOOM-1.21/samples/net-z3950/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/records/
-Net-Z3950-ZOOM-1.21/samples/records/esdd0006.grs
-Net-Z3950-ZOOM-1.21/samples/ccl/
-Net-Z3950-ZOOM-1.21/samples/ccl/default.bib
-Net-Z3950-ZOOM-1.21/samples/cql/
-Net-Z3950-ZOOM-1.21/samples/cql/pqf.properties
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/async.pl
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/zoomtst1.pl
-Net-Z3950-ZOOM-1.21/samples/net-z3950-zoom/zoomtst3.pl
-Net-Z3950-ZOOM-1.21/README
-Net-Z3950-ZOOM-1.21/Changes
-Net-Z3950-ZOOM-1.21/META.yml
-Net-Z3950-ZOOM-1.21/MANIFEST
-Net-Z3950-ZOOM-1.21/ZOOM.xs
-Net-Z3950-ZOOM-1.21/MANIFEST.SKIP
-Net-Z3950-ZOOM-1.21/Makefile.PL
-Net-Z3950-ZOOM-1.21/t/
-Net-Z3950-ZOOM-1.21/t/29-events.t
-Net-Z3950-ZOOM-1.21/t/11-option-callback.t
-Net-Z3950-ZOOM-1.21/t/15-scan.t
-Net-Z3950-ZOOM-1.21/t/16-packages.t
-Net-Z3950-ZOOM-1.21/t/13-resultset.t
-Net-Z3950-ZOOM-1.21/t/24-sorting.t
-Net-Z3950-ZOOM-1.21/t/17-logging.t
-Net-Z3950-ZOOM-1.21/t/20-options.t
-Net-Z3950-ZOOM-1.21/t/12-query.t
-Net-Z3950-ZOOM-1.21/t/10-options.t
-Net-Z3950-ZOOM-1.21/t/1-Net-Z3950-ZOOM.t
-Net-Z3950-ZOOM-1.21/t/22-query.t
-Net-Z3950-ZOOM-1.21/t/27-logging.t
-Net-Z3950-ZOOM-1.21/t/25-scan.t
-Net-Z3950-ZOOM-1.21/t/19-events.t
-Net-Z3950-ZOOM-1.21/t/14-sorting.t
-Net-Z3950-ZOOM-1.21/t/28-charset.t
-Net-Z3950-ZOOM-1.21/t/23-resultset.t
-Net-Z3950-ZOOM-1.21/t/26-packages.t
-Net-Z3950-ZOOM-1.21/t/18-charset.t
-Net-Z3950-ZOOM-1.21/t/2-ZOOM.t
-Net-Z3950-ZOOM-1.21/t/21-option-callback.t
-Net-Z3950-ZOOM-1.21/typemap
-Net-Z3950-ZOOM-1.21/lib/
-Net-Z3950-ZOOM-1.21/lib/ZOOM.pm
-Net-Z3950-ZOOM-1.21/lib/ZOOM.pod
-Net-Z3950-ZOOM-1.21/lib/Net/
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950/
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950/ZOOM.pm
-Net-Z3950-ZOOM-1.21/lib/Net/Z3950.pm
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build M/MI/MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-
-ERROR: Unable to call script: yaz-config
-If you are using a YAZ installation from the Debian package "yaz", you
-will also need to install "libyaz-dev" in order to build this module.
-Warning: No success on command[/usr/bin/perl Makefile.PL]
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  MIRK/Net-Z3950-ZOOM-1.21.tar.gz
-  /usr/bin/perl Makefile.PL -- NOT OK
-Running make test
-  Make had some problems, won't test
-Running make install
-  Make had some problems, won't install
-Could not read '/root/.cpan/build/Net-Z3950-ZOOM-1.21-gHBrEl/META.yml'. Falling back to other methods to determine 
-
-prerequisites
-Failed during this command:
- MIRK/Net-Z3950-ZOOM-1.21.tar.gz              : writemakefile NO '/usr/bin/perl Makefile.PL' returned status 512
-|--------------------
-
-== Installing libyaz, libyaz-devel and yaz for Net::Z3950::ZOOM ==
-
-OK... So we ran through a problem with a missing "yaz-config" while installing Net::Z3950::ZOOM. To solve this, let's first install the libyaz package:
-
-  * Install the libyaz package:
-|--------------------
-# yast -i libyaz
-|--------------------
-[This will also install 1 dependency: libxslt]
-
-We also have to install another package:libyaz-devel. libyaz-devel is NOT available in the openSUSE 11 DVD but it is available in the Official openSUSE 11 OSS Repository. If you have skipped that step, add that repository in yast first.
-
-  * Install the libyaz-devel package:
-|--------------------
-# yast -i libyaz-devel
-|--------------------
-(If the above command does not work, you probably did not set up the "Official openSUSE 11.0 OSS Repository". See the "Configure Software Repositories" section earlier in this document that explains how you set up it inside yast).
-
-Installing libyaz-devel will also add some other packages that libyaz-devel depends on, namely: 
-zlib-devel, tcpd-devel, tack, libgpg-error-devel, ncurses-devel, libopenssl-devel, libgcrypt-devel, readline-devel, libxml2-devel and libxslt-devel.
-
-  * Install the yaz package:
-|--------------------
-# yast -i yaz
-|--------------------
-
-(//15-Jul-2008: Thanks to Bob Ewart for catching this missing step of installing yaz//)
-
-
-Let's now install the Net::Z3950::ZOOM Perl Module:
-
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Net::Z3950::ZOOM
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-
-
-
-=== Install some "PDF" Perl Modules ===
-
-|--------------------
-myhost:~ # yast -i perl-PDF-API2
-
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install PDF::API2::Page
-PDF::API2::Page is up to date (2.001).
-
-cpan[2]> install PDF::API2::Util
-PDF::API2::Util is up to date (2.000).
-
-
-cpan[3]> install PDF::Reuse
-
-Warning: prerequisite Font::TTF 0 not found.
-Warning: prerequisite Text::PDF::TTFont0 0 not found.
-Writing Makefile for PDF::Reuse
-Could not read '/root/.cpan/build/PDF-Reuse-0.35-rBhjys/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----      LARSLUND/PDF-Reuse-0.35.tar.gz      ----
-    Text::PDF::TTFont0 [requires]
-    Font::TTF [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-cpan[4]> install PDF::Reuse::Barcode
-
-Warning: prerequisite Barcode::Code128 0 not found.
-Writing Makefile for PDF::Reuse::Barcode
----- Unsatisfied dependencies detected during ----
-----  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz  ----
-    Barcode::Code128 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-Barcode-Code128-2.01/lib/Barcode/
-Barcode-Code128-2.01/lib/Barcode/Code128.pm
-Barcode-Code128-2.01/META.yml
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-
-  CPAN.pm: Going to build W/WR/WRW/Barcode-Code128-2.01.tar.gz
-
-Checking if your kit is complete...
-Looks good
-Writing Makefile for Barcode::Code128
-Could not read '/root/.cpan/build/Barcode-Code128-2.01-1g3s6u/META.yml'. Falling back to other methods to determine prerequisites
-cp lib/Barcode/Code128.pm blib/lib/Barcode/Code128.pm
-Manifying blib/man3/Barcode::Code128.3pm
-  WRW/Barcode-Code128-2.01.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
-t/barcode....ok
-t/gif........ok 1/0skipped
-        all skipped: no reason given
-t/png........FAILED test 2
-        Failed 1/2 tests, 50.00% okay
-Failed Test Stat Wstat Total Fail  List of Failed
--------------------------------------------------------------------------------
-t/png.t                    2    1  2
-1 test skipped.
-Failed 1/3 test scripts. 0/4 subtests failed.
-Files=3, Tests=4,  1 wallclock secs ( 0.17 cusr +  0.27 csys =  0.44 CPU)
-Failed 1/3 test programs. 0/4 subtests failed.
-make: *** [test_dynamic] Error 255
-  WRW/Barcode-Code128-2.01.tar.gz
-  /usr/bin/make test -- NOT OK
-//hint// to see the cpan-testers results for installing this module, try:
-  reports WRW/Barcode-Code128-2.01.tar.gz
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make install
-  make test had returned bad status, won't install without force
-Running make for L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  Has already been unwrapped into directory /root/.cpan/build/PDF-Reuse-Barcode-0.05-xyOb8t
-
-  CPAN.pm: Going to build L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-
-Warning: Prerequisite 'Barcode::Code128 => 0' for 'L/LA/LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz' failed when processing 'W/WR/WRW/Barcode-Code128-2.01.tar.gz' with 'make_test => NO'. Continuing, but chances to succeed are limited.
-cp Barcode.pm blib/lib/PDF/Reuse/Barcode.pm
-Manifying blib/man3/PDF::Reuse::Barcode.3pm
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  /usr/bin/make -- OK
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-Running make test
-PERL_DL_NONLAZY=1 /usr/bin/perl "-Iblib/lib" "-Iblib/arch" test.pl
-1..15
-# Running under perl version 5.010000 for linux
-# Current time local: Mon Dec  1 23:33:14 2008
-# Current time GMT:   Mon Dec  1 23:33:14 2008
-# Using Test.pm version 1.25
-ok 1
-ok 2
-ok 3
-ok 4
-ok 5
-ok 6
-ok 7
-ok 8
-ok 9
-ok 10
-ok 11
-ok 12
-ok 13
-Can't find Barcode::Code128 - can't produce those barcodes
-not ok 14
-# Failed test 14 in test.pl at line 18
-#  test.pl line 18 is: ok(find('Barcode::Code128'));
-ok 15
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-Tests succeeded but one dependency not OK (Barcode::Code128)
-Warning (usually harmless): 'YAML' not installed, will not store persistent state
-  LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz
-  [dependencies] -- NA
-Running make install
-  make test had returned bad status, won't install without force
-Failed during this command:
- WRW/Barcode-Code128-2.01.tar.gz              : make_test NO
- LARSLUND/PDF-Reuse-Barcode-0.05.tar.gz       : make_test NO one dependency not OK (Barcode::Code128)
-
-|--------------------
-
-
-**01-Dec-2008**: Oh well... So, it seems that the installation of PDF::Reuse::Barcode failed due to a Perl Module dependency - "Barcode::Code128" - that, in turn, fails to install when doing some PNG related tests. According to Galen Charlton (from LibLime) - http://lists.katipo.co.nz/public/koha/2007-December/012843.html - "There seem to be various problems with Barcode::Code128 on various platforms, particularly with its test suite. The barcode generation functionality is used in only a couple places in Koha, so for quick-and-dirty testing, doing a force install of that module should be OK."
-
-On a related note, this "Barcode::Code128" installation bug is being tracked at:
-
-#28369: test result negative maybe due to library skew 
- http://rt.cpan.org/Public/Bug/Display.html?id=28369
-
-OK. So, let's do then a "force install" of the Barcode::Code128 Perl Module in the same CPAN prompt:
-
-|--------------------
-cpan[5]> force install "Barcode::Code128"
-|--------------------
-
-And still in the same CPAN prompt, let's now try again to install "PDF::Reuse::Barcode":
-|--------------------
-cpan[6]> install PDF::Reuse::Barcode
-|--------------------
-
-=== Install the "POE" Perl Module ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[5]> install POE
-
-
-Some of POE's tests require a functional network.
-You can skip these tests if you'd like.
-
-Would you like to skip the network tests? [n]
-
-*** Some optional features may not be available:
-***   Curses 1.08 could not be loaded.
-***   Event 1 could not be loaded.
-***   Gtk 0.7009 could not be loaded.
-***   IO::Pty 1.02 could not be loaded.
-***   Socket6 0.14 could not be loaded.
-***   Tk 800.027 could not be loaded.
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite POE::Test::Loops 1.002 not found.
-Writing Makefile for POE
-Could not read '/root/.cpan/build/POE-1.003-0euNum/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----         RCAPUTO/POE-1.003.tar.gz         ----
-    POE::Test::Loops [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-|--------------------
-
-
-=== Install the "SMS::Send" Perl Module ===
-
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[6]> install SMS::Send
-
-Checking if your kit is complete...
-Looks good
-Warning: prerequisite Class::Adapter 1.00 not found.
-Warning: prerequisite Params::Util 0.14 not found.
-Writing Makefile for SMS::Send
-Could not read '/root/.cpan/build/SMS-Send-0.05-xGdd7H/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        ADAMK/SMS-Send-0.05.tar.gz        ----
-    Params::Util [requires]
-    Class::Adapter [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-cpan[7]> quit
-Lockfile removed.
-
-|--------------------
-
-=== Install the "Schedule::At" Perl Module ===
-
-  * Install "at":
-|--------------------
-# yast -i at
-|--------------------
-  * Install the Schedule::At Perl module:
-|--------------------
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-cpan[1]> install Schedule::At
-|--------------------
-
-=== Install some "Text" Perl Modules ===
-In the same CPAN prompt, type the following command:
-|--------------------
-cpan[2]> install Text::CSV
-
-
-cpan[3]> install Text::CSV_XS
-
-
-cpan[4]> install Text::Iconv
-
-cpan[5]> quit
-Lockfile removed.
-|--------------------
-
-
-
-=== Install some "XML" Perl Modules ===
-|--------------------
-myhost:~ # yast -i perl-XML-Dumper
-
-myhost:~ # yast -i perl-XML-LibXSLT
-
-
-myhost:~ # cpan
-
-cpan shell -- CPAN exploration and modules installation (v1.9205)
-ReadLine support enabled
-
-
-cpan[1]> install XML::RSS
-
-Warning: prerequisite DateTime 0 not found.
-Warning: prerequisite DateTime::Format::Mail 0 not found.
-Warning: prerequisite DateTime::Format::W3CDTF 0 not found.
-Warning: prerequisite Test::Manifest 0.9 not found.
-Writing Makefile for XML::RSS
-Could not read '/root/.cpan/build/XML-RSS-1.32-7BXl7q/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----        SHLOMIF/XML-RSS-1.32.tar.gz       ----
-    DateTime [requires]
-    DateTime::Format::W3CDTF [requires]
-    Test::Manifest [requires]
-    DateTime::Format::Mail [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-Warning: prerequisite DateTime::Locale 0.4 not found.
-Warning: prerequisite DateTime::TimeZone 0.59 not found.
-Warning: prerequisite Params::Validate 0.76 not found.
-Writing Makefile for DateTime
-Could not read '/root/.cpan/build/DateTime-0.4302-YXqzkk/META.yml'. Falling back to other methods to determine prerequisites
----- Unsatisfied dependencies detected during ----
-----      DROLSKY/DateTime-0.4302.tar.gz      ----
-    DateTime::Locale [requires]
-    DateTime::TimeZone [requires]
-    Params::Validate [requires]
-    Time::y2038 [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Checking prerequisites...
- - ERROR: Params::Validate is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'DateTime-Locale' version '0.4001'
-Could not read '/root/.cpan/build/DateTime-Locale-0.4001-ThLGMW/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----   DROLSKY/DateTime-Locale-0.4001.tar.gz  ----
-    Params::Validate [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-
-Checking prerequisites...
- - ERROR: Class::Singleton is not installed
-
-ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the versions
-of the modules indicated above before proceeding with this installation
-
-Creating new 'Build' script for 'DateTime-TimeZone' version '0.77'
-Could not read '/root/.cpan/build/DateTime-TimeZone-0.77-MPrKnn/META.yml'. Falling back to other methods to determine 
-
-prerequisites
----- Unsatisfied dependencies detected during ----
-----   DROLSKY/DateTime-TimeZone-0.77.tar.gz  ----
-    Class::Singleton [requires]
-Shall I follow them and prepend them to the queue
-of modules we are processing right now? [yes]
-
-[...]
-
-B/BD/BDFOY/Test-Manifest-1.22.tar.gz is just needed temporarily during building or testing. Do you want to install it permanently? (Y/n) [yes]
-
-cpan[2]> quit
-Lockfile removed.
-|--------------------
-
-=== Install the "YAML::Syck" Perl Module ===
-|--------------------
-myhost:~ # yast -i perl-YAML-Syck
-|--------------------
-
-
-==== Create the Koha User and Group ====
-
-|--------------------
-# useradd koha
-
-# passwd koha
-Changing password for koha.
-New Password:
-Reenter New Password:
-Password changed.
-
-# groupadd koha
-|--------------------
-
-
-
-==== Run make test ====
-|--------------------
-myhost:~/Koha # make test
-cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png
-cp opac/opac-changelanguage.pl blib/OPAC_CGI_DIR/opac/opac-changelanguage.pl
-cp koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/liblime-kids/card.gif 
-
-blib/INTRANET_TMPL_DIR/prog/img/itemtypeimg/liblime-kids/card.gif
-cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif
-|--------------------
-[many more lines beginning with "cp" should appear...]
-
-|--------------------
-t/Amazon....................ok
-t/Barcodes_PrinterConfig....ok
-t/Bookfund..................ok
-t/Bookseller................ok
-t/Boolean...................ok
-t/Branch....................ok
-t/Calendar..................ok
-t/Charset...................ok
-t/Debug.....................# BEFORE use:     $debug is not defined
-# BEFORE use: $cgi_debug is not defined
-t/Debug.....................ok 1/3#  AFTER use:     $debug is 0
-#  AFTER use: $cgi_debug is 0
-# Done.
-t/Debug.....................ok
-t/dummy.....................ok
-t/Input.....................ok
-t/Koha......................ok
-t/Languages.................ok
-t/Maintainance..............ok
-t/Output....................ok
-t/Record....................ok
-t/Review....................ok
-t/Scrubber..................ok 1/10# Note: scrubber test output will have whitespace collapsed for readability
-# done.
-t/Scrubber..................ok
-t/Stats.....................ok
-All tests successful.
-Files=19, Tests=47, 21 wallclock secs ( 4.82 cusr +  5.55 csys = 10.37 CPU)
-|--------------------
-
-
-=== Run "make install" ===
-
-Now, we will run make install:
-
-|--------------------
-myhost:~/Koha # make install
-|--------------------
-[Several lines starting with "Manifying" and many lines starting with "Installing" will scroll by...]
-|--------------------
-Installing /usr/share/koha/man/man3/reports::catalogue_out.3pm
-Installing /usr/share/koha/man/man3/reports::dictionary.3pm
-Installing /usr/share/koha/man/man3/C4::Search::PazPar2.3pm
-Installing /usr/share/koha/man/man3/C4::Scrubber.3pm
-Installing /usr/share/koha/man/man3/reports::itemslost.3pm
-Installing /usr/share/koha/man/man3/C4::Barcodes::PrinterConfig.3pm
-
-Koha's files have now been installed.
-
-In order to use Koha's command-line batch jobs,
-you should set the following environment variables:
-
-export KOHA_CONF=/etc/koha/koha-conf.xml
-export PERL5LIB=/usr/share/koha/lib
-
-For other post-installation tasks, please consult the README.
-
-# cd /etc
-myhost:/etc #
-|--------------------
-
-==== Create /etc/bash.bashrc.local ====
-Create a file called bash.bashrc.local in the /etc directory:
-|--------------------
-myhost:/etc # vim /etc/bash.bashrc.local
-|--------------------
-add these 2 lines in the file:
-|--------------------
-export KOHA_CONF=/etc/koha/koha-conf.xml
-export PERL5LIB=/usr/share/koha/lib
-|--------------------
-
-- EXIT THE SHELL AND LOG BACK IN.
-|--------------------
-myhost:/etc # exit
-|--------------------
-After logging back in, type the following commands to check if 
-the KOHA_CONF and PERL5LIB environment variables have been correctly set:
-|--------------------
-myhost:~ # env | grep KOHA
-KOHA_CONF=/etc/koha/koha-conf.xml
-
-myhost:~ # env | grep PERL5LIB
-PERL5LIB=/usr/share/koha/lib
-|--------------------
-
-=== Koha's Web Installer ===
-
-Access Koha's web installer at:
-
-http://192.168.0.2:8080/
-
-Your browser will probably say that:
-|--------------------
-" The server at 192.168.0.2 is taking too long to respond."
-|--------------------
-OK... It seems that we have to do some things yet.
-
-
-== Create a symbolic link to /etc/koha/koha-httpd.conf ==
-
-Let's create a symbolic link to the /etc/koha/koha-httpd.conf file in the /etc/apache2/vhosts.d directory:
-|--------------------
-myhost:~ # cd /etc/apache2/vhosts.d/
-
-myhost:/etc/apache2/vhosts.d # ln -s /etc/koha/koha-httpd.conf koha-httpd.conf
-|--------------------
-
-  * Restart Apache
-|--------------------
-myhost:/etc/apache2/conf.d # service apache2 restart
-Syntax error on line 28 of /etc/apache2/conf.d/koha-httpd.conf:
-Invalid command 'RewriteEngine', perhaps misspelled or defined by a module not included in the server configuration
-|--------------------
-
-
-
-== Enable the mod_rewrite and mod_deflate Apache modules ==
-
-OK... It seems that we need to enable the mod_rewrite and the mod_deflate Apache module:
-|--------------------
-myhost:/etc/sysconfig # a2enmod rewrite deflate
-|--------------------
-[If the above command seems NOT to work, for some reason, do this - edit /etc/sysconfig/apache2 and add the words "rewrite" -and "deflate"- (without the quotes) at the end of the APACHE_MODULES line, right before the right quote]
-|--------------------
-myhost:/etc/sysconfig # service apache2 restart
-Syntax OK
-Shutting down httpd2 (waiting for all children to terminate)         done
-Starting httpd2 (prefork)                                            done
-|--------------------
-
-
-== Change koha-httpd.conf ==
-
-If you browsed again to http://192.168.0.2:8080 you would still get no answer. This is because we still have to do some changes to the koha-httpd.conf file.
-
-First, let's create a backup of this file:
-|--------------------
-myhost:/etc/apache2/vhosts.d # cp koha-httpd.conf koha-httpd.conf.ORIG
-
-
-myhost:/etc/koha # vim koha-httpd.conf
-|--------------------
-
-At the beginning of the koha-httpd.conf file, under the commented NameVirtualHost line, add the following line:
-|--------------------
-Listen 8080
-|--------------------
-In that file, you should find two VirtualHost sections: one for the OPAC area of Koha and the other one for the Intranet. 
-If the two virtualHost directives - the lines that start with <nowiki><VirtualHost</nowiki> - in that file are set for the IP Address 127.0.0.2, replace them by the correct IP address of your server.
-
-That file will have 2 ServerName directives (one for each of the 2 VirtualHosts). In those directives, you should have the IP of your server -or- the FQDN of your server (example: ServerName www.koha.test).
-
-Now, restart again Apache:
-|--------------------
-myhost:/etc/koha # service apache2 restart
-Syntax OK
-Shutting down httpd2 (waiting for all children to terminate)         done
-Starting httpd2 (prefork)                                            done
-|--------------------
-
-
-Try to access the web page:
-
-http://192.168.0.2/
-
-If you get again the "It Works!" web page, you'll probably have to Refresh/Reload the page in your browser (press the F5 key).
-
-After reloading the page, you should get the following error:
-|--------------------
-Forbidden
-
-You don't have permission to access / on this server.
-
-Additionally, a 403 Forbidden error was encountered while trying to use an ErrorDocument to handle the request.
-Apache/2.2.4 (Linux/SUSE) Server at 192.168.0.2 Port 8080
-|--------------------
-
-OK. Let's add then the following directive at the end of the koha-httpd.conf file:
-|--------------------
-<Directory /usr/share/koha>
-        Order allow,deny
-        Allow from all
-</Directory>
-|--------------------
-
-Restart Apache:
-|--------------------
-myhost:/etc/apache2/vhosts.d # service apache2 restart
-Syntax OK
-Shutting down httpd2 (waiting for all children to terminate)         done
-Starting httpd2 (prefork)                                            done
-|--------------------
-
-OK. Load again the following page in your web browser:
-
-http://192.168.0.2
-
-After some seconds you should be redirected to:
-
-http://192.168.0.2/cgi-bin/koha/maintenance.pl
-
-
-and see a Koha page saying:
-|--------------------
-"System Maintenance ... we'll be back soon! If you have any questions, please contact the Site Administrator"
-|--------------------
-
-This is actually GOOD NEWS!  :)  It's now time to set up Koha in the Intranet interface.
-
-
-To do that, browse to:
-
-
-http://192.168.0.2:8080
-
-
-== Enable port 8080 in the firewall ==
-
-After a while the page will probably time out. This is because we now have to allow the 8080 port in the firewall.
-
-Let's run yast and do that:
-|--------------------
-myhost:/etc/apache2/vhosts.d # yast
-|--------------------
-Inside yast, go to "Security and Users" -> "Firewall"
-
-Scroll down to "Allowed Services" on the left side and press ENTER
-
-Press TAB several times until you reach the "Apache2" allowed service on the right side. When you do that, 
-press Alt+d to click the "Advanced..." button.
-
-A new window should open. Press Alt+T to go to the "TCP Ports" text box and enter the following values in that box:
-80 8080
-
-Press Alt+O to click the OK button. That will send you back to the "Firewall Configuration:Allowed Services" 
-screen. Press Alt+N to click the "Next" button. 
-
-You should now be in the "Firewall Configuration: Summary" screen. Press "Alt+F" to Finish.
-
-You should now be again in the "YaST Control Center" screen. Press "Alt+Q" to quit yast.
-
-
-Go again to:
-
-http://192.168.0.2:8080/
-
-... you should get redirected to:
-
-http://192.168.0.2:8080/cgi-bin/koha/installer/install.pl
-
-... and see a page with the Koha Logo and the heading: "Welcome to the Koha Web Installer"!  :)
-
-
-You may now login with your koha administrator username and password and reply to the several questions you will be asked.
-
diff --git a/INSTALL.ubuntu b/INSTALL.ubuntu
deleted file mode 100644
index 033cf31..0000000
--- a/INSTALL.ubuntu
+++ /dev/null
@@ -1,439 +0,0 @@
-=============================
-Installation Guide for Installing Koha on Ubuntu Jaunty (9.04) with MySQL 5
-=============================
-
-Copyright (C) 2007, 2008 LibLime (http://liblime.com)
-Some parts copyright 2010 Chris Nighswonger
-
-Original author: Joshua Ferraro
-Modified for Ubuntu by: Chris Nighswonger (cnighswonger AT foundations DOT edu)
-
-Feedback/bug reports: Koha Developer's List:
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-
-This document last modified: 19 May 2010
-
-Installation Instructions
-=============================
-
-All commands can be performed as a system user with sudo privileges,
-as indicated or by running the command directly as root.
-
-1. Prepare System and Install Dependencies
-
-1.1 Install Ubuntu Jaunty via CD
-
-See http://www.ubuntu.com/getubuntu/download
-
-1.2 Set up your locale
-
-Your locale should be set to UTF-8, as should Apache2 and MySQL 5.
-This step is VERY IMPORTANT for a UNICODE compliant system. Please
-read over the following document carefully:
-
-http://wiki.koha-community.org/wiki/Encoding_and_Character_Sets_in_Koha
-
-You can verify your system locale by typing the following command:
-
-    $ locale
-
-IMPORTANT:  You _MUST_ follow all the steps outlined there for
-            Apache2, MySQL 5, etc. BEFORE you install Koha.
-
-1.3 Install the Yaz and Zebra packages
-
-Run the following command to update your system:
-
-    $ sudo apt-get update
-    $ sudo apt-get install yaz idzebra-2.0 idzebra-2.0-doc
-
-1.4 Get Koha
-
-1.4.1 Option A: Download Koha via Git (optional)
-
-    $ sudo apt-get install git-core git-email
-    $ git clone git://git.koha-community.org/koha.git kohaclone
-    $ cd kohaclone
-    $ git checkout -b myinstall origin
-
-Note: for more information about Git, please see the Koha Git Usage Guide:
-
-    http://wiki.koha-community.org/wiki/Version_Control_Using_Git
-
-1.4.2 Option B: Download Koha from http://download.koha-community.org
-
-    $ wget http://download.koha-community.org/koha-3.00.02.tar.gz
-    ( Note: use the latest stable version)
-
-1.5 Install additional Ubuntu dependencies
-
-IMPORTANT:  You should only use CPAN for Perl dependencies which are NOT
-            available from the package maintainer. You have been warned!
-
-Using the ubuntu.packages file included in the Koha source tree,
-run the following:
-
-    $ sudo dpkg --set-selections < install_misc/ubuntu.packages
-
-Now start dselect (you may need to 'sudo apt-get install dselect'):
-
-    $ sudo dselect
-
-Choose [I]nstall and accept packages to be installed (hit return)
-
-(may take a while)
-
-Choose [C]onfigure, [R]emove and [Q]uit until dselect has completed.
-
-1.6 Install Perl dependencies that aren't packaged into Ubuntu Jaunty
-sources
-
-Run the following command:
-
-    $ sudo cpan MARC::Crosswalk::DublinCore GD GD::Barcode::UPCE Email::Date \
-                HTML::Scrubber Algorithm::CheckDigits::M43_001 Biblio::EndnoteStyle \
-                Locale::Currency::Format
-
-Note: you may need to run CPAN initialization if you've not run cpan
-before:
-
-    /etc/perl/CPAN/Config.pm initialized.
-
-    CPAN is the world-wide archive of perl resources. It consists of about
-    100 sites that all replicate the same contents all around the globe.
-    Many countries have at least one CPAN site already. The resources
-    found on CPAN are easily accessible with the CPAN.pm module. If you
-    want to use CPAN.pm, you have to configure it properly.
-
-    If you do not want to enter a dialog now, you can answer 'no' to this
-    question and I'll try to autoconfigure. (Note: you can revisit this
-    dialog anytime later by typing 'o conf init' at the cpan prompt.)
-
-    Are you ready for manual configuration? [yes]
-
-When the configuration is completed CPAN will install the Perl modules.
-
-2. Configuration of dependencies
-
-2.1 Update root MySQL password (if dselect didn't do it for you already)
-
-    $ sudo mysqladmin password <password>
-
-2.2 Create the Koha database
-
-    Create the database and user with associated privileges:
-
-    $ mysqladmin -uroot -p<password> create <kohadatabasename>
-    $ mysql -uroot -p<password>
-
-    Welcome to the MySQL monitor.  Commands end with ; or \g.
-    Your MySQL connection id is 22
-    Server version: 5.0.32-Debian_7etch3-log Debian etch distribution
-
-    Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-    mysql> grant all on <kohadatabasename>.* to '<kohadatabaseuser>'@'localhost' identified by '<kohadatabaseuserpassword>';
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> flush privileges;
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> quit
-
-2.3 Test your SAX Parser and correct where necessary
-
-    You must be sure you're using the XML::LibXML SAX parser, not Expat or PurePerl, both of which have outstanding bugs with pre-composed characters. You can test your SAX parser by running:
-
-    $ cd koha
-    $ misc/sax_parser_print.pl
-
-    You should see something like::
-
-    XML::LibXML::SAX::Parser=HASH(0x81fe220)
-
-    If you're using PurePerl or Expat, you'll need to edit your
-    ini file, typically located at:
-
-    /etc/perl/XML/SAX/ParserDetails.ini
-
-    You will need to move the entire section for '[XML::LibXML::SAX::Parser]' to the bottom of the ini file.
-
-2.4 Install DBD::mysql Perl module
-
-In order to handle UTF-8 correctly, Koha requires at least version 4.004
-of the DBD::mysql Perl module. However, Debian Etch has a stable package
-only for version 3.0008, so it is necessary to install the module  from CPAN.
-DBD::mysql's test suite needs to use a MySQL 'test' DB which doesn't exist
-anymore. So there are two options to install DBD::mysql:
-
-  (1) install without test suite,
-  (2) install with test suite requiring a test MySQL DB creation.
-
-2.4.1 Install without test suite
-
-Force install DBD::mysql:
-
-    $ sudo cpan
-    cpan> force install DBD::mysql
-
-2.4.2 Create test database in order to install DBD::mysql
-
-Because of DBD::mysql's test suite, it is necessary to temporarily create a
-test database and user:
-
-    $ mysql -uroot -p<password>
-
-    Create the database and user with associated privileges:
-
-    Welcome to the MySQL monitor.  Commands end with ; or \g.
-    Your MySQL connection id is 22
-    Server version: 5.0.32-Debian_7etch3-log Debian etch distribution
-
-    Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-    mysql> create database test;
-    Query OK, 1 row affected (0.00 sec)
-
-    mysql> grant all on test.* to 'test'@'localhost' identified by 'test';
-    Query OK, 0 rows affected (0.00 sec)
-    (test database, user, and password can be different if need be)
-
-    mysql> flush privileges;
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> quit
-
-Next install DBD::mysql:
-
-    $ sudo cpan
-
-    cpan> o conf makepl_arg
-    (get current value of this CPAN parameter)
-
-    cpan> o conf makepl_arg "--testdb=test --testuser=test --testpass=test"
-
-    cpan> install DBD::mysql
-
-    cpan> o conf makepl_arg ''
-
-    OR
-
-    cpan> o conf makepl_arg '<old setting>'
-
-    (restore this setting so as to not interfere with future CPAN installs).
-
-
-Finally, remove the test database:
-
-    $ mysql -uroot -p<password>
-
-    mysql> drop database test;
-    Query OK, 1 row affected (0.00 sec)
-
-    mysql> exit
-    Bye
-
-3. Run the Koha installer
-
-    $ perl Makefile.PL
-    ( answer questions )
-    $ make
-    $ make test
-    $ sudo make install
-
-4. Configure and start Apache
-    $ sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
-    (note that the path to koha-httpd.conf may be different depending on your
-    installation choices)
-
-Add the following lines to /etc/apache2/ports.conf:
-
-    Listen 80
-    Listen 8080
-
-If not running named virtual hosts (The default koha installation does not use named virtual hosts.), comment out the following line:
-
-    NameVirtualHost *:80
-
-Run the following commands:
-
-    $ sudo a2enmod rewrite deflate
-    $ sudo a2ensite koha
-    $ sudo apache2ctl restart
-
-Note: you may still see the usual Apache default site if your VirtualHost
-configuration isn't correct.  The command "sudo a2dissite default" may be a
-quick fix, but may have side-effects.  See the Apache HTTPD manual section on
-virtual hosts for full instructions.
-
-5. Configure and start Zebra
-
-Note: it's recommended that you daemonize the Zebra process and add it to your
-startup profile. For a non-production test/development installation, running
-Zebra from the command line can be useful. Pick from the two available options
-below, or roll your own :-)
-
-Note: it's also recommended that you create a Koha system user, which you will
-have specified during the install process. Alternatively, Zebra can be
-configured to run as the root user.
-
-To add a user do:
-
-    $ sudo adduser koha
-
-Option 1: run the Zebra processes from the command line:
-
-1.1 Zebra Search Server
-
-This process send responses to search requests sent by Koha or
-Z39.50/SRU/SRW clients.
-
-    $ sudo -u ${KOHA_USER} zebrasrv -f /etc/koha/koha-conf.xml
-    (note that the path to koha-conf.xml may be different depending on your
-    installation choices)
-
-Note: the user you run Zebra as will be the only user with write permission
-      on the Zebra index; in development mode, you may wish to use your
-      system user.
-
-1.2 Zebra Indexer
-
-Added/updated/deleted records in Koha MySQL database must be indexed
-into Zebra. A specific script must be launched each time a bibliographic
-or an authority record is edited.
-
-    $ sudo -u ${KOHA_USER} misc/migration_tools/rebuild_zebra -z -b -a
-    NOTE: This script should be run as the kohauser (the default is 'koha').
-
-Option 2: run the Zebra process as a daemon, and add to startup process:
-
-Note that references to $SCRIPT_DIR refer to the directory where
-Koha's command-line scripts are installed, e.g., /usr/share/koha/bin.
-
-1.1 Zebra Search Server
-
-    $ sudo ln -s ${SCRIPT_DIR}/koha-zebra-ctl.sh  /etc/init.d/koha-zebra-daemon
-    (Note: ${SCRIPT_DIR} is /usr/share/koha/bin/ by default in a standard install)
-    $ sudo update-rc.d koha-zebra-daemon defaults
-    ( Note: see man chkconfig(8) on other distros )
-
-    $ sudo ${SCRIPT_DIR}/koha-zebra-ctl.sh start
-
-1.2 Zebra Indexer
-
-Add an entry in Koha user crontab to scheduled added/updated/deleted records
-indexing by Zebra with this command:
-
-  <path/to/koha>/misc/migration_tools/rebuild_zebra -z -b -a
-
-See check misc/cronjobs/crontab.example for usage examples.
-NOTE: This job should be setup under the kohauser (the default is 'koha').
-
-6. Run the Web Installer, populate the database, initial configuration of settings
-
-    Point your browser to http://<servername>:8080/
-
-    It should redirect you to the Web Installer where you can continue the setup.
-    You can install the sample data for libraries, patrons, etc. via the Web Installer
-
-7. What next?
-
-    Once the installer has completed, you can import and index MARC records from the
-    command line thusly (Note: you can also use the 'Stage MARC records for import' from
-    the Tools area of Koha's Staff Client to import a batch of MARC records):
-
-    $ export KOHA_CONF=/usr/share/koha/etc/koha-conf.xml
-      (note: use the correct path to your koha-conf.xml)
-
-7.1 Import:
-    Bibliographic data in MARC21 format
-    $ misc/migration_tools/bulkmarcimport.pl -file /path/to/marc.iso2709
-    Authority data in MARC21 format
-    $ misc/migration_tools/bulkauthimport.pl -file /path/to/auth.iso2709
-
-7.2 Fast Index:
-    $ misc/migration_tools/rebuild_zebra.pl -b -w
-
-    Once the indexing has completed, you will be able to search for records in your system.
-    NOTE: This script should be run as the kohauser (the default is 'koha').
-
-7.3 Schedule regular index updates
-
-    You need to run rebuild_zebra.pl -b -a -z as a regular cron job in orde to pick up new bibs
-    and items as you add them. Check misc/cronjobs/crontab.example for usage examples. See 7.0 above.
-    NOTE: This job should be setup under the kohauser (the default is 'koha').
-
-7.4 To enable public Z39.50/SRU servers, you'll need to edit your koha-conf.xml and
-    change the <listen> options to listen on a TCP port; then restart the zebra daemon.
-
-UPGRADE
-=======
-If you are upgrading from a previous installation of Koha 3.x, you can
-use the following:
-
- ./koha_perl_deps.pl -u -m # to identify new Perl dependencies
-
-Install any missing modules
-IMPORTANT: Koha 3.4.x uses Template::Toolkit, this must be installed
-before the webinstaller can run
-
- sudo apt-get install libtemplate-perl
-
- perl Makefile.PL --prev-install-log /path/to/koha-install-log
- make
- make test
- sudo make upgrade
-
-Koha 3.4.x no longer stores items in biblio records so as part of the
-upgrade you will need to do the following two steps, they can take a
-long time (several hours) to complete for large databases
-
- misc/maintenance/remove_items_from_biblioitems.pl --run
- misc/migration_tools/rebuild_zebra.pl -b -r
-
-Uninstall Instructions
-=============================
-1) Stop Services:
-   $ sudo a2dissite koha
-   $ sudo rm /etc/apache2/sites-available/koha
-   $ sudo apache2ctl restart
-
-   $ sudo update-rc.d koha-zebra-daemon remove
-   $ sudo rm /etc/init.d/koha-zebra-daemon
-
-2) Remove Database and Indexes
-
-   # MySQL
-   $ mysql -u<kohauser> -p<kohapassword>
-   > drop database koha;
-
-   # Zebra Indexes
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-authorities.cfg -g iso2709 -d authorities init
-
-3) Remove Koha Install Directories and Configuration Files
-   Don't forget about any crontab entries
-
-Tested on the following operating environments
-==============================================
-- Ubuntu Jaunty Jackalope 9.04
-
-Installer Bug reports
-=====================
-Please log any installer bug reports at http://bugs.koha-community.org
-
-Other Notes
-=====================
-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.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/INSTALL.ubuntu.lucid b/INSTALL.ubuntu.lucid
deleted file mode 100644
index 861f1ab..0000000
--- a/INSTALL.ubuntu.lucid
+++ /dev/null
@@ -1,368 +0,0 @@
-=============================
-Installation Guide for Installing Koha on Ubuntu Lucid Lynx (10.04 LTS) with MySQL 5
-=============================
-
-Copyright (C) 2007, 2008 LibLime (http://liblime.com)
-Some parts copyright 2010 Chris Nighswonger
-
-Original author: Joshua Ferraro
-Modified for Ubuntu by: Chris Nighswonger (cnighswonger AT foundations DOT edu)
-
-Feedback/bug reports: Koha Developer's List:
-http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-
-This document last modified: 11 Sep 2010
-
-Installation Instructions
-=============================
-
-All commands can be performed as a system user with sudo privileges,
-as indicated or by running the command directly as root.
-
-1. Prepare System and Install Dependencies
-
-1.1 Install Ubuntu Lucid Lynx via CD
-
-See http://www.ubuntu.com/getubuntu/download
-
-1.2 Set up your locale
-
-Your locale should be set to UTF-8, as should Apache2 and MySQL 5.
-This step is VERY IMPORTANT for a UNICODE compliant system. Please
-read over the following document carefully:
-
-http://wiki.koha-community.org/wiki/Encoding_and_Character_Sets_in_Koha
-
-You can verify your system locale by typing the following command:
-
-    $ locale
-
-IMPORTANT:  You _MUST_ follow all the steps outlined there for
-            Apache2, MySQL 5, etc. BEFORE you install Koha.
-
-1.3 Get Koha
-
-1.3.1 Option A: Download Koha via Git (optional)
-
-    $ sudo apt-get install git-core git-email
-    $ git clone git://git.koha-community.org/koha.git kohaclone
-    $ cd kohaclone
-    $ git checkout -b myinstall origin
-
-Note: for more information about Git, please see the Koha Git Usage Guide:
-
-    http://wiki.koha-community.org/wiki/Version_Control_Using_Git
-
-1.3.2 Option B: Download Koha from http://download.koha-community.org
-
-    $ wget http://download.koha-community.org/koha-3.02.00.tar.gz
-    ( Note: use the latest stable version)
-
-1.4 Install additional Ubuntu dependencies
-
-IMPORTANT:  You should only use CPAN for Perl dependencies which are NOT
-            available from the package maintainer. You have been warned!
-
-Using the ubuntu.packages file included in the Koha source tree,
-run the following:
-
-    $ sudo dpkg --set-selections < install_misc/ubuntu.packages
-
-Now start dselect (you may need to 'sudo apt-get install dselect'):
-
-    $ sudo dselect
-
-Choose [I]nstall and accept packages to be installed (hit return)
-
-(may take a while)
-
-Choose [C]onfigure, [R]emove and [Q]uit until dselect has completed.
-
-Note: If you are installing on an older version of Ubuntu, not all of the
-      packages listed in ubuntu.packages may be available as packages.  You
-      will want to verify which ones are installed and which ones not.
-      This can be done by running the following command:
-
-    $ install_misc/ubuntu-pkg-check.sh | grep none
-
-When tracking down any "(none)" results, note that sometimes Ubuntu does the
-right thing and installs a later, differently named version of the package in
-place.  To see if this is happening, it is useful to run a command like:
-
-    $ dpkg --get-selections | grep [base_package_name]
-
-1.5 Install Perl dependencies that aren't packaged into Ubuntu Lucid Lynx
-sources
-
-Run the following command:
-
-    $ sudo cpan HTTP::OAI Locale::Currency::Format Memoize::Memcached \
-                PDF::API2::Simple Storable Text::CSV::Encoded
-
-Note: you may need to run CPAN initialization if you've not run cpan
-before:
-
-    /etc/perl/CPAN/Config.pm initialized.
-
-    CPAN is the world-wide archive of perl resources. It consists of about
-    100 sites that all replicate the same contents all around the globe.
-    Many countries have at least one CPAN site already. The resources
-    found on CPAN are easily accessible with the CPAN.pm module. If you
-    want to use CPAN.pm, you have to configure it properly.
-
-    If you do not want to enter a dialog now, you can answer 'no' to this
-    question and I'll try to autoconfigure. (Note: you can revisit this
-    dialog anytime later by typing 'o conf init' at the cpan prompt.)
-
-    Are you ready for manual configuration? [yes]
-
-When the configuration is completed CPAN will install the Perl modules.
-
-2. Configuration of dependencies
-
-2.1 Update root MySQL password (if dselect didn't do it for you already)
-
-    $ sudo mysqladmin password <password>
-
-2.2 Create the Koha database
-
-    Create the database and user with associated privileges:
-
-    $ mysqladmin -uroot -p<password> create <kohadatabasename>
-    $ mysql -uroot -p<password>
-
-    Welcome to the MySQL monitor.  Commands end with ; or \g.
-    Your MySQL connection id is 22
-    Server version: 5.0.32-Debian_7etch3-log Debian etch distribution
-
-    Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
-    mysql> grant all on <kohadatabasename>.* to '<kohadatabaseuser>'@'localhost' identified by '<kohadatabaseuserpassword>';
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> flush privileges;
-    Query OK, 0 rows affected (0.00 sec)
-
-    mysql> quit
-
-2.3 Test your SAX Parser and correct where necessary
-
-    You must be sure you're using the XML::LibXML SAX parser, not Expat or
-    PurePerl, both of which have outstanding bugs with pre-composed
-    characters. You can test your SAX parser by running:
-
-    $ cd koha
-    $ misc/sax_parser_print.pl
-
-    You should see something like::
-
-    XML::LibXML::SAX::Parser=HASH(0x81fe220)
-
-    If you're using PurePerl or Expat, you'll need to edit your
-    ini file, typically located at:
-
-    /etc/perl/XML/SAX/ParserDetails.ini
-
-    You will need to move the entire section for '[XML::LibXML::SAX::Parser]'
-    to the bottom of the ini file.
-
-3. Run the Koha installer
-
-    $ perl Makefile.PL
-    ( answer questions )
-    $ make
-    $ make test
-    $ sudo make install
-
-4. Configure and start Apache
-    $ sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
-    (note that the path to koha-httpd.conf may be different depending on your
-    installation choices)
-
-Add the following lines to /etc/apache2/ports.conf:
-
-    Listen 80
-    Listen 8080
-
-If not running named virtual hosts (The default koha installation does not use
-named virtual hosts.), comment out the following line:
-
-    NameVirtualHost *:80
-
-Run the following commands:
-
-    $ sudo a2enmod rewrite deflate
-    $ sudo a2ensite koha
-    $ sudo apache2ctl restart
-
-Note: you may still see the usual Apache default site if your VirtualHost
-configuration isn't correct.  The command "sudo a2dissite default" may be a
-quick fix, but may have side-effects.  See the Apache HTTPD manual section on
-virtual hosts for full instructions.
-
-5. Configure and start Zebra
-
-Note: it's recommended that you daemonize the Zebra process and add it to your
-startup profile. For a non-production test/development installation, running
-Zebra from the command line can be useful. Pick from the two available options
-below, or roll your own :-)
-
-Note: it's also recommended that you create a Koha system user, which you will
-have specified during the install process. Alternatively, Zebra can be
-configured to run as the root user.
-
-To add a user do:
-
-    $ sudo adduser koha
-
-Option 1: run the Zebra processes from the command line:
-
-1.1 Zebra Search Server
-
-This process send responses to search requests sent by Koha or
-Z39.50/SRU/SRW clients.
-
-    $ sudo -u ${KOHA_USER} zebrasrv -f /etc/koha/koha-conf.xml
-    (note that the path to koha-conf.xml may be different depending on your
-    installation choices)
-
-Note: the user you run Zebra as will be the only user with write permission
-      on the Zebra index; in development mode, you may wish to use your
-      system user.
-
-1.2 Zebra Indexer
-
-Added/updated/deleted records in Koha MySQL database must be indexed
-into Zebra. A specific script must be launched each time a bibliographic
-or an authority record is edited.
-
-    $ sudo -u ${KOHA_USER} misc/migration_tools/rebuild_zebra -z -b -a
-    NOTE: This script should be run as the kohauser (the default is 'koha').
-
-Option 2: run the Zebra process as a daemon, and add to startup process:
-
-Note that references to $SCRIPT_DIR refer to the directory where
-Koha's command-line scripts are installed, e.g., /usr/share/koha/bin.
-
-1.1 Zebra Search Server
-
-    $ sudo ln -s ${SCRIPT_DIR}/koha-zebra-ctl.sh  /etc/init.d/koha-zebra-daemon
-    (Note: ${SCRIPT_DIR} is /usr/share/koha/bin/ by default in a standard install)
-    $ sudo update-rc.d koha-zebra-daemon defaults
-    ( Note: see man chkconfig(8) on other distros )
-
-    $ sudo ${SCRIPT_DIR}/koha-zebra-ctl.sh start
-
-1.2 Zebra Indexer
-
-Add an entry in Koha user crontab to scheduled added/updated/deleted records
-indexing by Zebra with this command:
-
-  <path/to/koha>/misc/migration_tools/rebuild_zebra -z -b -a
-
-See check misc/cronjobs/crontab.example for usage examples.
-NOTE: This job should be setup under the kohauser (the default is 'koha').
-
-6. Run the Web Installer, populate the database, initial configuration of settings
-
-    Point your browser to http://<servername>:8080/
-
-    It should redirect you to the Web Installer where you can continue the setup.
-    You can install the sample data for libraries, patrons, etc. via the Web Installer
-
-7. What next?
-
-    Once the installer has completed, you can import and index MARC records from the
-    command line thusly (Note: you can also use the 'Stage MARC records for import' from
-    the Tools area of Koha's Staff Client to import a batch of MARC records):
-
-    $ export KOHA_CONF=/usr/share/koha/etc/koha-conf.xml
-      (note: use the correct path to your koha-conf.xml)
-
-7.1 Import:
-    Bibliographic data in MARC21 format
-    $ misc/migration_tools/bulkmarcimport.pl -file /path/to/marc.iso2709
-    Authority data in MARC21 format
-    $ misc/migration_tools/bulkauthimport.pl -file /path/to/auth.iso2709
-
-7.2 Fast Index:
-    $ misc/migration_tools/rebuild_zebra.pl -b -w
-
-    Once the indexing has completed, you will be able to search for records in your system.
-    NOTE: This script should be run as the kohauser (the default is 'koha').
-
-7.3 Schedule regular index updates
-
-    You need to run rebuild_zebra.pl -b -a -z as a regular cron job in orde to pick up new bibs
-    and items as you add them. Check misc/cronjobs/crontab.example for usage examples. See 7.0 above.
-    NOTE: This job should be setup under the kohauser (the default is 'koha').
-
-7.4 To enable public Z39.50/SRU servers, you'll need to edit your koha-conf.xml and
-    change the <listen> options to listen on a TCP port; then restart the zebra daemon.
-
-UPGRADE
-=======
-If you are upgrading from a previous installation of Koha 3.x, you can
-use the following:
-
- ./koha_perl_deps.pl -u -m # to identify new Perl dependencies
-
-Install any missing modules
-IMPORTANT: Koha 3.4.x uses Template::Toolkit, this must be installed
-before the webinstaller can run
-
- sudo apt-get install libtemplate-perl
-
-Koha 3.4.x no longer stores items in biblio records so as part of the
-upgrade you will need to do the following two steps, they can take a
-long time (several hours) to complete for large databases
-
- misc/maintenance/remove_items_from_biblioitems.pl --run
- misc/migration_tools/rebuild_zebra.pl -b -r
-
-Uninstall Instructions
-=============================
-1) Stop Services:
-   $ sudo a2dissite koha
-   $ sudo rm /etc/apache2/sites-available/koha
-   $ sudo apache2ctl restart
-
-   $ sudo update-rc.d koha-zebra-daemon remove
-   $ sudo rm /etc/init.d/koha-zebra-daemon
-
-2) Remove Database and Indexes
-
-   # MySQL
-   $ mysql -u<kohauser> -p<kohapassword>
-   > drop database koha;
-
-   # Zebra Indexes
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init
-   $ zebraidx -c <prefix>/etc/zebradb/zebra-authorities.cfg -g iso2709 -d authorities init
-
-3) Remove Koha Install Directories and Configuration Files
-   Don't forget about any crontab entries
-
-Tested on the following operating environments
-==============================================
-- Ubuntu Jaunty Jackalope 9.04
-
-Installer Bug reports
-=====================
-Please log any installer bug reports at http://bugs.koha-community.org
-
-Other Notes
-=====================
-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.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d511905..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644
index acfb338..0000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,12 +0,0 @@
-Makefile$
-release_notes_2
-release_notes_1
-\bCVS/
-~$
-\.patch$
-\.orig$
-\.old$
-\.bak$
-[ 	]
-\.git/
-MANIFEST.bak
diff --git a/Makefile.PL b/Makefile.PL
deleted file mode 100644
index 664f50f..0000000
--- a/Makefile.PL
+++ /dev/null
@@ -1,1583 +0,0 @@
-# Copyright 2007 MJ Ray
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Current maintainer MJR http://mjr.towers.org.uk/
-#
-
-use strict;
-use warnings;
-use ExtUtils::MakeMaker;
-use POSIX;
-use File::Spec;
-use Getopt::Long;
-use FindBin; # we need to enforce which C4::Installer::PerlModule is used in case more than one is installed
-
-use lib $FindBin::Bin;
-
-use C4::Installer;
-
-my $koha_pm = C4::Installer::PerlModules->new;
-
-my $DEBUG = 0;
-die "perl 5.8.8 or later required" unless ($] >= 5.008008);
-
-# Hash up directory structure & files beginning with the directory we were called from (should be the base of koha)...
-
-my $dirtree = hashdir('.');
-my %result = ();
-
-=head1 NAME
-
-Makefile.PL - Koha packager and installer
-
-=head1 SYNOPSIS
-
-=head2 BASIC INSTALLATION
-
-    perl Makefile.PL
-    make
-    make test
-    sudo make install
-
-=head2 UPGRADE INSTALLATION
-
-    NOTE: This option is only available if koha-install-log exists.
-
-    perl Makefile.PL --prev-install-log /path/to/koha-install-log
-
-    make
-    make test
-    sudo make upgrade
-
-=head2 PACKAGING RELEASE TARBALLS
-
-    make manifest tardist
-    make manifest zipdist
-
-=head2 CLEANING UP
-
-	make clean
-
-=head1 DESCRIPTION
-
-This is a packager and installer that uses
-ExtUtils::MakeMaker, which is fairly common
-on perl systems.
-As well as building tar or zip files
-and installing with the above commands,
-it allows us to check pre-requisites
-and generate configuration files.
-
-=head1 VARIABLES
-
-=head2 NAME, VERSION_FROM, ABSTRACT, AUTHOR
-
-Basic metadata about this software.
-
-=head2 NO_META
-
-Suppress generation of META.yml file.
-
-=head2 PREREQ_PM
-
-Hash of perl modules and versions required.
-
-=head2 PM
-
-Hash of file mappings
-
-=head2 PL_FILES
-
-This is a hash of PL scripts to run after installation and
-the files to ask them to generate.
-Maybe use the values from CONFIGURE
-to generate initial configuration files in future.
-
-=cut
-
-=head2 target_map
-
-This is a hash mapping directories and files in the
-source tree to installation target directories.  The rules
-for this mapping are:
-
-=over 4
-
-=item If a directory or file is specified, it and its
-contents will be copied to the installation target directory.
-
-=item If a subdirectory of a mapped directory is specified,
-its target overrides the parent's target for that subdirectory.
-
-=item The value of each map entry may either be a scalar containing
-one target or a reference to a hash containing 'target' and 'trimdir'
-keys.
-
-=item Any files at the top level of the source tree that are
-not included in the map will not be installed.
-
-=item Any directories at the top level of the source tree
-that are not included in the map will be installed in
-INTRANET_CGI_DIR.  This is a sensible default given the
-current organization of the source tree, but (FIXME) it
-would be better to reorganize the source tree to better
-match the installation system, to allow adding new directories
-without having to adjust Makefile.PL each time.  The idea
-is to make the C<$target_map> hash as minimal as possible.
-
-=back
-
-The permitted installation targets are:
-
-=over 4
-
-=item INTRANET_CGI_DIR
-
-CGI scripts for intranet (staff) interface.
-
-=item INTRANET_TMPL_DIR
-
-HTML templates for the intranet interface.
-
-=item INTRANET_WWW_DIR
-
-HTML files, images, etc. for DocumentRoot for the intranet interface.
-
-=item OPAC_CGI_DIR
-
-CGI scripts for OPAC (public) interface.
-
-=item OPAC_TMPL_DIR
-
-HTML templates for the OPAC interface.
-
-=item OPAC_WWW_DIR
-
-HTML files, images, etc. for DocumentRoot for the OPAC interface.
-
-=item PERL_MODULE_DIR
-
-Perl modules (at present just the C4 modules) that are intimately
-tied to Koha.  Depending on the installation options, these
-may or may not be installed one of the standard directories
-in Perl's default @LIB.
-
-=item KOHA_CONF_DIR
-
-Directory for Koha configuration files.
-
-=item ZEBRA_CONF_DIR
-
-Directory for Zebra configuration files.
-
-=item ZEBRA_LOCK_DIR
-
-Directory for Zebra's lock files.
-
-=item ZEBRA_DATA_DIR
-
-Directory for Zebra's data files.
-
-=item ZEBRA_RUN_DIR
-
-Directory for Zebra's UNIX-domain sockets.
-
-=item MISC_DIR
-
-Directory for for miscellaenous scripts, among other
-things the translation toolkit and RSS feed tools.
-
-=item SCRIPT_DIR
-
-Directory for command-line scripts and daemons to
-be set up all for installation modes.
-
-=item SCRIPT_NONDEV_DIR
-
-Directory for command-line scripts that should
-be installed in the same directory as the
-SCRIPT_DIR target except 'dev' installs.
-
-=item MAN_DIR
-
-Directory for man pages created from POD -- will mostly
-contain information of interest to Koha developers.
-
-=item DOC_DIR
-
-Directory for Koha documentation accessed from the
-command-line, e.g., READMEs.
-
-=item LOG_DIR
-
-Directory for Apache and Zebra logs produced by Koha.
-
-=item PAZPAR2_CONF_DIR
-
-Directory for PazPar2 configuration files.
-
-=item NONE
-
-This is a dummy target used to explicitly state
-that a given file or directory is not to be installed.
-This is used either for parts of the installer itself
-or for development tools that are not applicable to a
-production installation.
-
-=back
-
-=cut
-
-my $target_map = {
-  './about.pl'                  => 'INTRANET_CGI_DIR',
-  './acqui'                     => 'INTRANET_CGI_DIR',
-  './admin'                     => 'INTRANET_CGI_DIR',
-  './authorities'               => 'INTRANET_CGI_DIR',
-  './basket'                    => 'INTRANET_CGI_DIR',
-  './C4'                        => 'PERL_MODULE_DIR',
-  './C4/SIP/t'                  => 'NONE',
-  './C4/SIP/koha_test'          => 'NONE',
-  './C4/tests'                  => 'NONE',
-  './catalogue'                 => 'INTRANET_CGI_DIR',
-  './cataloguing'               => 'INTRANET_CGI_DIR',
-  './changelanguage.pl'         => 'INTRANET_CGI_DIR',
-  './check_sysprefs.pl'         => 'NONE',
-  './circ'                      => 'INTRANET_CGI_DIR',
-  './offline_circ'		=> 'INTRANET_CGI_DIR',
-  './edithelp.pl'               => 'INTRANET_CGI_DIR',
-  './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
-  './etc/zebradb'               => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
-  './etc/pazpar2'               => { target => 'PAZPAR2_CONF_DIR', trimdir => -1 },
-  './help.pl'                   => 'INTRANET_CGI_DIR',
-  './installer-CPAN.pl'         => 'NONE',
-  './installer'                 => 'INTRANET_CGI_DIR',
-  './errors'                    => {target => 'INTRANET_CGI_DIR'},
-  './koha-tmpl/intranet-tmpl'   => {target => 'INTRANET_TMPL_DIR', trimdir => -1},
-  './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
-  './kohaversion.pl'            => 'INTRANET_CGI_DIR', 
-  './labels'                    => 'INTRANET_CGI_DIR',
-  './mainpage.pl'               => 'INTRANET_CGI_DIR',
-  './Makefile.PL'               => 'NONE',
-  './MANIFEST.SKIP'             => 'NONE',
-  './members'                   => 'INTRANET_CGI_DIR',
-  './misc'                      => { target => 'SCRIPT_NONDEV_DIR', trimdir => -1 },
-  './misc/bin'                  => { target => 'SCRIPT_DIR', trimdir => -1 },
-  './misc/release_notes'        => { target => 'DOC_DIR', trimdir => 2 },
-  './misc/translator'           => { target => 'MISC_DIR', trimdir => 2 },
-  './misc/koha-install-log'     => { target => 'MISC_DIR', trimdir => -1 },
-  './misc/installer_devel_notes' => 'NONE',
-  './opac'                      => 'OPAC_CGI_DIR',
-  './README.txt'                => 'NONE',
-  './patroncards'               => 'INTRANET_CGI_DIR',
-  './reports'                   => 'INTRANET_CGI_DIR',
-  './reserve'                   => 'INTRANET_CGI_DIR',
-  './reviews'                   => 'INTRANET_CGI_DIR',
-  './rewrite-config.PL'         => 'NONE',
-  './reviews'                   => 'INTRANET_CGI_DIR',
-  './serials'                   => 'INTRANET_CGI_DIR',
-  './skel'                      => 'NONE',
-  './skel/var/log/koha'         => { target => 'LOG_DIR', trimdir => -1 },
-  './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
-  './skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/authorities/key'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/authorities/register'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/authorities/shadow'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/authorities/tmp'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lock/koha/zebradb/biblios' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/biblios/key'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/biblios/register'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/biblios/shadow'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './skel/var/lib/koha/zebradb/biblios/tmp'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
-  './sms'                       => 'INTRANET_CGI_DIR',
-  './suggestion'                => 'INTRANET_CGI_DIR',
-  './svc'                       => 'INTRANET_CGI_DIR',
-  './t'                         => 'NONE',
-  './tags'                      => 'INTRANET_CGI_DIR',
-  './tmp'                       => 'NONE', # FIXME need to determine whether
-                                           # Koha generates any persistent temp files
-                                           # that should go in /var/tmp/koha
-  './tools'                     => 'INTRANET_CGI_DIR',
-  './virtualshelves'            => 'INTRANET_CGI_DIR',
-  './xml_sax.pl'                => 'PERL_MODULE_DIR',
-  # ignore files and directories created by the install itself
-  './pm_to_blib'                => 'NONE',
-  './blib'                      => 'NONE',
-};
-
-=head1 CONFIGURATION OPTIONS
-
-The following configuration options are used by the installer.
-
-=over 4
-
-=item INSTALL_MODE
-
-Specifies whether installation will be FHS-compliant (default,
-assumes user has root), put everything under
-a single directory (for users installing on a web host
-that allows CGI scripts and a MySQL database but not root
-access), or development (for a developer who wants to run
-Koha from a git clone with no fuss).
-
-=item INSTALL_BASE
-
-Directory under which most components will go.  Default
-value will vary depending on INSTALL_MODE.
-
-=item DB_TYPE
-
-Type of DBMS (e.g., mysql or Pg).
-
-=item DB_HOST
-
-Name of DBMS server.
-
-=item DB_PORT
-
-Port that DBMS server is listening on.
-
-=item DB_NAME
-
-Name of the DBMS database for Koha.
-
-=item DB_USER
-
-Name of DBMS user account for Koha's database.
-
-=item DB_PASS
-
-Pasword of DMBS user account for Koha's database.
-
-=item INSTALL_ZEBRA
-
-Whether to install Zebra configuration files and data
-directories.
-
-=item ZEBRA_MARC_FORMAT
-
-Specifies format of MARC records to be indexed by Zebra.
-
-=item ZEBRA_LANGUAGE
-
-Specifies primary language of records that will be
-indexed by Zebra.
-
-=item ZEBRA_USER
-
-Internal Zebra user account for the index.
-
-=item ZEBRA_PASS
-
-Internal Zebra user account's password.
-
-=item KOHA_USER
-
-System user account that will own Koha's files.
-
-=item KOHA_GROUP
-
-System group that will own Koha's files.
-
-=back
-
-=cut
-
-# default configuration options
-my %config_defaults = (
-  'DB_TYPE'           => 'mysql',
-  'DB_HOST'           => 'localhost',
-  'DB_NAME'           => 'koha',
-  'DB_USER'           => 'kohaadmin',
-  'DB_PASS'           => 'katikoan',
-  'INSTALL_ZEBRA'     => 'yes',
-  'INSTALL_SRU'       => 'yes',
-  'INSTALL_PAZPAR2'   => 'no',
-  'AUTH_INDEX_MODE'   => 'dom',
-  'ZEBRA_MARC_FORMAT' => 'marc21',
-  'ZEBRA_LANGUAGE'    => 'en',
-  'ZEBRA_USER'        => 'kohauser',
-  'ZEBRA_PASS'        => 'zebrastripes',
-  'ZEBRA_SRU_HOST'    => 'localhost',
-  'ZEBRA_SRU_BIBLIOS_PORT'    => '9998',
-  'ZEBRA_SRU_AUTHORITIES_PORT'    => '9999',
-  'KOHA_USER'         => 'koha',
-  'KOHA_GROUP'        => 'koha',
-  'MERGE_SERVER_HOST' => 'localhost',
-  'MERGE_SERVER_PORT' => '11001',
-  'PAZPAR2_HOST' => 'localhost',
-  'PAZPAR2_PORT' => '11002',
-  'RUN_DATABASE_TESTS' => 'no',
-  'PATH_TO_ZEBRA' => '',
-  'USE_MEMCACHED'     => 'no',
-  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
-  'MEMCACHED_NAMESPACE' => 'KOHA'
-);
-
-# set some default configuration options based on OS
-# more conditions need to be added for other OS's
-# this should probably also incorporate usage of Win32::GetOSName() and/or Win32::GetOSVersion()
-# to allow for more granular decisions based on which Win32 platform
-
-warn "Your platform appears to be $^O.\n" if $DEBUG;
-
-if ( $^O eq 'MSWin32' ) {
-	# Most Unix2Win32 ports seem to poke everything into the Program Files directory
-	# this could be changed to put some files (ie. libraries) into system32, etc.
-	$config_defaults{'INSTALL_MODE'} = 'single';
-	$config_defaults{'INSTALL_BASE'} = 'c:/progra~1/koha';	# Use 8.3 names to be safe...
-}
-elsif ( $^O eq 'cygwin' ) {
-	# Most Unix2Win32 ports seem to poke everything into the Program Files directory
-	# this could be changed to put some files (ie. libraries) into system32, etc.
-	$config_defaults{'INSTALL_MODE'} = 'single';
-	$config_defaults{'INSTALL_BASE'} = 'c:/progra~1/koha';	# Use 8.3 names to be safe...
-}
-else {
-	$config_defaults{'INSTALL_MODE'} = 'standard';
-	$config_defaults{'INSTALL_BASE'} = '/usr/share/koha';
-}
-
-# valid values for certain configuration options
-my %valid_config_values = (
-  'INSTALL_MODE'  => { 'standard' => 1, 'single' => 1, 'dev' => 1 },
-  'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
-  'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
-  'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
-  'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
-  'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
-  'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution
-  'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
-  'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
-);
-
-# get settings from command-line
-my $koha_install_log = "";
-Getopt::Long::Configure('pass_through');
-my $results = GetOptions(
-    "prev-install-log=s" => \$koha_install_log
-);
-
-my %install_log_values = ();
-if ($koha_install_log ne "") {
-    get_install_log_values($koha_install_log, \%install_log_values);
-}
-
-my %config = get_configuration(\%config_defaults, \%valid_config_values, \%install_log_values);
-my ($target_directories, $skip_directories) = get_target_directories(\%config);
-display_configuration(\%config, $target_directories);
-my $file_map = {};
-get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes" ? 1: 0);
-
-my $pl_files = {
-      'rewrite-config.PL' => [
-         'blib/KOHA_CONF_DIR/koha-conf.xml',
-         'blib/KOHA_CONF_DIR/koha-httpd.conf',
-         'blib/MISC_DIR/koha-install-log'
-         ],
-	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
-		 'blib'
-		 ]
-};
-
-if ($config{'INSTALL_ZEBRA'} eq "yes") {
-    push @{ $pl_files->{'rewrite-config.PL'} }, (
-        'blib/ZEBRA_CONF_DIR/etc/passwd',
-        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
-        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
-        'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
-        'blib/ZEBRA_CONF_DIR/explain-authorities.xml',
-        'blib/ZEBRA_CONF_DIR/explain-biblios.xml',
-        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-grs1.xml',
-        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml',
-    );
-    push @{ $pl_files->{'rewrite-config.PL'} }, (
-        'blib/SCRIPT_DIR/koha-zebra-ctl.sh',
-        'blib/SCRIPT_DIR/koha-pazpar2-ctl.sh',
-        'blib/SCRIPT_DIR/koha-zebraqueue-ctl.sh',
-    );
-    if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
-        push @{ $pl_files->{'rewrite-config.PL'} }, (
-            'blib/PAZPAR2_CONF_DIR/koha-biblios.xml',
-            'blib/PAZPAR2_CONF_DIR/pazpar2.xml'
-        );
-    }
-    $config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg';
-    $config{'AUTH_RETRIEVAL_CFG'} =
-        $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'retrieval-info-auth-dom.xml' : 'retrieval-info-auth-grs1.xml';
-}
-
-if ($config{'INSTALL_MODE'} ne "dev") {
-    push @{ $pl_files->{'rewrite-config.PL'} }, (
-        'blib/PERL_MODULE_DIR/C4/Context.pm',
-        'blib/SCRIPT_NONDEV_DIR/kohalib.pl'
-    );
-}
-
-my %test_suite_override_dirs = (
-    KOHA_CONF_DIR  => ['etc'],
-    ZEBRA_CONF_DIR => ['etc', 'zebradb'],
-    LOG_DIR        => ['var', 'log'],
-    SCRIPT_DIR     => ['bin'],
-    ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'],
-    ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'],
-    ZEBRA_RUN_DIR  => ['var', 'run', 'zebradb'],
-);
-
-WriteMakefile(
-              NAME         => 'koha',
-              #VERSION     => strftime('2.9.%Y%m%d%H',gmtime),
-              VERSION_FROM => 'kohaversion.pl',
-              ABSTRACT     => 'Award-winning integrated library system (ILS) and Web OPAC',
-              AUTHOR       => 'Koha Contributors <http://koha-community.org/>',
-              NO_META      => 1,
-              PREREQ_PM    => $koha_pm->prereq_pm,
-
-              # File tree mapping
-              PM => $file_map,
-
-              # Man pages generated from POD
-	      # ExtUtils::MakeMaker already manage $(DESTDIR)
-              INSTALLMAN1DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man1'),
-              INSTALLMAN3DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man3'),
-
-              PL_FILES => $pl_files,
-);
-
-=head1 FUNCTIONS
-
-=head2 hashdir
-
-This function recurses through the directory structure and builds
-a hash of hashes containing the structure with arrays holding filenames.
-This directory hashing routine was taken from BrowserUK @ http://www.perlmonks.org/?node_id=219919
-
-=cut
-
-sub hashdir{
-    my $dir = shift;
-    opendir my $dh, $dir or die $!;
-    my $tree = {}->{$dir} = {};
-    while( my $file = readdir($dh) ) {
-        next if $file =~ m/^\.{1,2}/ and $file !~ /^\.htaccess/; # .htaccess is a special case
-        my $path = $dir .'/' . $file;
-        $tree->{$file} = hashdir($path), next if -d $path;
-        push @{$tree->{'.'}}, $file;
-    }
-    return $tree;
-}
-
-=head2 get_file_map
-
-This function combines the target_map and file hash to
-map each source file to its destination relative to
-the set of installation targets.
-
-Output will be a hash mapping from each source file
-to its destination value, like this:
-
-'mainpage.pl' => '$(INTRANET_CGI_DIR)/mainpage.pl'
-
-=cut
-
-sub get_file_map {
-    my $target_map = shift;
-    my $dirtree = shift;
-    my $file_map = shift;
-    my $install_zebra = shift;
-    my $curr_path = @_ ? shift : ['.'];
-
-    # Traverse the directory tree.
-    # For each file or directory, identify the
-    # most specific match in the target_map
-    foreach my $dir (sort keys %{ $dirtree }) {
-        if ($dir eq '.') {
-            # deal with files in directory
-            foreach my $file (sort @{ $dirtree->{$dir} }) {
-                my $targetdir = undef;
-                my $matchlevel = undef;
-                # first, see if there is a match on this specific
-                # file in the target map
-                my $filepath = join("/", @$curr_path, $file);
-                if (exists $target_map->{$filepath}) {
-                    $targetdir = $target_map->{$filepath};
-                    $matchlevel = scalar(@$curr_path) + 1;
-                } else {
-                    # no match on the specific file; look for
-                    # a directory match
-                    for (my $i = scalar(@$curr_path) - 1; $i >= 0; $i--)  {
-                        my $dirpath = join("/", @$curr_path[0..$i]);
-                        if (exists $target_map->{$dirpath}) {
-                            $targetdir = $target_map->{$dirpath};
-                            $matchlevel = $i + 1;
-                            last;
-                        }
-                    }
-                }
-                if (defined $targetdir) {
-                     _add_to_file_map($file_map, $targetdir, $curr_path, $file, $matchlevel, $install_zebra);
-                } else {
-                    my $path = join("/", @$curr_path);
-                    print "failed to map: $path/$file\n" if $DEBUG;
-                }
-            }
-        } else {
-            # dealing with subdirectory
-            push @$curr_path, $dir;
-            get_file_map($target_map, $dirtree->{$dir}, $file_map, $install_zebra, $curr_path);
-            pop @$curr_path;
-        }
-    }
-}
-
-sub _add_to_file_map {
-    my $file_map = shift;
-    my $targetdir = shift;
-    my $curr_path = shift;
-    my $file = shift;
-    my $matchlevel = shift;
-    my $install_zebra = shift;
-    my $dest_path = @_ ? shift : $curr_path;
-
-    # The target can be one of the following:
-    # 1. scalar representing target symbol
-    # 2. hash ref containing target and trimdir keys
-    #
-    # Consequently, this routine traverses this structure,
-    # calling itself recursively, until it deals with
-    # all of the scalar target symbols.
-    if (ref $targetdir eq 'HASH') {
-        my $subtarget = $targetdir->{target};
-        if (exists $targetdir->{trimdir}) {
-            # if we get here, we've specified that
-            # rather than installing the file to
-            # $(TARGET)/matching/dirs/subdirs/file,
-            # we want to install it to
-            # $(TARGET)/subdirs/file
-            #
-            # Note that this the only place where
-            # $matchlevel is used.
-            my @new_dest_path = @$dest_path;
-            if ($targetdir->{trimdir} == -1)  {
-                splice @new_dest_path, 0, $matchlevel;
-            } else {
-                splice @new_dest_path, 0, $targetdir->{trimdir};
-            }
-            _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel, $install_zebra, \@new_dest_path);
-        } else {
-            # actually getting here means that the
-            # target was unnecessarily listed
-            # as a hash, but we'll forgive that
-            _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel, $install_zebra);
-        }
-    } elsif ($targetdir ne 'NONE' and $targetdir ne '') {
-        my $source = File::Spec->catfile(@$curr_path, $file);
-        my $destination = File::Spec->catfile('blib', $targetdir, @$dest_path, $file);
-        #print "$source => $destination\n"; # DEBUG
-        # quote spaces in file names
-        # FIXME: this is of questionable portability and
-        # probably depends on user's make recognizing this
-        # quoting syntax -- probably better to remove
-        # spaces and shell metacharacters from all file names
-        $source =~ s/ /\\ /g;
-        $destination =~ s/ /\\ /g;
-
-        $file_map->{$source} = $destination unless (!$install_zebra and $targetdir =~ /ZEBRA/);
-    }
-}
-
-=head2 get_install_log_values
-
-Reads value from the Koha install log specified by
---prev-install-log
-
-=cut
-
-sub get_install_log_values {
-    my $install_log = shift;
-    my $values = shift;
-
-    open LOG, "<$install_log" or die "Cannot open install log $install_log: $!\n";
-    while (<LOG>) {
-        chomp;
-        next if /^#/ or /^\s*$/;
-        next if /^=/;
-        next unless m/=/;
-        s/\s+$//g;
-        my ($key, $value) = split /=/, $_, 2;
-        $values->{$key} = $value;
-    }
-    close LOG;
-
-    print <<_EXPLAIN_INSTALL_LOG_;
-Reading values from install log $install_log.  You
-will be prompted only for settings that have been
-added since the last time you installed Koha.  To
-be prompted for all settings, run 'perl Makefile.PL'
-without the --prev-install-log option.
-_EXPLAIN_INSTALL_LOG_
-}
-
-=head2 get_configuration
-
-This prompts the user for various configuration options.
-
-=cut
-
-sub get_configuration {
-  my $defaults = shift;
-  my $valid_values = shift;
-  my $install_log_values = shift;
-  my %config = ();
-
-  my $msg = q(
-By default, Koha can be installed in one of three ways:
-
-standard: Install files in conformance with the Filesystem
-          Hierarchy Standard (FHS).  This is the default mode
-          and should be used when installing a production
-          Koha system.  On Unix systems, root access is
-          needed to complete a standard installation.
-
-single:   Install files under a single directory.  This option
-          is useful for installing Koha without root access, e.g.,
-          on a web host that allows CGI scripts and MySQL databases
-          but requires the user to keep all files under the user's
-          HOME directory.
-
-dev:      Create a set of symbolic links and configuration files to
-          allow Koha to run directly from the source distribution.
-          This mode is useful for developers who want to run
-          Koha from a git clone.
-
-Installation mode);
-    $msg .= _add_valid_values_disp('INSTALL_MODE', $valid_values);
-    $config{'INSTALL_MODE'} = _get_value('INSTALL_MODE', $msg, $defaults->{'INSTALL_MODE'}, $valid_values, $install_log_values);
-
-    # set message and default value for INSTALL_BASE
-    # depending on value of INSTALL_MODE
-    my $install_base_default = $defaults->{'INSTALL_BASE'};
-    if ($config{'INSTALL_MODE'} eq 'dev') {
-        $msg = q(
-Please specify the directory in which to install Koha's
-active configuration files and (if applicable) the
-Zebra database.  Koha's CGI scripts and templates will
-be run from the current directory.
-
-Configuration directory:);
-        # FIXME - home directory portability consideration apply
-        $install_base_default =
-	    $ENV{DESTDIR}
-	    || ( exists $ENV{HOME} ? "$ENV{HOME}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev" )
-	;
-    } elsif ($config{'INSTALL_MODE'} eq 'single') {
-        $msg = "\nPlease specify the directory in which to install Koha";
-        # FIXME -- we're assuming under a 'single' mode install
-        # that user will likely want to install under the home
-        # directory.  This is OK in and of itself, but we should
-        # use File::HomeDir to locate the home directory portably.
-        # This is deferred for now because File::HomeDir is not yet
-        # core.
-		# --we must also keep this portable to the major OS's -fbcit
-        $install_base_default = (exists $ENV{'HOME'}) ? "$ENV{'HOME'}/koha" : $defaults->{'INSTALL_BASE'};
-    } else {
-        # must be standard
-        $msg = q(
-Please specify the directory under which most Koha files
-will be installed.
-
-Note that if you are planning in installing more than
-one instance of Koha, you may want to modify the last
-component of the directory path, which will be used
-as the package name in the FHS layout.
-
-Base installation directory);
-    }
-    $config{'INSTALL_BASE'} = _get_value('INSTALL_BASE', $msg, $install_base_default, $valid_values, $install_log_values);
-
-    $config{'INSTALL_BASE'} = File::Spec->rel2abs($config{'INSTALL_BASE'});
-	print "INSTALL_BASE=$config{'INSTALL_BASE'}\r\n" if $DEBUG;
-    if ($config{'INSTALL_MODE'} eq "standard") {
-        $msg = q(
-Since you are using the 'standard' install
-mode, you should run 'make install' as root.
-However, it is recommended that a non-root
-user (on Unix and Linux platforms) have
-ownership of Koha's files, including the
-Zebra indexes if applicable.
-
-Please specify a user account.  This
-user account does not need to exist
-right now, but it needs to exist
-before you run 'make install'.  Please
-note that for security reasons, this
-user should not be the same as the user
-account Apache runs under.
-
-User account);
-        $config{'KOHA_USER'} = _get_value('KOHA_USER', $msg, $defaults->{'KOHA_USER'}, $valid_values, $install_log_values);
-
-        $msg = q(
-Please specify the group that should own
-Koha's files.  As above, this group need
-not exist right now, but should be created
-before you run 'make install'.
-
-Group);
-        $config{'KOHA_GROUP'} = _get_value('KOHA_GROUP', $msg, $defaults->{'KOHA_GROUP'}, $valid_values, $install_log_values);
-    }
-
-    $msg = q(
-Please specify which database engine you will use
-to store data in Koha.  The choices are MySQL and
-PostgreSQL; please note that at the moment
-PostgreSQL support is highly experimental.
-
-DBMS to use);
-    $msg .= _add_valid_values_disp('DB_TYPE', $valid_values);
-    $config{'DB_TYPE'} = _get_value('DB_TYPE', $msg, $defaults->{'DB_TYPE'}, $valid_values, $install_log_values);
-
-    $msg = q(
-Please specify the name or address of your
-database server.  Note that the database
-does not have to exist at this point, it
-can be created after running 'make install'
-and before you try using Koha for the first time.
-
-Database server);
-    $config{'DB_HOST'} = _get_value('DB_HOST', $msg, $defaults->{'DB_HOST'}, $valid_values, $install_log_values);
-
-    $msg = q(
-Please specify the port used to connect to the
-DMBS);
-    my $db_port_default = $config{'DB_TYPE'} eq 'mysql' ? '3306' : '5432';
-    $config{'DB_PORT'} = _get_value('DB_PORT', $msg, $db_port_default, $valid_values, $install_log_values);
-
-    $msg = q(
-Please specify the name of the database to be
-used by Koha);
-    $config{'DB_NAME'} = _get_value('DB_NAME', $msg, $defaults->{'DB_NAME'}, $valid_values, $install_log_values);
-
-    $msg = q(
-Please specify the user that owns the database to be
-used by Koha);
-    $config{'DB_USER'} = _get_value('DB_USER', $msg, $defaults->{'DB_USER'}, $valid_values, $install_log_values);
-
-    $msg = q(
-Please specify the password of the user that owns the
-database to be used by Koha);
-    $config{'DB_PASS'} = _get_value('DB_PASS', $msg, $defaults->{'DB_PASS'}, $valid_values, $install_log_values);
-
-    $msg = q(
-Koha can use the Zebra search engine for high-performance
-searching of bibliographic and authority records.  If you
-have installed the Zebra software and would like to use it,
-please answer 'yes' to the following question.  Otherwise,
-Koha will default to using its internal search engine.
-
-Please note that if you choose *NOT* to install Zebra,
-koha-conf.xml will still contain some references to Zebra
-settings.  Those references will be ignored by Koha.
-
-Install the Zebra configuration files?);
-    $msg .= _add_valid_values_disp('INSTALL_ZEBRA', $valid_values);
-    $config{'INSTALL_ZEBRA'} = _get_value('INSTALL_ZEBRA', $msg, $defaults->{'INSTALL_ZEBRA'}, $valid_values, $install_log_values);
-
-    if ($config{'INSTALL_ZEBRA'} eq 'yes') {
-
-        if (defined(my $zebra_path = find_zebra())) {
-            $config{'PATH_TO_ZEBRA'} = $zebra_path;
-            print qq(
-Found 'zebrasrv' and 'zebraidx' in $zebra_path.
-);
-        } else {
-            print q(
-Unable to find the Zebra programs 'zebrasrv' and 'zebraidx'
-in your PATH or in some of the usual places.  If you haven't
-installed Zebra yet, please do so and run Makefile.PL again.
-
-);
-        }
-
-        $msg = q(
-Since you've chosen to use Zebra with Koha,
-you must specify the primary MARC format of the
-records to be indexed by Zebra.
-
-Koha provides Zebra configuration files for MARC 21
-and UNIMARC.
-
-MARC format for Zebra indexing);
-        $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);
-        $config{'ZEBRA_MARC_FORMAT'} = _get_value('ZEBRA_MARC_FORMAT', $msg, $defaults->{'ZEBRA_MARC_FORMAT'}, $valid_values, $install_log_values);
-        $msg = q(
-Koha supplies Zebra configuration files tuned for
-searching either English (en) or French (fr) MARC
-records.
-
-Primary language for Zebra indexing);
-        $msg .= _add_valid_values_disp('ZEBRA_LANGUAGE', $valid_values);
-        $config{'ZEBRA_LANGUAGE'} = _get_value('ZEBRA_LANGUAGE', $msg, $defaults->{'ZEBRA_LANGUAGE'}, $valid_values, $install_log_values);
-
-        $msg = q(
-Koha can use one of  two different indexing modes
-for the MARC authorities records:
-
-grs1 - uses the Zebra GRS-1 filter, available
-       for legacy support
-dom  - uses the DOM XML filter; offers improved
-       functionality.
-
-Authorities indexing mode);
-        $msg .= _add_valid_values_disp('AUTH_INDEX_MODE', $valid_values);
-        $config{'AUTH_INDEX_MODE'} = _get_value('AUTH_INDEX_MODE', $msg, $defaults->{'AUTH_INDEX_MODE'}, $valid_values, $install_log_values);
-
-        $msg = q(
-Please specify Zebra database user);
-        $config{'ZEBRA_USER'} = _get_value('ZEBRA_USER', $msg, $defaults->{'ZEBRA_USER'}, $valid_values, $install_log_values);
-
-        $msg = q(
-Please specify the Zebra database password);
-        $config{'ZEBRA_PASS'} = _get_value('ZEBRA_PASS', $msg, $defaults->{'ZEBRA_PASS'}, $valid_values, $install_log_values);
-
-        $msg = q(
-Since you've chosen to use Zebra, you can enable the SRU/
-Z39.50 Server if you so choose, but you must specify a
-few configuration options for it.
-
-Please note that if you choose *NOT* to configure SRU,
-koha-conf.xml will still contain some references to SRU
-settings.  Those references will be ignored by Koha.
-
-Install the SRU configuration files?);
-        $msg .= _add_valid_values_disp('INSTALL_SRU', $valid_values);
-        $config{'INSTALL_SRU'} = _get_value('INSTALL_SRU', $msg, $defaults->{'INSTALL_SRU'}, $valid_values, $install_log_values);
-
-        if ($config{'INSTALL_SRU'} eq 'yes') {
-            $msg = q(
-Since you've chosen to configure SRU, you must
-specify the host and port(s) that the SRU
-Servers (bibliographic and authority) should run on.
-);
-            $msg = q(
-SRU Database host?);
-            $config{'ZEBRA_SRU_HOST'} = _get_value('ZEBRA_SRU_HOST', $msg, $defaults->{'ZEBRA_SRU_HOST'}, $valid_values, $install_log_values);
-
-            $msg = q(
-SRU port for bibliographic data?);
-            $config{'ZEBRA_SRU_BIBLIOS_PORT'} = _get_value('ZEBRA_SRU_BIBLIOS_PORT', $msg, $defaults->{'ZEBRA_SRU_BIBLIOS_PORT'}, $valid_values, $install_log_values);
-
-            $msg = q(
-SRU port for authority data?);
-            $config{'ZEBRA_SRU_AUTHORITIES_PORT'} = _get_value('ZEBRA_SRU_AUTHORITIES_PORT', $msg, $defaults->{'ZEBRA_SRU_AUTHORITIES_PORT'}, $valid_values, $install_log_values);
-
-        }
-
-        $msg = q(
-Since you've chosen to use Zebra, you can also choose to
-install PazPar2, which is a metasearch tool.  With PazPar2,
-Koha can perform on-the-fly merging of bibliographic
-records during searching, allowing for FRBRization of
-the results list.
-
-Install the PazPar2 configuration files?);
-        $msg .= _add_valid_values_disp('INSTALL_PAZPAR2', $valid_values);
-        $config{'INSTALL_PAZPAR2'} = _get_value('INSTALL_PAZPAR2', $msg, $defaults->{'INSTALL_PAZPAR2'}, $valid_values, $install_log_values);
-
-        if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
-            $msg = q(
-Since you've chosen to configure PazPar2, you must
-specify the host and port(s) that PazPar2
-uses:
-);
-            $msg = q(
-Zebra bibliographic server host?);
-            $config{'MERGE_SERVER_HOST'} = _get_value('MERGE_SERVER_HOST', $msg, $defaults->{'MERGE_SERVER_HOST'}, $valid_values, $install_log_values);
-
-            $msg = q(
-Zebra bibliographic port for PazPar2 to use?);
-            $config{'MERGE_SERVER_PORT'} = _get_value('MERGE_SERVER_PORT', $msg, $defaults->{'MERGE_SERVER_PORT'}, $valid_values, $install_log_values);
-
-            $msg = q(
-PazPar2 host?);
-            $config{'PAZPAR2_HOST'} = _get_value('PAZPAR2_HOST', $msg, $defaults->{'PAZPAR2_HOST'}, $valid_values, $install_log_values);
-
-            $msg = q(
-PazPar2 port?);
-            $config{'PAZPAR2_PORT'} = _get_value('PAZPAR2_PORT', $msg, $defaults->{'PAZPAR2_PORT'}, $valid_values, $install_log_values);
-
-        }
-    }
-  $msg = q(
-Use memcached and memoize to cache the results of some function calls?
-This provides a signficant performance improvement.
-You will need a Memcached server running.);
-  $msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values);
-  $config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values);
-  if ($config{'USE_MEMCACHED'} eq 'yes'){
-      $msg = q(
-Since you've chosen to use caching, you must specify the memcached servers and the namespace to use:
-);
-      $msg = q(
-Memcached server address?);
-      $config{'MEMCACHED_SERVERS'} = _get_value('MEMCACHED_SERVERS', $msg, $defaults->{'MEMCACHED_SERVERS'}, $valid_values, $install_log_values);
-
-      $msg = q(
-Memcached namespace?);
-      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
-  }
-
-
-
-  $msg = q(
-Would you like to run the database-dependent test suite?);
-  $msg .= _add_valid_values_disp( 'RUN_DATABASE_TESTS', $valid_values );
-    $config{'RUN_DATABASE_TESTS'} = _get_value( 'RUN_DATABASE_TESTS', $msg, $defaults->{'RUN_DATABASE_TESTS'}, $valid_values, $install_log_values );
-
-  if ( $config{'RUN_DATABASE_TESTS'} eq 'yes' ) {
-      $config{'TEST_DB_TYPE'} = $config{'DB_TYPE'};
-      $config{'TEST_DB_HOST'} = $config{'DB_HOST'};
-      $msg = q(TEST DATABASE
-
-THE DATA IN THIS DATABASE WILL BE DESTROYED during the process of
-testing. Please don't do this on your production database. It is not
-reversable.
-
-YOU WILL SUFFER DATA LOSS if you run this test suite on your test
-database. You are better off not running this optional test suite than
-doing it in a database that you don't want to lose.
-
-Please specify the name of the test database to be
-used by Koha);
-
-      $config{'TEST_DB_NAME'} = _get_value('TEST_DB_NAME', $msg, $defaults->{'TEST_DB_NAME'}, $valid_values, $install_log_values);
-      while ( $config{'TEST_DB_NAME'} eq $config{'DB_NAME'} ) {
-          $msg = q(Please do not use the same database for testing as you do for production. You run the severe risk of data loss.);
-          $config{'TEST_DB_NAME'} = _get_value('TEST_DB_NAME', $msg, $defaults->{'TEST_DB_NAME'}, $valid_values, $install_log_values);
-      }
-
-      $msg = q(
-Please specify the user that owns the database to be
-used by Koha);
-    $config{'TEST_DB_USER'} = _get_value('TEST_DB_USER', $msg, $defaults->{'TEST_DB_USER'}, $valid_values, $install_log_values);
-
-      $msg = q(
-Please specify the password of the user that owns the
-database to be used by Koha);
-      $config{'TEST_DB_PASS'} = _get_value('TEST_DB_PASS', $msg, $defaults->{'TEST_DB_PASS'}, $valid_values, $install_log_values);
-  }
-
-    print "\n\n";
-
-    # add version number
-    my $version = "no_version_found";
-    eval {
-        require 'kohaversion.pl';
-        $version = kohaversion();
-    };
-    $config{'KOHA_INSTALLED_VERSION'} = $version;
-
-    return %config;
-}
-
-sub _add_valid_values_disp {
-    my $key = shift;
-    my $valid_values = shift;
-
-    my $disp = "";
-    if (exists $valid_values->{$key}) {
-        $disp = " (" . join(", ", sort keys %{ $valid_values->{$key} }) . ")";
-    }
-    return $disp;
-}
-
-sub _get_value {
-    my $key = shift;
-    my $msg = shift;
-    my $default = shift;
-    my $valid_values = shift;
-    my $install_log_values = shift;
-
-    # take value from install log if present
-    if (exists $install_log_values{$key}) {
-        $install_log_values{$key} =~ s/\$/\$\$/g;
-        return $install_log_values{$key};
-    }
-
-    # override default value from environment
-    if (exists $ENV{$key}) {
-        $default = $ENV{$key};
-        $msg .= " (default from environment)";
-    }
-
-    my $val = prompt($msg, $default);
-
-    while (exists $valid_values->{$key} and
-           $val ne $default and
-           not exists $valid_values->{$key}->{$val}) {
-        my $retry_msg = "Value '$val' is not a valid option.\n";
-        $retry_msg .= "Please enter a value";
-        $retry_msg .= _add_valid_values_disp($key, $valid_values);
-        $val = prompt($retry_msg, $default);
-    }
-    $val =~ s/\$/\$\$/g;
-    return $val;
-}
-
-=head2 get_target_directories
-
-Creates a hash mapping from symbols for installation target
-directories to actual directory paths.
-
-Also returns a hash indicating targets for which
-files need not be copied -- this is used for the 'dev'
-mode installation, where some files are installed in place.
-
-=cut
-
-sub get_target_directories {
-    my $config = shift;
-
-    my $base = $config->{'INSTALL_BASE'};
-    my $mode = $config->{'INSTALL_MODE'};
-
-    # get last component of install base directory
-    # to treat as package name
-    my ($volume, $directories, $file) = File::Spec->splitpath($base, 1);
-
-    my @basedir = File::Spec->splitdir($directories);
-
-	# for Win32 we need to prepend the volume to the directory path
-	if ( $^O eq 'MSWin32' ) { shift @basedir; unshift @basedir, $volume; }
-	elsif ( $^O eq 'cygwin' ) { shift @basedir; unshift @basedir, 'c:'; }   # in a cygwin environment, $volume is returned empty
-
-    my $package = pop @basedir;
-
-
-    my %dirmap = ();
-    my %skipdirs = ();
-    if ($mode eq 'single') {
-        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
-        $dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');
-        $dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');
-        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
-        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
-        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
-        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
-        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
-        $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
-        $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');
-        $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
-        $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
-        $dirmap{'SCRIPT_NONDEV_DIR'} = $dirmap{'SCRIPT_DIR'};
-        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
-        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
-        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
-        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
-        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
-        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
-    } elsif ($mode eq 'dev') {
-        my $curdir = File::Spec->rel2abs(File::Spec->curdir());
-        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir);
-        $skipdirs{'INTRANET_CGI_DIR'} = 1;
-        $dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'intranet-tmpl');
-        $skipdirs{'INTRANET_TMPL_DIR'} = 1;
-        $dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
-        $skipdirs{'INTRANET_WWW_DIR'} = 1;
-        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir);
-        $skipdirs{'OPAC_CGI_DIR'} = 1;
-        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'opac-tmpl');
-        $skipdirs{'OPAC_TMPL_DIR'} = 1;
-        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
-        $skipdirs{'OPAC_WWW_DIR'} = 1;
-        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir);
-        $skipdirs{'PERL_MODULE_DIR'} = 1;
-        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
-        $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
-        $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');
-        $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
-        $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
-        $dirmap{'SCRIPT_NONDEV_DIR'} = $dirmap{'SCRIPT_DIR'};
-        $skipdirs{'SCRIPT_NONDEV_DIR'} = 1;
-        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
-        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
-        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
-        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
-        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
-        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
-    } else {
-        # mode is standard, i.e., 'fhs'
-        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
-        $dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');
-        $dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');
-        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
-        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
-        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
-        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
-        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package);
-        $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'zebradb');
-        $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'pazpar2');
-        $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
-        $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
-        $dirmap{'SCRIPT_NONDEV_DIR'} = $dirmap{'SCRIPT_DIR'};
-        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
-        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
-        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb');
-        $dirmap{'LOG_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package);
-        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb');
-        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb');
-    }
-
-    _get_env_overrides(\%dirmap);
-    _get_argv_overrides(\%dirmap);
-    _add_destdir(\%dirmap) unless ($^O eq 'MSWin32');
-
-    return \%dirmap, \%skipdirs;
-}
-
-=head2 get_test_dir
-
-Map a directory target to the corresponding path for
-the test suite.
-
-=cut
-
-sub get_test_dir {
-    my ($dirname) = @_;
-
-    my @basedir = (File::Spec->rel2abs(File::Spec->curdir()), 't', 'run');
-    if (exists $test_suite_override_dirs{$dirname}) {
-        return File::Spec->catdir(@basedir, @{ $test_suite_override_dirs{$dirname} });
-    } else {
-        return;
-    }
-
-}
-
-sub _get_env_overrides {
-    my $dirmap = shift;
-
-    foreach my $key (keys %$dirmap) {
-        if (exists $ENV{$key}) {
-            $dirmap->{$key} = $ENV{$key};
-            print "Setting $key from environment\n";
-        }
-    }
-}
-
-sub _get_argv_overrides {
-    my $dirmap = shift;
-
-    my @new_argv = ();
-    for (my $i = 0; $i <= $#ARGV; $i++) {
-        if ($ARGV[$i] =~ /^([^=]+)=([^=]+)$/ and exists $dirmap->{$1}) {
-            $dirmap->{$1} = $2;
-        } else {
-            push @new_argv, $ARGV[$i];
-        }
-    }
-    @ARGV = @new_argv;
-}
-
-sub _strip_destdir {
-    my $dir = shift;
-    $dir =~ s/^\$\(DESTDIR\)//;
-    return $dir;
-}
-
-sub _add_destdir {
-    my $dirmap = shift;
-
-    foreach my $key (keys %$dirmap) {
-        $dirmap->{$key} = '$(DESTDIR)'.$dirmap->{$key};
-    }
-}
-
-sub display_configuration {
-    my $config = shift;
-    my $dirmap = shift;
-    print "\n\nKoha will be installed with the following configuration parameters:\n\n";
-    foreach my $key (sort keys %$config) {
-        print sprintf("%-25.25s%s\n", $key, $config->{$key});
-    }
-
-    print "\nand in the following directories:\n\n";
-    foreach my $key (sort keys %$dirmap) {
-        print sprintf("%-25.25s%s\n", $key, $dirmap->{$key});
-    }
-    print "\n\nTo change any configuration setting, please run\n";
-    print "perl Makefile.PL again.  To override one of the target\n";
-    print "directories, you can do so on the command line like this:\n";
-    print "\nperl Makefile.PL PERL_MODULE_DIR=/usr/share/perl/5.8\n\n";
-    print "You can also set different default values for parameters\n";
-    print "or override directory locations by using environment variables.\n";
-    print "\nFor example:\n\n";
-    print "export DB_USER=my_koha\n";
-    print "perl Makefile.PL\n";
-    print "\nor\n\n";
-    print "DB_USER=my_koha DOC_DIR=/usr/local/info perl Makefile.PL\n\n";
-    print "If installing on a Win32 platform, be sure to use:\n";
-    print "'dmake -x MAXLINELENGTH=300000'\n\n";
-}
-
-=head2 find_zebra
-
-Attempt to find Zebra - check user's PATH and
-a few other directories for zebrasrv and zebraidx.
-
-FIXME: doesn't handle Win32
-
-=cut
-
-sub find_zebra {
-    my @search_dirs = map {
-                            my $abs = File::Spec->rel2abs($_);
-                            my ($toss, $directories);
-                            ($toss, $directories, $toss) = File::Spec->splitpath($abs, 1);
-                            $directories;
-                        }  split /:/, $ENV{PATH};
-    push @search_dirs, qw(/usr/local/bin /opt/local/bin /usr/bin);
-    my @zebrasrv_dirs = grep { -x File::Spec->catpath('', $_, 'zebrasrv') } @search_dirs;
-    return unless @zebrasrv_dirs;
-    # verify that directory that contains zebrasrv also contains zebraidx
-    foreach my $dir (@zebrasrv_dirs) {
-        return $dir if -x File::Spec->catpath('', $dir, 'zebraidx');
-    }
-    return;
-}
-
-package MY;
-
-# This will have to be reworked in order to accommodate Win32...
-
-sub test {
-    my $self = shift;
-    my $test = $self->SUPER::test(@_);
-    $test =~ s!\$\(INST_LIB\)!blib/PERL_MODULE_DIR!g;
-
-    # set KOHA_CONF
-    $test =~ s!\$\(FULLPERLRUN\)!KOHA_CONF=blib/KOHA_CONF_DIR/koha-conf.xml \$(FULLPERLRUN)!g;
-    return $test;
-}
-
-sub install {
-    my $self = shift;
-    my $install = "";
-    # NOTE: we're *not* doing this: my $install = $self->SUPER::install(@_);
-    # This means that we're completely overriding EU::MM's default
-    # installation and uninstallation targets.
-
-# If installation is on Win32, we need to do permissions different from *nix
-    if ( $^O =~ /darwin|linux|cygwin|freebsd|solaris/ ) { # this value needs to be verified for each platform and modified accordingly
-	    foreach my $key (sort keys %$target_directories) {
-		    $install .= qq(
-KOHA_INST_$key = blib/$key
-KOHA_DEST_$key = $target_directories->{$key}
-)			unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-		}
-		$install .= qq(
-install :: all install_koha set_koha_ownership set_koha_permissions warn_koha_env_vars
-\t\$(NOECHO) \$(NOOP)
-);
-			$install .= "install_koha ::\n";
-			$install .= "\t\$(NOECHO) umask 022; \$(MOD_INSTALL) \\\n";
-			foreach my $key (sort keys %$target_directories) {
-				$install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
-					unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-			}
-			$install .= "\t\t\$(INST_MAN1DIR) \$(DESTINSTALLMAN1DIR) \\\n";
-			$install .= "\t\t\$(INST_MAN3DIR) \$(DESTINSTALLMAN3DIR)\n";
-
-			$install .= "\n";
-			$install .= "set_koha_ownership ::\n";
-# Do not try to change ownership if DESTDIR is set
-			if ($config{'INSTALL_MODE'} eq 'standard' and $config{'KOHA_USER'} ne "root") {
-				foreach my $key (sort keys %$target_directories) {
-					$install .= "\t\$(NOECHO) if test -z \"\$(DESTDIR)\"; then chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key); fi\n"
-						unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-				}
-			} else {
-				$install .= "\t\t\$(NOECHO) \$(NOOP)\n\n";
-			}
-
-			$install .= "\n";
-			$install .= "set_koha_permissions ::\n";
-			# This is necessary because EU::MM installs files
-			# as either 0444 or 0555, and we want the owner
-			# of Koha's files to have write permission by default.
-			foreach my $key (sort keys %$target_directories) {
-				$install .= "\t\$(NOECHO) chmod -R u+w \$(KOHA_DEST_$key)\n"
-					unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-			}
-	}
-	elsif ($^O eq 'MSWin32' ) {	# On Win32, the install probably needs to be done under the user account koha will be running as...
-								# We can attempt some creative things with command line utils such as CACLS which allows permission
-								# management from Win32 cmd.exe, but permissions really only apply to NTFS.
-	    foreach my $key (sort keys %$target_directories) {
-		    $install .= qq(
-KOHA_INST_$key = blib/$key
-KOHA_DEST_$key = $target_directories->{$key}
-)			unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-		}
-		$install .= qq(
-install :: all install_koha warn_koha_env_vars
-\t\$(NOECHO) \$(NOOP)
-);
-		$install .= "install_koha ::\n";
-		$install .= "\t\$(MOD_INSTALL) \\\n";
-		foreach my $key (sort keys %$target_directories) {
-			$install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
-				unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
-		}
-	}
-	$install .= "\n";
-
-    $install .= "warn_koha_env_vars ::\n";
-    $install .= "\t\$(NOECHO) \$(ECHO)\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) Koha\\'s files have now been installed. \n";
-    $install .= "\t\$(NOECHO) \$(ECHO)\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) In order to use Koha\\'s command-line batch jobs,\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) you should set the following environment variables:\n";
-    $install .= "\t\$(NOECHO) \$(ECHO)\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) export KOHA_CONF=\$(KOHA_DEST_KOHA_CONF_DIR)/koha-conf.xml\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) export PERL5LIB=$target_directories->{'PERL_MODULE_DIR'}\n";
-    $install .= "\t\$(NOECHO) \$(ECHO)\n";
-    $install .= "\t\$(NOECHO) \$(ECHO) For other post-installation tasks, please consult the README.\n";
-    $install .= "\t\$(NOECHO) \$(ECHO)\n";
-
-    if ($config{'INSTALL_ZEBRA'} eq "yes") {
-        $install .= _update_zebra_conf_target();
-    }
-
-    $install .= upgrade();
-
-    return $install;
-}
-
-=head2 _update_zebra_conf_target
-
-Add an installation target for updating
-Zebra's configuration files.
-
-=cut
-
-sub _update_zebra_conf_target {
-
-    my $target = "\nupdate_zebra_conf ::\n";
-    $target .= "\tumask 022; \$(MOD_INSTALL) \\\n";
-    $target .= "\t\t\$(KOHA_INST_ZEBRA_CONF_DIR) \$(KOHA_DEST_ZEBRA_CONF_DIR) \n";
-    $target .= "\t\$(NOECHO) chmod -R u+w \$(KOHA_DEST_ZEBRA_CONF_DIR)\n" unless $^O eq "MSWin32";
-    $target .= "\tumask 022; \$(MOD_INSTALL) \\\n";
-    $target .= "\t\t\$(KOHA_INST_PAZPAR2_CONF_DIR) \$(KOHA_DEST_PAZPAR2_CONF_DIR) \n";
-    $target .= "\t\$(NOECHO) chmod -R u+w \$(KOHA_DEST_PAZPAR2_CONF_DIR)\n" unless $^O eq "MSWin32";
-
-    return $target;
-}
-
-sub upgrade {
-    my $upgrade = "";
-
-    my $backup_suffix;
-    if (exists $install_log_values{'KOHA_INSTALLED_VERSION'}) {
-        my $version = $install_log_values{'KOHA_INSTALLED_VERSION'};
-        $version =~ s/\./_/g;
-        $backup_suffix = "_koha_$version";
-    } else {
-        $backup_suffix = "_upgrade_backup";
-    }
-
-    $upgrade .= qq/
-MOD_BACKUP = \$(ABSPERLRUN) -Minstall_misc::UpgradeBackup -e 'backup_changed_files({\@ARGV}, '$backup_suffix', '\''\$(VERBINST)'\'', '\''\$(UNINST)'\'');' --
-
-upgrade :: make_upgrade_backup install
-\t\$(NOECHO) \$(NOOP)
-make_upgrade_backup ::
-\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\
-/;
-    foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR
-                     PAZPAR2_CONF_DIR ZEBRA_CONF_DIR/) {
-    	$upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
-            unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or
-                   exists $skip_directories->{$key} or
-                   not exists $target_directories->{$key};
-    }
-    $upgrade =~ s/\\\n$/\n/;
-
-    return $upgrade;
-}
-
-sub postamble {
-    # put directory mappings into Makefile
-    # so that Make will export as environment
-    # variables -- this is for the use of
-    # rewrite-confg.PL
-
-    my $env;
-	# Hereagain, we must alter syntax per platform...
-	if ( $^O eq 'MSWin32' ) {
-		# NOTE: it is imperative that there be no whitespaces in ENV=value...
-		$env = join("\n", map { "__${_}__=$target_directories->{$_}" } keys %$target_directories);
-		$env .= "\n\n";
-		$env .= join("\n", map { "__${_}__=$config{$_}" } keys %config);
-	}
-    else {
-		$env = join("\n", map { "export __${_}__ := $target_directories->{$_}" } keys %$target_directories);
-		$env .= "\n\n";
-		$env .= join("\n", map { "export __${_}__ := $config{$_}" } keys %config);
-	}
-
-    if ( $config{'RUN_DATABASE_TESTS'} eq 'yes' ) {
-        if ( open( my $confhandle, '>', 't/test-config.txt' ) ) {
-            print $confhandle "# This configuration file lets the t/Makefile prepare a test koha-conf.xml file.\n";
-            print $confhandle "# It is generated by the top-level Makefile.PL.\n";
-            print $confhandle "# It is separate from the standard koha-conf.xml so that you can edit this by hand and test with different configurations.\n";
-
-            # these directories will be relocated to the 't' directory
-            foreach my $dirname ( keys %$target_directories ) {
-                my $dir = main::_strip_destdir( $target_directories->{$dirname} );
-                if ( exists $test_suite_override_dirs{$dirname} ) {
-                    $dir = main::get_test_dir($dirname);
-                }
-                print $confhandle "$dirname = $dir\n"
-            }
-            print $confhandle "\n";
-
-            print $confhandle join( "\n", map { "$_ = $config{$_}" } keys( %config ) ), "\n";
-            close( $confhandle );
-        } else {
-            warn 'unable to open conf file for database dependent tests: $!';
-        }
-
-    }
-    return "$env\n";
-}
-
-
-__END__
-
-
-=head1 SEE ALSO
-
-ExtUtils::MakeMaker(3)
-
-=head1 AUTHORS
-
-MJ Ray mjr at phonecoop.coop
-Galen Charlton galen.charlton at liblime.com
-
-=cut
-
-FIXME: deal with .htaccess
diff --git a/README b/README
deleted file mode 100644
index beb937a..0000000
--- a/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Koha is a free software integrated library system.
-
-Koha is distributed under the GNU GPL version 2 or later.
-Please read the file LICENSE for more details.
-
-To install or upgrade Koha, please see the INSTALL file appropriate
-to your platform.
-
-Report bugs at http://bugs.koha-community.org/
-
-Visit the Koha Project website at http://www.koha-community.org/
diff --git a/README.robots b/README.robots
deleted file mode 100644
index a08371d..0000000
--- a/README.robots
+++ /dev/null
@@ -1,18 +0,0 @@
-The robots.txt file.
-
-Search engines, when looking for sites to show in search results, will first
-look for the file /robots.txt.  If this file is found and has lines that apply
-to them they will do as instructed.  A very basic robots.txt follow as an
-example:
-
-# go away
-User-agent: *
-Disallow: /
-
-This tells every search engine that cares (User-agent: *) to not index the site
-(Disallow everything past /).
-
-If you have installed Koha to /usr/local/koha3 then this file would be placed
-in the directory /usr/local/koha3/opac/htdocs/.  This should prevent search
-engines from browsing every biblio record, and every view of each record, on
-your Koha install periodically.
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index c26f3a9..c7c7387 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -191,6 +191,7 @@ exit 0;
 sub default_form {
 	# build categories list
 	my $sth = $dbh->prepare("select distinct category from authorised_values");
+	my $ownbranch = C4::Branch->mybranch();
 	$sth->execute;
 	my @category_list;
 	my %categories;     # a hash, to check that some hardcoded categories exist.
@@ -219,6 +220,9 @@ sub default_form {
     my $count = scalar(@$results);
 	my @loop_data = ();
 	# builds value list
+	
+	
+	
 	for (my $i=0; $i < $count; $i++){
 		my %row_data;  # get a fresh hash for the row data
 		$row_data{category}              = $results->[$i]{'category'};
@@ -228,8 +232,18 @@ sub default_form {
 		$row_data{imageurl}              = getitemtypeimagelocation( 'intranet', $results->[$i]{'imageurl'} );
 		$row_data{edit}                  = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'}."&amp;offset=$offset";
 		$row_data{delete}                = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'}."&amp;offset=$offset";
-		push(@loop_data, \%row_data);
+ if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+		   if (substr($row_data{authorised_value},0,4) eq $ownbranch . '.')
+		   {
+		     push(@loop_data, \%row_data);
+	           }
+            }
+            else {
+                     push(@loop_data, \%row_data);		
+	         }
 	}
+	
 
 	$template->param( loop     => \@loop_data,
                           tab_list => $tab_list,
diff --git a/admin/branches.pl b/admin/branches.pl
index 5c71b0c..9687c24 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -310,6 +310,7 @@ sub branchinfotable {
 
     my ($branchcode,$innertemplate) = @_;
     my $branchinfo = $branchcode ? GetBranchInfo($branchcode) : GetBranchInfo();
+    my $ownbranch = C4::Branch->mybranch();
     my @loop_data = ();
     foreach my $branch (@$branchinfo) {
         #
@@ -369,7 +370,18 @@ sub branchinfotable {
         $row{'branch_code'} = $branch->{'branchcode'};
         $row{'value'}       = $branch->{'branchcode'};
 
-        push @loop_data, \%row;
+           if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+                   if ($branch->{'branchcode'} eq $ownbranch)
+                   {
+                     push @loop_data, \%row;
+                   }
+           }
+             else
+             {
+               push @loop_data, \%row;
+             }
+          
     }
     my @branchcategories = ();
 	for my $ctype ( GetCategoryTypes() ) {
diff --git a/admin/categorie.pl b/admin/categorie.pl
index 576d7ca..2178f90 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -67,7 +67,6 @@ my $searchfield=$input->param('description');
 my $script_name="/cgi-bin/koha/admin/categorie.pl";
 my $categorycode=$input->param('categorycode');
 my $op = $input->param('op');
-
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/categorie.tmpl",
 			     query => $input,
@@ -194,6 +193,8 @@ if ($op eq 'add_form') {
 } else { # DEFAULT
 	$template->param(else => 1);
 	my @loop;
+	my $ownbranch = C4::Branch->mybranch();
+	    
 	my ($count,$results)=StringSearch($searchfield,'web');
 	for (my $i=0; $i < $count; $i++){
 		my %row = (
@@ -214,7 +215,16 @@ if ($op eq 'add_form') {
             my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'});
             $row{messaging_prefs} = $brief_prefs if @$brief_prefs;
         }
-		push @loop, \%row;
+            
+             if ( C4::Context->preference("searchMyLibraryOnly")  )
+             {
+		      if (substr($row{'categorycode'},0,4) eq $ownbranch . '.')
+		      {
+            	        push @loop, \%row;
+	              }
+             }
+             else { push @loop, \%row; }
+	
 	}
 	$template->param(loop => \@loop);
 	# check that I (institution) and C (child) exists. otherwise => warning to the user
diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 1a33a21..5797d12 100755
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -55,12 +55,28 @@ use C4::Output;
 sub StringSearch {
     my ( $searchstring, $type ) = @_;
     my $dbh = C4::Context->dbh;
+    my $ownbranch = C4::Branch->mybranch();
     $searchstring =~ s/\'/\\\'/g;
     my @data = split( ' ', $searchstring );
-    my $sth = $dbh->prepare(
-        "SELECT * FROM itemtypes WHERE (description LIKE ?) ORDER BY itemtype"
+    my $sth;
+    
+    
+     if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+            $sth = $dbh->prepare(
+                   "SELECT * FROM itemtypes WHERE (itemtype LIKE ?) ORDER BY itemtype"
 	);
-    $sth->execute("$data[0]%");
+	    
+    $sth->execute("$ownbranch%");
+           }
+           else {
+                   $sth = $dbh->prepare(
+                   "SELECT * FROM itemtypes WHERE (description LIKE ?) ORDER BY itemtype"
+	        );
+	    
+               $sth->execute("$data[0]%");
+               
+                 }
     return $sth->fetchall_arrayref({});		# return ref-to-array of ref-to-hashes
 								# like [ fetchrow_hashref(), fetchrow_hashref() ... ]
 }
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 03271b4..18d7e8b 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -37,9 +37,10 @@ use C4::External::Amazon;
 use C4::Search;		# enabled_staff_search_views
 use C4::VirtualShelves;
 use C4::XSLT;
-
+use Data::Dumper::Simple;
 # use Smart::Comments;
 
+
 my $query = CGI->new();
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
@@ -159,9 +160,11 @@ my (@itemloop, %itemfields);
 my $norequests = 1;
 my $authvalcode_items_itemlost = GetAuthValCode('items.itemlost',$fw);
 my $authvalcode_items_damaged  = GetAuthValCode('items.damaged', $fw);
+my $ownbranch = C4::Branch->mybranch();
+
 foreach my $item (@items) {
 
-    $item->{homebranch}        = GetBranchName($item->{homebranch});
+    $item->{homebranch}        = GetBranchName($item->{branchcode});
 
     # can place holds defaults to yes
     $norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
@@ -224,7 +227,16 @@ foreach my $item (@items) {
         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
     }
 
-    push @itemloop, $item;
+
+    if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+	       if ($item->{holdingbranch} eq C4::Branch->mybranch())
+	       {
+                 push @itemloop, $item;
+                }
+          } 
+else { push @itemloop, $item;
+}
 }
 
 $template->param( norequests => $norequests );
@@ -282,6 +294,9 @@ foreach ( keys %{$dat} ) {
 # does not work: my %views_enabled = map { $_ => 1 } $template->query(loop => 'EnableViews');
 # method query not found?!?!
 
+
+
+  
 $template->param(
     itemloop        => \@itemloop,
     biblionumber        => $biblionumber,
@@ -289,8 +304,12 @@ $template->param(
     subscriptions       => \@subs,
     subscriptionsnumber => $subscriptionsnumber,
     subscriptiontitle   => $dat->{title},
+   
 );
-
+       
+ 
+	
+  
 # $debug and $template->param(debug_display => 1);
 
 # Lists
@@ -354,3 +373,5 @@ if (C4::Context->preference('OPACBaseURL')){
 }
 
 output_html_with_http_headers $query, $cookie, $template->output;
+
+
diff --git a/catalogue/search.pl b/catalogue/search.pl
index e1e9a98..8c35011 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -150,6 +150,7 @@ use C4::Members qw(GetMember);
 use C4::VirtualShelves qw(GetRecentShelves);
 use POSIX qw(ceil floor);
 use C4::Branch; # GetBranches
+use Data::Dumper::Simple;
 
 my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
 # create a new CGI object
@@ -247,7 +248,7 @@ my @itemtypesloop;
 my $selected=1;
 my $cnt;
 my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
-
+my @newresults1;
 if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {                                                                 foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
     my %row =(  number=>$cnt++,
                 ccl => qq($itype_or_itemtype,phr),
@@ -539,6 +540,9 @@ for (my $i=0;$i<@servers;$i++) {
         my $page = $cgi->param('page') || 0;
         my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
                                        @{$results_hashref->{$server}->{"RECORDS"}});
+                                       
+                                       
+                                       
         $total = $total + $results_hashref->{$server}->{"hits"};
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
@@ -575,7 +579,21 @@ for (my $i=0;$i<@servers;$i++) {
             }
             $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
             $template->param(results_per_page =>  $results_per_page);
-            $template->param(SEARCH_RESULTS => \@newresults);
+            
+my $i;           
+for  $i (0..scalar @newresults)
+{
+    
+    if (substr($newresults[$i]->{holdingbranch},0,3) eq C4::Branch->mybranch())
+    {
+       push @newresults1,$newresults[$i]; 
+      #print 'Holding Branch: ' . $newresults1[$i]->{holdingbranch} . '<br>Mu Branch:' . C4::Branch->mybranch(). '<hr>';
+    }  
+}
+
+           # $total = scalar @newresults1;
+            $template->param(SEARCH_RESULTS => \@newresults1);
+            #@newresults1 = @newresults;
 
             ## FIXME: add a global function for this, it's better than the current global one
             ## Build the page numbers on the bottom of the page
@@ -689,3 +707,17 @@ if (@{$barshelves}) {
 
 
 output_html_with_http_headers $cgi, $cookie, $template->output;
+
+#print Dumper(@newresults1);
+
+print scalar @newresults1;
+my @nr;
+my $i;
+for  $i (0..scalar @newresults1)
+{
+    
+    if (substr($newresults1[$i]->{holdingbranch},0,3) eq C4::Branch->mybranch())
+    {
+      print 'Holding Branch: ' . $newresults1[$i]->{holdingbranch} . '<br>Mu Branch:' . C4::Branch->mybranch(). '<hr>';
+    }  
+}
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index faa9a0a..9950f41 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -34,7 +34,7 @@ use C4::Dates;
 use List::MoreUtils qw/any/;
 
 use MARC::File::XML;
-
+use Data::Dumper::Simple;
 my $dbh = C4::Context->dbh;
 
 sub find_value {
@@ -545,14 +545,29 @@ my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbran
 # First, the existing items for display
 my @item_value_loop;
 my @header_value_loop;
+my $itemloc;
+my $ownbranch = C4::Branch->mybranch();
 for my $row ( @big_array ) {
     my %row_data;
-    my @item_fields = map +{ field => $_ || '' }, @$row{ sort keys(%witness) };
+    my @item_fields = map +{ field => $_ || '' }, @$row{ sort keys(%witness) };    
     $row_data{item_value} = [ @item_fields ];
     $row_data{itemnumber} = $row->{itemnumber};
+    $itemloc = GetItem( $itemnumber );
+    $row_data{location} = $itemloc->{location};    
     #reporting this_row values
     $row_data{'nomod'} = $row->{'nomod'};
-    push(@item_value_loop,\%row_data);
+
+        if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+               $itemloc = C4::Branch::homeBranchFromItem($row_data{itemnumber});
+              
+             
+               if ($itemloc eq $ownbranch)
+               {
+             push(@item_value_loop,\%row_data);
+         }
+           }
+           else { push(@item_value_loop,\%row_data); }
 }
 foreach my $subfield_code (sort keys(%witness)) {
     my %header_value;
@@ -570,6 +585,12 @@ my $onlymine = C4::Context->preference('IndependantBranches') &&
                C4::Context->userenv                           && 
                C4::Context->userenv->{flags}!=1               && 
                C4::Context->userenv->{branch};
+               
+ 
+        if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+               $onlymine = 1;
+            }                 
 my $branches = GetBranchesLoop(C4::Context->userenv->{branch},$onlymine);  # build once ahead of time, instead of multiple times later.
 
 # We generate form, from actuel record
@@ -634,3 +655,5 @@ foreach my $error (@errors) {
     $template->param($error => 1);
 }
 output_html_with_http_headers $input, $cookie, $template->output;
+
+#print Dumper(@loop_data);
diff --git a/fix-perl-path.PL b/fix-perl-path.PL
deleted file mode 100644
index f810840..0000000
--- a/fix-perl-path.PL
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/perl
-# 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
-#
-
-use strict;
-use ExtUtils::MakeMaker::Config;
-use Tie::File;
-
-my $basedir = (shift);
-my $DEBUG = exists $ENV{'DEBUG'} ? $ENV{'DEBUG'} : 0;
-
-$DEBUG = 1 if $basedir eq 'test';
-
-my $bindir = $Config{installbin};
-$bindir =~ s!\\!/!g;	# make all directory separators uniform since Win32 does not care and *nix does...
-my $shebang = "#!$bindir\/perl";
-
-warn "Perl binary located in $bindir on this system.\n" if $DEBUG;
-warn "The shebang line for this sytems should be $shebang\n\n" if $DEBUG;
-
-die if $basedir eq 'test';
-
-=head1 NAME
-
-fix-perl-path.PL - A script to correct the shebang line to match the current platform
-
-=head1 SYNOPSIS
-
-=head2 BASIC USAGE
-
-    perl fix-perl-path.PL /absolute/path/to/foo
-
-=head1 DESCRIPTION
-
-This script should be run from the base of the directory
-structure which contains the file(s) that need the
-shebang line corrected. It will recurse through all
-directories below the one called from and modify all
-.pl files.
-
-=head2 fixshebang
-
-This sub will recurse through a given directory and its subdirectories checking for the existence of a shebang
-line in .pl files and replacing it with the correct line for the current OS if needed. It should be called
-in a manner similar to 'fixshebang (foodir)' but may be supplied with any directory.
-
-=cut
-
-sub fixshebang{
-	my $dir = shift;
-    opendir my $dh, $dir or die $!;
-	warn "Reading $dir contents.\n" if $DEBUG;
-    while( my $file = readdir($dh) ) {
-		# this may be used to exclude any desired files from the scan
-        # if ( $file =~ /foo/ ) { next; }
-		# handle files... other extensions could be substituted/added if needed
-		if ( $file =~ /\.pl$/ ) {
-            my @filearray;
-			my $pathfile =$dir . '/' . $file;
-			warn "Found a perl script named $pathfile\n" if $DEBUG;
-
-            # At this point, file is in 'blib' and by default
-            # has mode a-w.  Therefore, must change permission
-            # to make it writable.  Note that stat and chmod
-            # (the Perl functions) should work on Win32
-            my $old_perm;
-            $old_perm = (stat $pathfile)[2] & 07777;
-            my $new_perm = $old_perm | 0200;
-            chmod $new_perm, $pathfile;
-
-            # tie the file -- note that we're explicitly setting the line (record)
-            # separator to hex 0A (the Unix newline) because that's what
-            # the files copied to blib are using, regardless of whether the install
-            # is under a Unix variant or Windows.
-            tie @filearray, 'Tie::File', $pathfile, recsep => "\x0a" or die $!;
-
-            warn "First line of $file is $filearray[0]\n\n" if $DEBUG;
-			if ( ( $filearray[0] =~ /#!.*perl/ ) && ( $filearray[0] !~ /$shebang|"$shebang -w"/ ) ) {
-				warn "\n\tRe-writing shebang line for $pathfile\n" if $DEBUG;
-                warn "\tOriginal shebang line: $filearray[0]\n" if $DEBUG;
-                $filearray[0] =~ /-w$/ ? $filearray[0] = "$shebang -w" : $filearray[0] = $shebang;
-                warn "\tNew shebang line is: $filearray[0]\n\n" if $DEBUG;
-			}
-            elsif ( $filearray[0] =~ /$shebang|"$shebang -w"/ ) {
-                warn "\n\tShebang line is correct.\n\n" if $DEBUG;
-            }
-			else {
-                warn "\n\tNo shebang line found in $pathfile\n\n" if $DEBUG;
-			}
-            untie @filearray;
-            chmod $old_perm, $pathfile;
-		}
-		# handle directories
-		elsif ( -d ($dir . '/' . $file) && $file !~ /^\.{1,2}/ ) {
-			my $dirpath = $dir . '/' . $file;
-			warn "Found a subdir named $dirpath\n" if $DEBUG;
-			fixshebang ($dirpath);
-		}
-	}
-	closedir $dh;
-}
-
-fixshebang ($basedir);
-
diff --git a/install-CPAN.pl b/install-CPAN.pl
deleted file mode 100644
index 7b775fe..0000000
--- a/install-CPAN.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-# cpan_install.pl - Install prerequisites from CPAN then Koha
-
-($ARGV[0] =~ /koha-.*z/) || die "
- Run this as the CPAN-owning user (usually root) with:
-   perl $0 path/to/koha.tgz
-";
-
-# Copyright 2007 MJ Ray
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Current maintainer MJR http://mjr.towers.org.uk/
-
-# Create a fake CPAN location for koha
-use CPAN;
-CPAN::Config->load;
-$cpan = $CPAN::Config->{cpan_home};
-mkdir $cpan.'/sources/authors/id';
-mkdir $cpan.'/sources/authors/id/K';
-mkdir $cpan.'/sources/authors/id/K/KO';
-mkdir $cpan.'/sources/authors/id/K/KO/KOHA';
-
-# Move the tarball to it
-$koha = $ARGV[0];
-( rename $koha,$cpan.'/sources/authors/id/K/KO/KOHA/'.$koha ) ||
-die 'Cannot move koha distribution into position.
-This may be due to an unconfigured CPAN or running as the wrong user.
-To configure cpan, try perl -MCPAN -e shell
-Installation aborted';
-
-# Start the main CPAN install routine
-CPAN::install('KOHA/'.$koha);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index a2ecc5c..09b696a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -95,3 +95,14 @@ Administration:
         -
             - The CAS Authentication Server can be found at
             - pref: casServerUrl           
+            
+    Search My Library Only:
+        -
+            - pref: searchMyLibraryOnly
+              default: 1
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - Filter Data based on Library.
+  
+            
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 456cacf..95a1c9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -429,7 +429,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 <input type="checkbox" class="selection" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" style="display:none" />
                             </td>
                             <td>
-                                <p>[% SEARCH_RESULT.result_number %].
+                                <p><!--[% SEARCH_RESULT.result_number %]-->
                                  [% biblionumber = SEARCH_RESULT.biblionumber %]
 
 				[% INCLUDE 'biblio-default-view.inc' %]
diff --git a/koha_perl_deps.pl b/koha_perl_deps.pl
deleted file mode 100755
index 934dea5..0000000
--- a/koha_perl_deps.pl
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/perl
-
-use Getopt::Long;
-use Pod::Usage;
-use Term::ANSIColor;
-use FindBin; # we need to enforce which C4::Installer is used in case more than one is installed
-
-use lib $FindBin::Bin;
-
-use C4::Installer::PerlModules;
-
-use strict;
-use warnings;
-
-my $help = 0;
-my $missing = 0;
-my $installed = 0;
-my $upgrade = 0;
-my $all = 0;
-my $color = 0;
-
-GetOptions(
-            'h|help|?'    => \$help,
-            'm|missing'   => \$missing,
-            'i|installed' => \$installed,
-            'u|upgrade'   => \$upgrade,
-            'a|all'       => \$all,
-            'c|color'     => \$color,
-          );
-
-pod2usage(1) if $help || (!$missing && !$installed && !$upgrade && !$all);
-
-my $koha_pm = C4::Installer::PerlModules->new;
-$koha_pm->version_info(all => 1);
-
-my @pm = ();
-
-push @pm, 'missing_pm' if $missing || $all;
-push @pm, 'upgrade_pm' if $upgrade || $all;
-push @pm, 'current_pm' if $installed || $all;
-
-print color 'bold white' if $color;
-print"
-Module Name                                 Current Version                       Required Version         Module Required
---------------------------------------------------------------------------------------------------------------------------
-";
-
-my $count = 0;
-foreach my $type (@pm) {
-    my $mod_type = $type;
-    $mod_type =~ s/_pm$//;
-    my $pm = $koha_pm->get_attr($type);
-    foreach (@$pm) {
-        foreach my $pm (keys(%$_)) {
-            print color 'yellow' if $type eq 'upgrade_pm' && $color;
-            print color 'red' if $type eq 'missing_pm' && $color;
-            print color 'green' if $type eq 'current_pm' && $color;
-            $count++;
-            my $required = ($_->{$pm}->{'required'}?'Yes':'No');
-            my $current_version = ($color ? $_->{$pm}->{'cur_ver'} :
-                                   $type eq 'missing_pm' || $type eq 'upgrade_pm' ? $_->{$pm}->{'cur_ver'}." *" : $_->{$pm}->{'cur_ver'});
-format =
-@<<<<<<<<<<<<<<<<<<<<<<<<<                  @<<<<<<<<<<                           @<<<<<<<<<<              @<<<<<
-$pm,                                        $current_version,                     $_->{$pm}->{'min_ver'},  $required
-.
-write;
-        }
-    }
-}
-print color 'bold white' if $color;
-my $footer = "
---------------------------------------------------------------------------------------------------------------------------
-Total modules reported: $count                                                     ";
-
-if ($color) {
-    $footer .= "\n\n";
-}
-else {
-    $footer .= "* Module is missing or requires an upgrade.\n\n";
-}
-
-print $footer;
-
-1;
-
-__END__
-
-=head1 NAME
-
-koha_perl_deps.pl
-
-=head1 SYNOPSIS
-
-./koha_perl_deps.pl -m
-
-=head1 OPTIONS
-
-=over 8
-
-=item B<-m|--missing>
-
-lists all missing perl modules
-
-=item B<-i|--installed>
-
-lists all installed perl modules
-
-=item B<-u|--upgrade>
-
-lists all perl modules needing to be upgraded relative to Koha
-
-=item B<-a|--all>
-
-lists all koha perl dependencies
-
-=item B<-c|--color>
-
-formats the output in color; red = module is missing, yellow = module requires upgrading, green = module is installed and current
-
-=item B<-h|--help|?>
-
-prints this help text
-
-=back
-
-=head1 AUTHOR
-
-Chris Nighswonger <cnighswonger AT foundations DOT edu>
-
-=head1 COPYRIGHT
-
-Copyright 2010 Foundations Bible College.
-
-=head1 LICENSE
-
-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.
-
-You should have received a copy of the GNU General Public License along
-with Koha; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-=head1 DISCLAIMER OF WARRANTY
-
-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.
-
-=cut
diff --git a/members/member.pl b/members/member.pl
index 2be45bc..d453ac6 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -32,7 +32,7 @@ use C4::Members;
 use C4::Branch;
 use C4::Category;
 use File::Basename;
-
+use Data::Dumper::Simple;
 my $input = new CGI;
 my $quicksearch = $input->param('quicksearch');
 my $startfrom = $input->param('startfrom')||1;
@@ -118,6 +118,7 @@ if ($results) {
 my @resultsdata;
 $to=($count>$to?$to:$count);
 my $index=$from;
+       
 foreach my $borrower(@$results[$from..$to-1]){
   #find out stats
   my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'});
@@ -133,8 +134,20 @@ foreach my $borrower(@$results[$from..$to-1]){
     odissue => "$od/$issue",
     fines =>  sprintf("%.2f",$fines),
     );
+  
+           if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+  if (%row->{branchcode} eq C4::Branch->mybranch())
+  {
   push(@resultsdata, \%row);
-}
+   }               
+ }                
+ else {
+  push(@resultsdata, \%row);	
+ }
+               }
+           
+
 
 if ($$patron{categorycode}){
 	foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){
@@ -155,6 +168,7 @@ my $base_url =
 
 my @letters = map { {letter => $_} } ( 'A' .. 'Z');
 
+
 $template->param(
     letters => \@letters,
     paginationbar => pagination_bar(
@@ -177,3 +191,4 @@ $template->param(
             );
 
 output_html_with_http_headers $input, $cookie, $template->output;
+
diff --git a/members/memberentry.pl b/members/memberentry.pl
index a8e764c..eae3f5d 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -422,9 +422,18 @@ if ($ethnicitycategoriescount>=0) {
 
 my @typeloop;
 my $no_categories = 1;
-my $no_add;
+my ($action,$no_add);
+my $ownbranch = C4::Branch->mybranch();
+
 foreach (qw(C A S P I X)) {
-    my $action="WHERE category_type=?";
+        
+           if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+            $action="WHERE category_type=? and categorycode like '$ownbranch%'";
+          }
+          else {
+                $action="WHERE category_type=?";  
+          }
 	($categories,$labels)=GetborCatFromCatType($_,$action);
     if(scalar(@$categories) > 0){ $no_categories = 0; }
 	my @categoryloop;
@@ -540,8 +549,19 @@ my $onlymine=(C4::Context->preference('IndependantBranches') &&
 my $branches=GetBranches($onlymine);
 my $default;
 my $CGIbranch;
+my $ownbranch = C4::Branch->mybranch();
+
 for my $branch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+           if ( C4::Context->preference("searchMyLibraryOnly")  )
+           { 
+                   if ($branch eq $ownbranch)
+                   {
     push @select_branch,$branch;
+                   }
+    }
+    else {
+                push @select_branch,$branch;
+    }
     $select_branches{$branch} = $branches->{$branch}->{'branchname'};
     $default = C4::Context->userenv->{'branch'} if (C4::Context->userenv && C4::Context->userenv->{'branch'});
 }
diff --git a/misc/cronjobs/crontab.example b/misc/cronjobs/crontab.example
index b43d377..a316f0c 100644
--- a/misc/cronjobs/crontab.example
+++ b/misc/cronjobs/crontab.example
@@ -22,7 +22,7 @@ PERL5LIB=/usr/share/koha/lib
 KOHA_CONF=/etc/koha/koha-conf.xml
 
 # Some additional variables to save you typing
-KOHA_CRON_PATH = /usr/share/koha/bin/cronjobs
+KOHA_CRON_PATH = /home/peter/kohaclone/bin/cronjobs
 #
 # MULTIPLE KOHA SUPPORT:
 # You can still run jobs for this user's additional koha installs, 
diff --git a/rewrite-config.PL b/rewrite-config.PL
deleted file mode 100644
index 7817f91..0000000
--- a/rewrite-config.PL
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 2007 MJ Ray
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Current maintainer MJR http://mjr.towers.org.uk/
-# 
-# 2007/11/12	Added DB_PORT and changed other keywords to reflect multi-dbms support.	-fbcit
-
-use Sys::Hostname;
-use Socket;
-
-=head1 NAME
-
-rewrite-config.PL - helper for the Koha packager and installer
-
-=head1 SYNOPSIS
-
-	perl rewrite-config.PL configurationfile
-
-=head1 DESCRIPTION
-
-This helper script replaces keywords in the
-configuration files with value either supplied through
-the environment (with export, or by putting them on
-the start of the make command line) or with reasonable
-guesses worked out by the script.
-
-=head2 KEYWORDS
-
-The following configuration keywords are available:
-
-PREFIX,
-BASE_DIR, CGI_DIR, LOG_DIR, INSTALL_BASE,
-DB_TYPE, DB_HOST, DB_PORT, DB_NAME, DB_PASS, DB_USER, WEBMASTER_EMAIL, WEBSERVER_DOMAIN,
-WEBSERVER_HOST, WEBSERVER_IP, WEBSERVER_PORT, WEBSERVER_PORT_LIBRARIAN, ZEBRA_PASS, ZEBRA_USER
-
-=head1 EXAMPLES
-
-To override the guessed hostname and email address, run:
-
-	WEBSERVER_HOST=mysecrethostname.com.invalid \
-	WEBMASTER_EMAIL=webmaster at publichost.com make install
-
-Note that if WEBSERVER_HOST does not resolve to an IP address, you will
-also need to override WEBSERVER_IP.
-
-=cut
-
-if ( $myhost = $ENV{WEBSERVER_HOST} || hostname ) {
-    ( $mydomain = $myhost ) =~ s/.*?\.//;
-} else {
-    $myhost   = 'localhost';
-    $mydomain = 'localdomain';
-}
-
-unless ( $myip = $ENV{WEBSERVER_IP} ) {
-    my $byname = gethostbyname( $myhost )
-	or die "Could not get the IP address of $myhost, DNS fault? ($!)";
-    $myip = inet_ntoa $byname
-	or die "can't inet_ntoa ($!)";
-}
-
-
-$prefix = $ENV{'INSTALL_BASE'} || "/usr";
-
-# These are our configuration guesses
-# Keys were extracted by
-# <grep -o '__.*__' etc/* | cut -f2 -d: | sort -u | sed -e 's/^/  "/;s/$/" => "",/'
-%configuration = (
-  "__KOHA_INSTALLED_VERSION__" => "no_version_found",
-  "__LOG_DIR__" => "/var/log",
-  "__DB_TYPE__" => "mysql",
-  "__DB_NAME__" => "koha",
-  "__DB_HOST__" => $myhost,
-  "__DB_PORT__" => "3306",
-  "__DB_USER__" => "kohaadmin",
-  "__DB_PASS__" => "katikoan",
-  "__WEBMASTER_EMAIL__" => 'webmaster@'.$mydomain,
-  "__WEBSERVER_DOMAIN__" => $mydomain,
-  "__WEBSERVER_HOST__" => $myhost,
-  "__WEBSERVER_IP__" => $myip,
-  "__WEBSERVER_PORT__" => "80",
-  "__WEBSERVER_PORT_LIBRARIAN__" => "8080",
-  "__ZEBRA_SRU_HOST__" => $myhost,
-  "__ZEBRA_SRU_BIBLIOS_PORT__" => "9998",
-  "__ZEBRA_SRU_AUTHORITIES_PORT__" => "9999",
-  "__KOHA_USER__" => "koha",
-  "__KOHA_GROUP__" => "koha",
-  "__ZEBRA_PASS__" => "zebrastripes",
-  "__ZEBRA_USER__" => "kohauser",
-  '__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",
-  '__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",
-  '__INTRANET_WWW_DIR__' => "$prefix/intranet/www",
-  '__OPAC_CGI_DIR__' => "$prefix/opac/cgi-bin",
-  '__OPAC_TMPL_DIR__' => "$prefix/opac/templates",
-  '__OPAC_WWW_DIR__' => "$prefix/opac/www",
-  '__PERL_MODULE_DIR__' =>  ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
-  '__KOHA_CONF_DIR__' => "$prefix/etc/koha",
-  '__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb",
-  '__PAZPAR2_CONF_DIR__' => "$prefix/etc/koha/pazpar2",
-  '__MISC_DIR__' => "$prefix/misc",
-  '__SCRIPT_DIR__' => "$prefix/bin",
-  '__MAN_DIR__' => "$prefix/man",
-  '__DOC_DIR__' => "$prefix/doc",
-  '__ZEBRA_LOCK_DIR__' => "$prefix/var/lock/zebradb",
-  '__ZEBRA_DATA_DIR__' => "$prefix/var/lib/zebradb",
-  '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
-  '__ZEBRA_MARC_FORMAT__' => 'marc21',
-  '__ZEBRA_LANGUAGE__' => 'en',
-  '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
-  '__AUTH_RETRIEVAL_CFG__' => 'retrieval-info-auth-grs1.xml',
-  "__MERGE_SERVER_HOST__" => $myhost,
-  "__MERGE_SERVER_PORT__" => '11001',
-  "__PAZPAR2_HOST__" => $myhost,
-  "__PAZPAR2_PORT__" => '11002',
-  "__INSTALL_MODE__" => 'standard',
-  "__INSTALL_BASE__" => '/usr/share/koha',
-  "__INSTALL_ZEBRA__" => 'yes',
-  "__INSTALL_SRU__" => 'yes',
-  "__INSTALL_PAZPAR2__" => 'no',
-  "__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
-  "__PAZPAR2_TOGGLE_XML_POST__" => '-->',
-  "__AUTH_INDEX_MODE__" => 'grs1',
-  "__RUN_DATABASE_TESTS__" => 'no',
-  "__PATH_TO_ZEBRA__" => "",
-  "__USE_MEMCACHED__" => 'no',
-  "__MEMCACHED_SERVERS__" => "",
-  "__MEMCACHED_NAMESPACE__" => "",
-);
-
-# Override configuration from the environment
-foreach $key (keys %configuration) {
-  if (defined($ENV{$key})) {
-    $configuration{$key} = $ENV{$key};
-  }
-}
-
-# munge commenting out the PazPar2 mergeserver
-# entry in koha-conf.xml if necessary
-if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
-    $configuration{'__PAZPAR2_TOGGLE_XML_PRE__'} = '';
-    $configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';
-}
-
-$fname = $ARGV[0];
-$file = &read_file($fname);
-$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
-
-# At this point, file is in 'blib' and by default
-# has mode a-w.  Therefore, must change permission
-# to make it writable.  Note that stat and chmod
-# (the Perl functions) should work on Win32
-my $old_perm;
-$old_perm = (stat $fname)[2] & 07777;
-my $new_perm = $old_perm | 0200;
-chmod $new_perm, $fname;
-
-open(OUTPUT,">$fname") || die "Can't open $fname for write: $!";
-print OUTPUT $file;
-close(OUTPUT);
-
-chmod $old_perm, $fname;
-
-# Idea taken from perlfaq5
-sub read_file($) {
-  local(*INPUT,$/);
-  open(INPUT,$_[0]) || die "Can't open $_[0] for read";
-  my $file = <INPUT>;
-  return $file;
-}
-
-__END__
-
-
-=head1 SEE ALSO
-
-Makefile.PL, ExtUtils::MakeMaker(3)
-
-=head1 AUTHOR
-
-MJ Ray mjr at phonecoop.coop
-
-=cut
-- 
1.7.4.1


From peter at oslo.ie  Fri Jun 10 14:54:25 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:54:25 +0100
Subject: [Koha-patches] [PATCH 3/4] This is the file users are re-directed
	to if they have not chosen a library. Users are required to
	eithr log in or choose a library. Choosing a library
	effectively logs the user into the respective branch with a
	guest account
In-Reply-To: <1307710466-14605-1-git-send-email-peter@oslo.ie>
References: <Scooter>
 <1307710466-14605-1-git-send-email-peter@oslo.ie>
Message-ID: <1307710466-14605-3-git-send-email-peter@oslo.ie>

---
 index.htm |  131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 131 insertions(+), 0 deletions(-)
 create mode 100755 index.htm

diff --git a/index.htm b/index.htm
new file mode 100755
index 0000000..30a4b1e
--- /dev/null
+++ b/index.htm
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>Scooter Online Library System</title>
+ 
+    <meta name="MSSmartTagsPreventParsing" content="true" />
+    <link id="theme" rel="stylesheet" type="text/css" href="style.css" title="theme" />
+<script type="text/javascript" language="javascript" src="js/addon.js"></script>
+<script type="text/javascript" language="javascript" src="js/custom.js"></script>
+  </head>
+  <body bgcolor="#E0E0E"> 
+    <!-- top wrapper -->  
+   
+      <div id="topSlideshowWrapper"> 
+        <div id="sliderContainer"> 
+          <!-- YOUR SLIDESHOW IMAGES HERE (recommended size 920x300) -->  
+          <div id="slider1"> 
+            <ul id="slider1Content">
+              <li class="slider1Image"> 
+                <a href="http://www.oslo.ie" title="Koha Customisation" target="_blank" shape="rect"> 
+                  <img height=150 src="http://lh3.ggpht.com/_d6vKxl1jKWk/TB3zMhUnzMI/AAAAAAABdS4/nemUV17L-Hs/modern-living-room3.jpg" />  
+                  <span class="bottom" style="display: inline;"> 
+                    <strong><marquee  BEHAVIOR=SLIDE scrollamount=20>Scooter - The ILS System for Schools</marquee></strong>  
+                    <br clear="none" /> Welcome to the Scooter College and School Library System<br/>Please log in or choose a library below.
+                  </span> 
+                </a> 
+              </li>
+              <li class="slider1Image"> 
+               <a href="http://www.oslo.ie" title="Koha Customisation" target="_blank" shape="rect"> 
+                  <img height=150 src="http://lh3.ggpht.com/_d6vKxl1jKWk/TB3zMnU7nHI/AAAAAAABdS0/myp5MJEdwpg/modern-living-room2.jpg" />  
+                   <span class="bottom" style="display: inline;"> 
+                    <strong><marquee  BEHAVIOR=SLIDE scrollamount=20>Scooter - The ILS System for Schools</marquee></strong>  
+                    <br clear="none" /> Welcome to the Scooter College and School Library System<br/>Please log in or choose a library below.
+                  </span> 
+                </a> 
+              </li>
+              <li class="slider1Image"> 
+                  <a href="http://www.oslo.ie" title="Koha Customisation" target="_blank" shape="rect"> 
+                  <img height=150 src="http://lh4.ggpht.com/_d6vKxl1jKWk/TB3zMTbFkvI/AAAAAAABdSw/gGYdOwDX2SQ/modern-living-room1.jpg" />  
+                   <span class="bottom" style="display: inline;"> 
+                    <strong><marquee  BEHAVIOR=SLIDE scrollamount=20>Scooter - The ILS System for Schools</marquee></strong>  
+                    <br clear="none" /> Welcome to the Scooter College and School Library System<br/>Please log in or choose a library below.
+                  </span> 
+                </a> 
+              </li>
+              <li class="slider1Image" style="clear:both"></li>
+            </ul>  
+            <div id="sliderLeftMask"></div>  
+            <div id="sliderRightMask"></div> 
+          </div> 
+        </div> 
+      </div> 
+    </div>  
+    <!-- end top wrapper -->  
+    <div id="wrapper"> 
+      <div id="container"> 
+        <!--  content -->  
+        <div id="content"> 
+          <div style="margin-top:20px;"> 
+            <div id="main"> 
+              <h1>Welcome to Scooter</h1>  
+              <p> 
+                <p><!--<img SRC="http://www.gonzaga.ie/images/stories/simpleslideshow/jackfitzpatrick.jpg">--> </p>  
+              <h2>Please choose a library Below</h2>  
+              <p> 
+                <p><FORM METHOD="POST" ACTION="http://scooterdev.local/cgi-bin/koha/opac-main.pl"><SELECT NAME = "library">
+                <option value="AVO">Avondale Community College</option>
+                <option value="GON">Gonzaga College S.J.</option>
+                <option value="SPG">Saint Paul's School, Greenhills</option>
+                       </p> 
+                <input type="submit" name="submit" value="Choose">
+                </form>
+                       </p> 
+            </div>  
+            <div id="sidebar" style='float:right'> 
+              <div class="bloc rounded" style="margin-top:20px;"> 
+                <h3>Scooter Library system</h3>  
+                <p>
+                </p> 
+                <br/><br/>
+                Please choose your library or log in below<br/>
+                <form name=login method=post>Username: <input name=user><br>Password: <input type=password><br>
+                <input type=submit name = login value = 'LogIn'></form>
+              </div>  
+              <div class="bloc rounded" style="margin-top:20px;"> 
+                <h3>Latest news</h3>  
+                <p><b>Koha 3.4 Released<br>
+<em>by Chris Cormack</em></b><br/>
+<br/>
+Kia ora tatou
+<br/><br/>
+"<i><quote>The Koha development team is happy to announce the release of Koha 3.4.0.</quote></i>"
+<br/>
+Koha 3.4.0 is a major feature release that contains major changes to underlying architecture (adoption of Template::Toolkit for templating) and performance enhancements (removal of item data from biblio records).
+<br/>
+These changes, in addition to the inclusion of many new features, mean a lot of new strings for translators to translate.
+<br/>
+For these reasons we recommend that people who are already running Koha inproduction delay their upgrade until 3.4.1, due May 22, to give the translators time to finish, and for the removing of item data to be streamlined. If you do wish to upgrade please make sure you read the UPGRADE section of the INSTALL document.
+<br/>
+The development team would like to thank all the people who have made this release possible. Please take time to read the release notes.
+
+</div>  
+          <div class="clear"></div> 
+        </div>  
+        <!-- end content -->  
+        <div class="clear" style="height:40px"></div> 
+      </div>  
+      <!-- end container --> 
+    </div>  
+    <div id="bottomWrapper"> 
+      <div id="footer"> 
+  
+          
+          
+              <a href="#" shape="rect">Who are we</a>
+           |
+              <a href="#" shape="rect">What we do</a>
+           |
+              <a href="#" shape="rect">Contact</a>
+           |
+              <a href="#" shape="rect">Partners</a>
+           |
+              <a href="#" shape="rect">Links</a>
+          
+       
+  
+
+    </div> 
+  </body>
+</html>
-- 
1.7.4.1


From peter at oslo.ie  Fri Jun 10 14:54:26 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:54:26 +0100
Subject: [Koha-patches] [PATCH 4/4] Bug 5806: This is my initial baseline
	commit. mod is driven by a system pref called
	searchMyLibraryOnly. If it is on then all data not in the
	logged in users home branch should be filtered (hidden). This
	system was designed with schools in mind so that several
	schools can share one library,
	effectively becoming one branch of the library. Not quite a
	consortium but inspired by the basic idea of a consortium.
In-Reply-To: <1307710466-14605-1-git-send-email-peter@oslo.ie>
References: <Scooter>
 <1307710466-14605-1-git-send-email-peter@oslo.ie>
Message-ID: <1307710466-14605-4-git-send-email-peter@oslo.ie>

---
 catalogue/search.pl                                |   36 +------------------
 circ/overdue.pl                                    |    9 +++++
 koha-tmpl/index.html                               |    6 ---
 .../prog/en/modules/catalogue/results.tt           |   12 ++++---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    3 ++
 mainpage.pl                                        |    6 +++
 opac/opac-main.pl                                  |   35 ++++++++++++++++++-
 opac/opac-search.pl                                |   19 ++++++++++
 opac/opac-user.pl                                  |   14 ++++++++
 9 files changed, 93 insertions(+), 47 deletions(-)
 delete mode 100644 koha-tmpl/index.html
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 8c35011..e1e9a98 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -150,7 +150,6 @@ use C4::Members qw(GetMember);
 use C4::VirtualShelves qw(GetRecentShelves);
 use POSIX qw(ceil floor);
 use C4::Branch; # GetBranches
-use Data::Dumper::Simple;
 
 my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
 # create a new CGI object
@@ -248,7 +247,7 @@ my @itemtypesloop;
 my $selected=1;
 my $cnt;
 my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
-my @newresults1;
+
 if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {                                                                 foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
     my %row =(  number=>$cnt++,
                 ccl => qq($itype_or_itemtype,phr),
@@ -540,9 +539,6 @@ for (my $i=0;$i<@servers;$i++) {
         my $page = $cgi->param('page') || 0;
         my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
                                        @{$results_hashref->{$server}->{"RECORDS"}});
-                                       
-                                       
-                                       
         $total = $total + $results_hashref->{$server}->{"hits"};
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
@@ -579,21 +575,7 @@ for (my $i=0;$i<@servers;$i++) {
             }
             $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
             $template->param(results_per_page =>  $results_per_page);
-            
-my $i;           
-for  $i (0..scalar @newresults)
-{
-    
-    if (substr($newresults[$i]->{holdingbranch},0,3) eq C4::Branch->mybranch())
-    {
-       push @newresults1,$newresults[$i]; 
-      #print 'Holding Branch: ' . $newresults1[$i]->{holdingbranch} . '<br>Mu Branch:' . C4::Branch->mybranch(). '<hr>';
-    }  
-}
-
-           # $total = scalar @newresults1;
-            $template->param(SEARCH_RESULTS => \@newresults1);
-            #@newresults1 = @newresults;
+            $template->param(SEARCH_RESULTS => \@newresults);
 
             ## FIXME: add a global function for this, it's better than the current global one
             ## Build the page numbers on the bottom of the page
@@ -707,17 +689,3 @@ if (@{$barshelves}) {
 
 
 output_html_with_http_headers $cgi, $cookie, $template->output;
-
-#print Dumper(@newresults1);
-
-print scalar @newresults1;
-my @nr;
-my $i;
-for  $i (0..scalar @newresults1)
-{
-    
-    if (substr($newresults1[$i]->{holdingbranch},0,3) eq C4::Branch->mybranch())
-    {
-      print 'Holding Branch: ' . $newresults1[$i]->{holdingbranch} . '<br>Mu Branch:' . C4::Branch->mybranch(). '<hr>';
-    }  
-}
diff --git a/circ/overdue.pl b/circ/overdue.pl
index 18851a6..6e6aa4f 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -262,6 +262,12 @@ if ($noreport) {
     LEFT JOIN biblio      ON (biblio.biblionumber=items.biblionumber )
     WHERE 1=1 "; # placeholder, since it is possible that none of the additional
                  # conditions will be selected by user
+    
+ if (C4::Context->preference("searchMyLibraryOnly"))
+ {   
+    $strsth.=" AND issues.branchcode = '" . C4::Branch->mybranch() . "' ";
+  }  
+    
     $strsth.=" AND date_due               < '" . $todaysdate     . "' " unless ($showall);
     $strsth.=" AND (borrowers.firstname like '".$bornamefilter."%' or borrowers.surname like '".$bornamefilter."%' or borrowers.cardnumber like '".$bornamefilter."%')" if($bornamefilter) ;
     $strsth.=" AND borrowers.categorycode = '" . $borcatfilter   . "' " if $borcatfilter;
@@ -301,6 +307,7 @@ if ($noreport) {
             push @patron_attr_value_loop, { value => join(', ', sort { lc $a cmp lc $b } @displayvalues) };
         }
 
+
         push @overduedata, {
             duedate                => format_date($data->{date_due}),
             borrowernumber         => $data->{borrowernumber},
@@ -404,3 +411,5 @@ sub build_csv {
 
     return join("\n", @lines) . "\n";
 }
+
+
diff --git a/koha-tmpl/index.html b/koha-tmpl/index.html
deleted file mode 100644
index 5194d5b..0000000
--- a/koha-tmpl/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-<a href="intranet.html">Intranet</a>
-<a href="opac.html">OPAC</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 95a1c9a..11f2cf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -505,20 +505,22 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
 
                                     [% IF ( SEARCH_RESULT.availablecount ) %]
                                     [% SEARCH_RESULT.availablecount %] available:
-                                    <ul>
+                                    <!-- <ul>
                                     [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
 
                                         [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %][% IF ( available_items_loo.imageurl ) %]<li style="list-style: none; list-style-type: none;"><img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />[% ELSE %]<li>[% END %][% ELSE %]<li>[% END %][% END %]
-                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
+                                       [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
                                         [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
                                         [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
                                         ([% available_items_loo.count %])</li>
-                                    [% END %]</ul>
+                                        
+                                        
+                                    [% END %]</ul> -->
                                     [% END %]
 
                                    [% IF ( SEARCH_RESULT.onloancount ) %]
                                    <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
-                                    <ul>
+                                   <!-- <ul>
                                     [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
                                         [% IF ( onloan_items_loo.imageurl ) %]
@@ -530,7 +532,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
                                         [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %]
                                         ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li>
-                                    [% END %]</ul>
+                                    [% END %]</ul> -->
                                     [% END %]
 
                                     [% IF ( SEARCH_RESULT.othercount ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
old mode 100644
new mode 100755
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
old mode 100644
new mode 100755
index 58c6fa5..26c8670
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -67,6 +67,9 @@ $.tablesorter.addParser({
             });
 //]]>
 </script>
+[% IF (redirect) %]
+<script>location.href='/cgi-bin/koha/opac-main.pl'</script>
+[% END %]
 </head>
 <body id="opac-user">
 <div id="doc3" class="yui-t1">
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
diff --git a/mainpage.pl b/mainpage.pl
index 6a0c1af..dfeb6fc 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -24,6 +24,9 @@ use C4::Auth;
 use C4::AuthoritiesMarc;
 use C4::Koha;
 use C4::NewsChannels;
+use Data::Dumper::Simple;
+
+
 my $query     = new CGI;
 my $authtypes = getauthtypes;
 my @authtypesloop;
@@ -65,3 +68,6 @@ $template->param(
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
+
+
+
diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index 177d812..aeba92b 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -19,6 +19,7 @@
 use strict;
 use warnings;
 use CGI;
+use CGI::Session;
 use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::VirtualShelves;
@@ -27,9 +28,13 @@ use C4::Members;         # GetMember
 use C4::NewsChannels;    # get_opac_news
 use C4::Acquisition;     # GetRecentAcqui
 use C4::Languages qw(getTranslatedLanguages accept_language);
+use Data::Dumper::Simple;
+
+
+my $input  = new CGI;
+my $dbh    = C4::Context->dbh;
+my $branch; # = C4::Context->userenv->{branch};
 
-my $input = new CGI;
-my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
@@ -47,6 +52,8 @@ $template->param(
 );
 
 
+
+
 my $borrower = GetMember( borrowernumber=>$borrowernumber );
 $template->param(
     textmessaging        => $borrower->{textmessaging},
@@ -95,4 +102,28 @@ if (C4::Context->preference('GoogleIndicTransliteration')) {
         $template->param('GoogleIndicTransliteration' => 1);
 }
 
+
+if (defined $input->param("library"))
+{
+    C4::Context->userenv->{branch} = $input->param("library");
+    $template->param(branch=>C4::Context->userenv->{branch});
+     my $session = C4::Auth::get_session("");
+                   C4::Context->set_userenv($session->param('branch',$input->param("library")));
+  
+}
+
+my $xx;
+if ($template->{VARS}{loggedinusername} eq '')
+{
+   
+      print $input->redirect("/index.htm");  
+}
+
+
 output_html_with_http_headers $input, $cookie, $template->output;
+
+
+
+
+
+
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 68018b6..df7fd0e 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -39,6 +39,7 @@ use C4::Branch; # GetBranches
 use POSIX qw(ceil floor strftime);
 use URI::Escape;
 use Storable qw(thaw freeze);
+use Data::Dumper::Simple;
 
 
 my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
@@ -46,6 +47,7 @@ my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
 # FIXME: no_undef_params needs to be tested
 use CGI qw('-no_undef_params');
 my $cgi = new CGI;
+my @newresults1;
 
 BEGIN {
 	if (C4::Context->preference('BakerTaylorEnabled')) {
@@ -462,6 +464,7 @@ for (my $i=0;$i<@servers;$i++) {
             @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan,
                                         @{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems'));
         }
+        @newresults1 = @newresults;
 		my $tag_quantity;
 		if (C4::Context->preference('TagsEnabled') and
 			$tag_quantity = C4::Context->preference('TagsShowOnList')) {
@@ -674,3 +677,19 @@ if (C4::Context->preference('GoogleIndicTransliteration')) {
 }
 
 output_with_http_headers $cgi, $cookie, $template->output, $content_type;
+
+#print Dumper(@newresults1);
+
+foreach (@newresults1) {
+				my $bibnum = $_->{biblionumber} or next;
+				$_->{itemsissued} = CountItemsIssued( $bibnum );
+				$_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
+										 });
+
+			}
+			
+			print C4::Branch->mybranch();
+			#print Dumper($template);
+			
+			
+			#print Dumper($template);
\ No newline at end of file
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index a2f7d9b..5a5355f 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -35,6 +35,7 @@ use C4::Items;
 use C4::Dates qw/format_date/;
 use C4::Letters;
 use C4::Branch; # GetBranches
+use Data::Dumper::Simple;
 
 use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
 
@@ -64,6 +65,8 @@ my $patronupdate = $query->param('patronupdate');
 # get borrower information ....
 my ( $borr ) = GetMemberDetails( $borrowernumber );
 
+
+
 for (qw(dateenrolled dateexpiry dateofbirth)) {
     ($borr->{$_}) and $borr->{$_} = format_date($borr->{$_});
 }
@@ -323,5 +326,16 @@ $template->param(
     dateformat    => C4::Context->preference("dateformat"),
 );
 
+
+
+
+if ($borr->{userid} eq $borr->{branchcode})
+{
+    $template->param(redirect=>1);
+    #print $query->redirect('/cgi-bin/koha/opac-main.pl');    
+}
+
+
 output_html_with_http_headers $query, $cookie, $template->output;
 
+
-- 
1.7.4.1


From oleonard at myacpl.org  Fri Jun 10 21:31:18 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 10 Jun 2011 15:31:18 -0400
Subject: [Koha-patches] [PATCH] Follow-up fix for Bug 5714 Unescaped
	ampersands in OPAC facets
Message-ID: <1307734278-15085-1-git-send-email-oleonard@myacpl.org>

Removing unnecessary query_cgi output
---
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    1 -
 1 files changed, 0 insertions(+), 1 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 2129026..3507880 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -2,7 +2,6 @@
 [% IF ( facets_loop ) %]
 <div id="search-facets">
 <h4>Refine your search</h4>
-[% query_cgi %]
 <ul>
 	<li>Availability<ul><li>[% IF ( available ) %]Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]">Show all items</a>[% ELSE %]Limit to <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=available">currently available items.</a>[% END %]</li></ul>
 	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %]
-- 
1.7.3


From peter at oslo.ie  Fri Jun 10 14:16:47 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Fri, 10 Jun 2011 13:16:47 +0100
Subject: [Koha-patches] [PATCH 1/4] Initial SetUP Test
In-Reply-To: <scooter>
References: <scooter>
Message-ID: <1307708207-14206-1-git-send-email-peter@oslo.ie>

---
 members/moremember.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/moremember.pl b/members/moremember.pl
index b766f2f..2d79dda 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -31,7 +31,7 @@
  needs html removed and to use the C4::Output more, but its tricky
 
 =cut
-
+ 
 use strict;
 #use warnings; FIXME - Bug 2505
 use CGI;
-- 
1.7.4.1


From nengard at bywatersolutions.com  Sat Jun 11 17:58:00 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sat, 11 Jun 2011 11:58:00 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6497: MARC URLs not showing
	up in OPAC detail page with XSLT off
Message-ID: <1307807880-5569-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

Renames T:T variable to match what's exported from opac-detail.pl.

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index ff4b52c..534aeee 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -182,9 +182,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         [% END %]
     </span>[% END %]
 
-    [% IF ( MARCurlS ) %]
+    [% IF ( MARCURLS ) %]
     <div class="results_summary"><span class="label">Online Resources:</span>
-    <ul>    [% FOREACH MARCurl IN MARCurlS %]
+    <ul>    [% FOREACH MARCurl IN MARCURLS %]
         <li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
             <br />[% END %] 
         <!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
-- 
1.7.2.3


From robin at catalyst.net.nz  Tue Jun 14 09:44:03 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Tue, 14 Jun 2011 19:44:03 +1200
Subject: [Koha-patches] [PATCH] Bug 6296: allow users to be authenticated by
	SSL client certs
Message-ID: <1308037443-16412-1-git-send-email-robin@catalyst.net.nz>

This adds a new syspref: AllowPKIAuth. It can have one of three states:
* None
* Common Name
* emailAddress

If a) this is set to something that's not "None", and b) the webserver
is passing SSL client cert details on to Koha, then the relevant field
in the user's certificate will be matched up against the field in the
database and they will be automatically logged in. This is used as a
secure form of single sign-on in some organisations.

The "Common Name" field is matched up against the userid, while
"emailAddress" is matched against the primary email.

This is an example of what might go in the Apache configuration for the
virtual host:

    SSLVerifyClient require
    SSLVerifyDepth 2
    SSLCACertificateFile /etc/apache2/ssl/test/ca.crt
    SSLOptions +StdEnvVars

The last line ensures that the required details are passed to Koha.
---
 C4/Auth.pm                                         |  320 +++++++++++---------
 C4/Members.pm                                      |   29 ++
 acqui/finishreceive.pl                             |    4 +-
 catalogue/updateitem.pl                            |    4 +-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    3 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    3 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    1 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |    9 +
 .../prog/en/modules/admin/preferences/admin.pref   |   11 +-
 members/setstatus.pl                               |    2 +-
 reserve/placerequest.pl                            |    2 +-
 serials/reorder_members.pl                         |    3 +-
 serials/subscription-detail.pl                     |    3 +-
 17 files changed, 245 insertions(+), 157 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index b416449..a0212c9 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -147,6 +147,19 @@ sub get_template_and_user {
     my $borrowernumber;
     my $insecure = C4::Context->preference('insecure');
     if ($user or $insecure) {
+        # It's possible for $user to be the borrowernumber if they don't have a
+        # userid defined (and are logging in through some other method, such
+        # as SSL certs against an email address)
+        $borrowernumber = getborrowernumber($user) if defined($user);
+        if (!defined($borrowernumber) && defined($user)) {
+        	my $borrower = GetMember(borrowernumber => $user);
+        	if ($borrower) {
+            	$borrowernumber = $user;
+                # A bit of a hack, but I don't know there's a nicer way
+                # to do it.
+                $user = $borrower->{firstname} . ' ' . $borrower->{surname};
+            }
+        }
 
         # load the template variables for stylesheets and JavaScript
         $template->param( css_libs => $in->{'css_libs'} );
@@ -177,8 +190,6 @@ sub get_template_and_user {
             $template->param( bartotal  => $total->{'bartotal'}, ) if ($total->{'bartotal'} > scalar @{$barshelves});
         }
 
-        $borrowernumber = getborrowernumber($user) if defined($user);
-
         my ( $borr ) = GetMemberDetails( $borrowernumber );
         my @bordat;
         $bordat[0] = $borr;
@@ -722,154 +733,177 @@ sub checkauth {
     }
     unless ($userid || $sessionID) {
         #we initiate a session prior to checking for a username to allow for anonymous sessions...
-		my $session = get_session("") or die "Auth ERROR: Cannot get_session()";
+        my $session = get_session("") or die "Auth ERROR: Cannot get_session()";
         my $sessionID = $session->id;
-       	C4::Context->_new_userenv($sessionID);
+        C4::Context->_new_userenv($sessionID);
         $cookie = $query->cookie(CGISESSID => $sessionID);
-	    $userid    = $query->param('userid');
-    	    if ($cas || $userid) {
-        	my $password = $query->param('password');
-		my ($return, $cardnumber);
-		if ($cas && $query->param('ticket')) {
-		    my $retuserid;
-		    ( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
-		    $userid = $retuserid;
-		    $info{'invalidCasLogin'} = 1 unless ($return);
-        	} else {
-		    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));
-            	if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
-					$loggedin = 1;
-            	}
-           		else {
-                	$info{'nopermission'} = 1;
-                	C4::Context->_unset_userenv($sessionID);
-            	}
+        $userid    = $query->param('userid');
+        if ($cas || $userid ||
+        	(my $pki_field = C4::Context->preference('AllowPKIAuth')) ne 'None') {
+            my $password = $query->param('password');
+            my ($return, $cardnumber);
+            if ($cas && $query->param('ticket')) {
+                my $retuserid;
+                ( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
+                $userid = $retuserid;
+                $info{'invalidCasLogin'} = 1 unless ($return);
+            } elsif (($pki_field eq 'Common Name' && $ENV{'SSL_CLIENT_S_DN_CN'}) ||
+                ($pki_field eq 'emailAddress' && $ENV{'SSL_CLIENT_S_DN_Email'})) {
+                my $value;
+                if ($pki_field eq 'Common Name') {
+                    $value = $ENV{'SSL_CLIENT_S_DN_CN'};
+                } elsif ($pki_field eq 'emailAddress') {
+                    $value = $ENV{'SSL_CLIENT_S_DN_Email'};
+                    # If we're looking up the email, there's a chance that the person
+                    # doesn't have a userid. So if there is none, we pass along the
+                    # borrower number, and the bits of code that need to know the user
+                    # ID will have to be smart enough to handle that.
+                    my @users_info = GetBorrowersWithEmail($value);
+                    if (@users_info) {
+                        # First the userid, then the borrowernum
+                        $value = $users_info[0][1] || $users_info[0][0];
+                    } else {
+                        undef $value;
+                    }
+                }
+                # 0 for no user, 1 for normal, 2 for demo user.
+                $return = $value ? 1 : 0;
+                $userid = $value;
+            } else {
+                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));
+                if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
+                    $loggedin = 1;
+                }
+                else {
+                    $info{'nopermission'} = 1;
+                    C4::Context->_unset_userenv($sessionID);
+                }
 
-				my ($borrowernumber, $firstname, $surname, $userflags,
-					$branchcode, $branchname, $branchprinter, $emailaddress);
-
-            	if ( $return == 1 ) {
-                	my $select = "
-                	SELECT borrowernumber, firstname, surname, flags, borrowers.branchcode, 
-                    	    branches.branchname    as branchname, 
-                        	branches.branchprinter as branchprinter, 
-                        	email 
-                	FROM borrowers 
-                	LEFT JOIN branches on borrowers.branchcode=branches.branchcode
-                	";
-                	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";
-				}
-			    }
-			}
-                	if ($sth->rows) {
-			    ($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";
-					} else {
-						print STDERR "AUTH_3: no results for userid='$userid', cardnumber='$cardnumber'.\n";
-					}
+                my ($borrowernumber, $firstname, $surname, $userflags,
+                    $branchcode, $branchname, $branchprinter, $emailaddress);
+
+                if ( $return == 1 ) {
+                    my $select = "
+                    SELECT borrowernumber, firstname, surname, flags, borrowers.branchcode, 
+                    branches.branchname    as branchname, 
+                    branches.branchprinter as branchprinter, 
+                    email 
+                    FROM borrowers 
+                    LEFT JOIN branches on borrowers.branchcode=branches.branchcode
+                    ";
+                    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";
+                            }
+                        }
+                    }
+                    if ($sth->rows) {
+                        ($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";
+                    } else {
+                        print STDERR "AUTH_3: no results for userid='$userid', cardnumber='$cardnumber'.\n";
+                    }
 
 # launch a sequence to check if we have a ip for the branch, i
 # if we have one we replace the branchcode of the userenv by the branch bound in the ip.
 
-					my $ip       = $ENV{'REMOTE_ADDR'};
-					# if they specify at login, use that
-					if ($query->param('branch')) {
-						$branchcode  = $query->param('branch');
-						$branchname = GetBranchName($branchcode);
-					}
-					my $branches = GetBranches();
-					if (C4::Context->boolean_preference('IndependantBranches') && C4::Context->boolean_preference('Autolocation')){
-						# we have to check they are coming from the right ip range
-						my $domain = $branches->{$branchcode}->{'branchip'};
-						if ($ip !~ /^$domain/){
-							$loggedin=0;
-							$info{'wrongip'} = 1;
-						}
-					}
-
-					my @branchesloop;
-					foreach my $br ( keys %$branches ) {
-						#     now we work with the treatment of ip
-						my $domain = $branches->{$br}->{'branchip'};
-						if ( $domain && $ip =~ /^$domain/ ) {
-							$branchcode = $branches->{$br}->{'branchcode'};
-
-							# new op dev : add the branchprinter and branchname in the cookie
-							$branchprinter = $branches->{$br}->{'branchprinter'};
-							$branchname    = $branches->{$br}->{'branchname'};
-						}
-					}
-					$session->param('number',$borrowernumber);
-					$session->param('id',$userid);
-					$session->param('cardnumber',$cardnumber);
-					$session->param('firstname',$firstname);
-					$session->param('surname',$surname);
-					$session->param('branch',$branchcode);
-					$session->param('branchname',$branchname);
-					$session->param('flags',$userflags);
-					$session->param('emailaddress',$emailaddress);
-					$session->param('ip',$session->remote_addr());
-					$session->param('lasttime',time());
-					$debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map {$session->param($_)} qw(cardnumber firstname surname branch) ;
-				}
-				elsif ( $return == 2 ) {
-					#We suppose the user is the superlibrarian
-					$borrowernumber = 0;
-					$session->param('number',0);
-					$session->param('id',C4::Context->config('user'));
-					$session->param('cardnumber',C4::Context->config('user'));
-					$session->param('firstname',C4::Context->config('user'));
-					$session->param('surname',C4::Context->config('user'));
-					$session->param('branch','NO_LIBRARY_SET');
-					$session->param('branchname','NO_LIBRARY_SET');
-					$session->param('flags',1);
-					$session->param('emailaddress', C4::Context->preference('KohaAdminEmailAddress'));
-					$session->param('ip',$session->remote_addr());
-					$session->param('lasttime',time());
-				}
-				C4::Context::set_userenv(
-					$session->param('number'),       $session->param('id'),
-					$session->param('cardnumber'),   $session->param('firstname'),
-					$session->param('surname'),      $session->param('branch'),
-					$session->param('branchname'),   $session->param('flags'),
-					$session->param('emailaddress'), $session->param('branchprinter')
-				);
-
-				# Grab borrower's shelves and public shelves and add them to the session
-				# $row_count determines how many records are returned from the db query
-				# and the number of lists to be displayed of each type in the 'Lists' button drop down
-				my $row_count = 10; # FIXME:This probably should be a syspref
-				my ($total, $totshelves, $barshelves, $pubshelves);
-				($barshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(1, $row_count, $borrowernumber);
-				$total->{'bartotal'} = $totshelves;
-				($pubshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(2, $row_count, undef);
-				$total->{'pubtotal'} = $totshelves;
-				$session->param('barshelves', $barshelves);
-				$session->param('pubshelves', $pubshelves);
-				$session->param('totshelves', $total);
-
-				C4::Context::set_shelves_userenv('bar',$barshelves);
-				C4::Context::set_shelves_userenv('pub',$pubshelves);
-				C4::Context::set_shelves_userenv('tot',$total);
-			}
+                    my $ip       = $ENV{'REMOTE_ADDR'};
+                    # if they specify at login, use that
+                    if ($query->param('branch')) {
+                        $branchcode  = $query->param('branch');
+                        $branchname = GetBranchName($branchcode);
+                    }
+                    my $branches = GetBranches();
+                    if (C4::Context->boolean_preference('IndependantBranches') && C4::Context->boolean_preference('Autolocation')){
+                        # we have to check they are coming from the right ip range
+                        my $domain = $branches->{$branchcode}->{'branchip'};
+                        if ($ip !~ /^$domain/){
+                            $loggedin=0;
+                            $info{'wrongip'} = 1;
+                        }
+                    }
+
+                    my @branchesloop;
+                    foreach my $br ( keys %$branches ) {
+                        #     now we work with the treatment of ip
+                        my $domain = $branches->{$br}->{'branchip'};
+                        if ( $domain && $ip =~ /^$domain/ ) {
+                            $branchcode = $branches->{$br}->{'branchcode'};
+
+                            # new op dev : add the branchprinter and branchname in the cookie
+                            $branchprinter = $branches->{$br}->{'branchprinter'};
+                            $branchname    = $branches->{$br}->{'branchname'};
+                        }
+                    }
+                    $session->param('number',$borrowernumber);
+                    $session->param('id',$userid);
+                    $session->param('cardnumber',$cardnumber);
+                    $session->param('firstname',$firstname);
+                    $session->param('surname',$surname);
+                    $session->param('branch',$branchcode);
+                    $session->param('branchname',$branchname);
+                    $session->param('flags',$userflags);
+                    $session->param('emailaddress',$emailaddress);
+                    $session->param('ip',$session->remote_addr());
+                    $session->param('lasttime',time());
+                    $debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map {$session->param($_)} qw(cardnumber firstname surname branch) ;
+                }
+                elsif ( $return == 2 ) {
+                    #We suppose the user is the superlibrarian
+                    $borrowernumber = 0;
+                    $session->param('number',0);
+                    $session->param('id',C4::Context->config('user'));
+                    $session->param('cardnumber',C4::Context->config('user'));
+                    $session->param('firstname',C4::Context->config('user'));
+                    $session->param('surname',C4::Context->config('user'));
+                    $session->param('branch','NO_LIBRARY_SET');
+                    $session->param('branchname','NO_LIBRARY_SET');
+                    $session->param('flags',1);
+                    $session->param('emailaddress', C4::Context->preference('KohaAdminEmailAddress'));
+                    $session->param('ip',$session->remote_addr());
+                    $session->param('lasttime',time());
+                }
+                C4::Context::set_userenv(
+                    $session->param('number'),       $session->param('id'),
+                    $session->param('cardnumber'),   $session->param('firstname'),
+                    $session->param('surname'),      $session->param('branch'),
+                    $session->param('branchname'),   $session->param('flags'),
+                    $session->param('emailaddress'), $session->param('branchprinter')
+                );
+
+                # Grab borrower's shelves and public shelves and add them to the session
+                # $row_count determines how many records are returned from the db query
+                # and the number of lists to be displayed of each type in the 'Lists' button drop down
+                my $row_count = 10; # FIXME:This probably should be a syspref
+                my ($total, $totshelves, $barshelves, $pubshelves);
+                ($barshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(1, $row_count, $borrowernumber);
+                $total->{'bartotal'} = $totshelves;
+                ($pubshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(2, $row_count, undef);
+                $total->{'pubtotal'} = $totshelves;
+                $session->param('barshelves', $barshelves);
+                $session->param('pubshelves', $pubshelves);
+                $session->param('totshelves', $total);
+
+                C4::Context::set_shelves_userenv('bar',$barshelves);
+                C4::Context::set_shelves_userenv('pub',$pubshelves);
+                C4::Context::set_shelves_userenv('tot',$total);
+            }
         	else {
             	if ($userid) {
                 	$info{'invalid_username_or_password'} = 1;
diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..c9db1ae 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -91,6 +91,7 @@ BEGIN {
 		&DeleteMessage
 		&GetMessages
 		&GetMessagesCount
+		GetBorrowersWithEmail
 	);
 
 	#Modify data
@@ -2257,6 +2258,34 @@ sub DeleteMessage {
 
 }
 
+=head2 GetBorrowersWithEmail
+
+    ([$borrnum,$userid], ...) = GetBorrowersWithEmail('me at example.com');
+
+This gets a list of users and their basic details from their email address.
+As it's possible for multiple user to have the same email address, it provides
+you with all of them. If there is no userid for the user, there will be an
+C<undef> there. An empty list will be returned if there are no matches.
+
+=cut
+
+sub GetBorrowersWithEmail {
+    my $email = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $query = "SELECT borrowernumber, userid FROM borrowers WHERE email=?";
+    my $sth=$dbh->prepare($query);
+    $sth->execute($email);
+    my @result = ();
+    while (my $ref = $sth->fetch) {
+        push @result, $ref;
+    }
+    die "Failure searching for borrowers by email address: $sth->errstr" if $sth->err;
+    return @result;
+}
+
+
 END { }    # module clean-up code here (global destructor)
 
 1;
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 71b13d6..f8051ba 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -34,7 +34,9 @@ use List::MoreUtils qw/any/;
 
 my $input=new CGI;
 my $flagsrequired = {acquisition => 'order_receive'};
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet');
+
+checkauth($input, 0, $flagsrequired, 'intranet');
+
 my $user=$input->remote_user;
 my $biblionumber = $input->param('biblionumber');
 my $biblioitemnumber=$input->param('biblioitemnumber');
diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl
index e8ce20d..50765b7 100755
--- a/catalogue/updateitem.pl
+++ b/catalogue/updateitem.pl
@@ -31,7 +31,7 @@ use C4::Reserves;
 
 my $cgi= new CGI;
 
-my ($loggedinuser, $cookie, $sessionID) = checkauth($cgi, 0, {circulate => 'circulate_remaining_permissions'}, 'intranet');
+checkauth($cgi, 0, {circulate => 'circulate_remaining_permissions'}, 'intranet');
 
 my $biblionumber=$cgi->param('biblionumber');
 my $itemnumber=$cgi->param('itemnumber');
@@ -57,7 +57,7 @@ for ($damaged,$itemlost,$wthdrawn) {
 # modify MARC item if input differs from items table.
 my $item_changes = {};
 if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
-    my ($loggedinuser, $cookie, $sessionID) = checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
+    checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
     if ((not defined  $item_data_hashref->{'itemnotes'}) or $itemnotes ne $item_data_hashref->{'itemnotes'}) {
         $item_changes->{'itemnotes'} = $itemnotes;
     }
diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
index c7c885d..7c6d4bd 100755
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -311,4 +311,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','Choice');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index f98b053..2fc0512 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -312,3 +312,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','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
index 185c74b..0bf7f86 100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -312,4 +312,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','Choice');
diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql
index fca0cfb..002a780 100755
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@ -299,3 +299,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','Choice');
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index c39e231..df13bcd 100755
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -310,4 +310,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','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
index a7c6a10..605dd47 100755
--- 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
@@ -365,4 +365,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
\ No newline at end of file
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','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
index f370766..bfbd48c 100755
--- 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
@@ -391,3 +391,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O    pacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPKIAuth','None','Use the field from a client-side SSL certificate to look a user in the Koha database','None|Common Name|emailAddress','Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3c7d043..8e6fcde 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4354,6 +4354,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.04.01.001";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do(qq{
+    INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AllowPKIAuth',0,'This allows the user to authenticate via client side certificates',NULL,'YesNo');
+    });
+    print "Upgrade to $DBversion done (Bug 6296 New System preference AllowPKIAuth)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index a2ecc5c..85fd549 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -94,4 +94,13 @@ Administration:
             - of CAS when logging out of Koha.
         -
             - The CAS Authentication Server can be found at
-            - pref: casServerUrl           
+            - pref: casServerUrl
+        -
+            - Use
+            - pref: AllowPkiAuth
+              default: None
+              choices:
+                  None: "no"
+                  Common Name: the Common Name
+                  emailAddress: the emailAddress
+            - field for SSL client certificate authentication
diff --git a/members/setstatus.pl b/members/setstatus.pl
index addeeb3..88825b6 100755
--- a/members/setstatus.pl
+++ b/members/setstatus.pl
@@ -36,7 +36,7 @@ my $input = new CGI;
 
 my $flagsrequired;
 $flagsrequired->{borrowers}=1;
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
+checkauth($input, 0, $flagsrequired);
 
 my $destination = $input->param("destination") || '';
 my $cardnumber = $input->param("cardnumber");
diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index bc3fc74..d14c0a4 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -35,7 +35,7 @@ use C4::Auth qw/checkauth/;
 
 my $input = CGI->new();
 
-my ($user, $cookie, $sesion_id, $flags) = checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
+checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
 
 my @bibitems=$input->param('biblioitem');
 # FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
diff --git a/serials/reorder_members.pl b/serials/reorder_members.pl
index 28175fb..8b64fc7 100755
--- a/serials/reorder_members.pl
+++ b/serials/reorder_members.pl
@@ -29,8 +29,7 @@ my $subscriptionid = $query->param('subscriptionid');
 my $routingid      = $query->param('routingid');
 my $rank           = $query->param('rank');
 
-my ( $user, $cookie, $sesion_id, $flags ) =
-  checkauth( $query, 0, { serials => 1 }, 'intranet' );
+checkauth( $query, 0, { serials => 1 }, 'intranet' );
 
 reorder_members( $subscriptionid, $routingid, $rank );
 
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 7386820..ebb47ad 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -94,8 +94,7 @@ if ($op eq 'del') {
 }
 my $hasRouting = check_routing($subscriptionid);
 
-my ($user, $sessionID, $flags);
-($user, $cookie, $sessionID, $flags)
+(undef, $cookie, undef, undef)
     = checkauth($query, 0, {catalogue => 1}, "intranet");
 
 # COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
-- 
1.7.4.1


From koha at ricmarques.net  Tue Jun 14 19:24:29 2011
From: koha at ricmarques.net (Ricardo Dias Marques)
Date: Tue, 14 Jun 2011 18:24:29 +0100
Subject: [Koha-patches] [PATCH] Bug 6503 - Variable $sth is declared 3 times
	(with keyword "my") in "makepayment" sub of "Accounts.pm"
Message-ID: <1308072269-4303-1-git-send-email-koha@ricmarques.net>

In the code available today (14-Jun-2011), in Koha git's "master" branch,
the file "Accounts.pm" (in the "C4" directory) has the variable "$sth"
declared 3 times in the "makepayment" sub. This causes the following
warnings to appear when running "make test" in Koha installation, for
several tests:
t/Heading.t ......................... "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope at
kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...]
t/ILSDI_Services.t .................. "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope
at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...etc...]

Therefore, I'm removing the "my" keyword from the declarations of "$sth"
in lines 172 and 188 of "Accounts.pm".
---
 C4/Accounts.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index 7bddd1a..3275099 100644
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -169,7 +169,7 @@ sub makepayment {
     my $data = $sth->fetchrow_hashref;
     $sth->finish;
 
-    my $sth = $dbh->prepare("UPDATE accountlines
+    $sth = $dbh->prepare("UPDATE accountlines
 			        SET amountoutstanding = 0
 			      WHERE borrowernumber = ?
 				AND accountno = ?");
@@ -185,7 +185,7 @@ sub makepayment {
 
     # create new line
     my $payment = 0 - $amount;
-    my $sth = $dbh->prepare("INSERT INTO accountlines
+    $sth = $dbh->prepare("INSERT INTO accountlines
 					 (borrowernumber, accountno, date, amount,
 					  description, accounttype, amountoutstanding)
 				  VALUES (?,?,now(),?,?,'Pay',0)");
-- 
1.7.2.5



From chrisc at catalyst.net.nz  Tue Jun 14 22:50:12 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 15 Jun 2011 08:50:12 +1200
Subject: [Koha-patches] [PATCH] bug_4002: issues referential integrity
Message-ID: <1308084612-17649-1-git-send-email-chrisc@catalyst.net.nz>

From: Srdjan Jankovic <srdjan at catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 installer/data/mysql/kohastructure.sql |   12 +++++-----
 installer/data/mysql/updatedatabase.pl |   33 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index e3c6f42..cd0d722 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -936,8 +936,8 @@ CREATE TABLE `import_items` (
 
 DROP TABLE IF EXISTS `issues`;
 CREATE TABLE `issues` (
-  `borrowernumber` int(11) default NULL,
-  `itemnumber` int(11) default NULL,
+  `borrowernumber` int(11),
+  `itemnumber` int(11),
   `date_due` date default NULL,
   `branchcode` varchar(10) default NULL,
   `issuingbranch` varchar(18) default NULL,
@@ -947,11 +947,11 @@ CREATE TABLE `issues` (
   `renewals` tinyint(4) default NULL,
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `issuedate` date default NULL,
+  PRIMARY KEY (`itemnumber`),
   KEY `issuesborridx` (`borrowernumber`),
-  KEY `issuesitemidx` (`itemnumber`),
   KEY `bordate` (`borrowernumber`,`timestamp`),
-  CONSTRAINT `issues_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE SET NULL,
-  CONSTRAINT `issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL
+  CONSTRAINT `issues_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE RESTRICT ON UPDATE CASCADE,
+  CONSTRAINT `issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE RESTRICT ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -2098,7 +2098,7 @@ CREATE TABLE `serialitems` (
 	UNIQUE KEY `serialitemsidx` (`itemnumber`),
 	KEY `serialitems_sfk_1` (`serialid`),
 	CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
-	CONSTRAINT serialitems_sfk_2 FOREIGN KEY (itemnumber) REFERENCES items (itemnumber) ON DELETE CASCADE ON UPDATE CASCADE
+	CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `user_permissions`;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3c7d043..6353383 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4354,6 +4354,39 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
+              SELECT borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate FROM issues WHERE borrowernumber IS NULL");
+    $dbh->do("DELETE FROM issues WHERE borrowernumber IS NULL");
+
+    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
+              SELECT borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate FROM issues WHERE itemnumber IS NULL");
+    $dbh->do("DELETE FROM issues WHERE itemnumber IS NULL");
+
+    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
+              SELECT borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate FROM issues WHERE NOT EXISTS (SELECT * FROM borrowers WHERE borrowernumber = issues.borrowernumber)");
+    $dbh->do("DELETE FROM issues WHERE NOT EXISTS (SELECT * FROM borrowers WHERE borrowernumber = issues.borrowernumber)");
+
+    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
+              SELECT borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate FROM issues WHERE NOT EXISTS (SELECT * FROM items WHERE itemnumber = issues.itemnumber)");
+    $dbh->do("DELETE FROM issues WHERE NOT EXISTS (SELECT * FROM items WHERE itemnumber = issues.itemnumber)");
+
+    $dbh->do("ALTER TABLE issues ALTER COLUMN borrowernumber DROP DEFAULT");
+    $dbh->do("ALTER TABLE issues ALTER COLUMN itemnumber DROP DEFAULT");
+    $dbh->do("ALTER TABLE issues MODIFY COLUMN borrowernumber int(11) NOT NULL");
+    $dbh->do("ALTER TABLE issues MODIFY COLUMN itemnumber int(11) NOT NULL");
+    $dbh->do("ALTER TABLE issues DROP KEY `issuesitemidx`");
+    $dbh->do("ALTER TABLE issues ADD PRIMARY KEY (`itemnumber`)");
+    $dbh->do("ALTER TABLE issues DROP FOREIGN KEY `issues_ibfk_1`");
+    $dbh->do("ALTER TABLE issues DROP FOREIGN KEY `issues_ibfk_2`");
+    $dbh->do("ALTER TABLE issues ADD CONSTRAINT `issues_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE RESTRICT ON UPDATE CASCADE");
+    $dbh->do("ALTER TABLE issues ADD CONSTRAINT `issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE RESTRICT ON UPDATE CASCADE");
+
+    print "Upgrade to $DBversion done (issues referential integrity)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.7.4.1


From nengard at bywatersolutions.com  Sun Jun 12 09:59:33 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 12 Jun 2011 03:59:33 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6485 - Checkout slip should
	be more useful
Message-ID: <1307865573-8274-1-git-send-email-nengard@bywatersolutions.com>

From: Jesse Weaver <pianohacker at gmail.com>

This patch makes the following improvements to the checkout slip:

* Does not show the branchname if it is the same as the global
LibraryName, which is useful for single-library catalogs.
* Shows branchaddress* information. This is wrapped in a <div> with
class .slip-address-info, making it easy to disable with
intranetuserjs...
* ... which has been added to the checkout slip.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/members/moremember-receipt.tt  |   17 +++++++++++++++++
 members/moremember.pl                              |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index 4a85ccb..0ef561c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -6,10 +6,18 @@
 
 <script language="javascript">
     function printThenClose() {
+        return;
         window.print();
         window.close();
     }
 </script>
+[% IF ( intranetuserjs ) %]
+    <script type="text/javascript">
+    //<![CDATA[
+    [% intranetuserjs %]
+    //]]>
+    </script>
+[% END %]
 </head>
 <body onload="printThenClose();">
 
@@ -17,6 +25,15 @@
 
 <h3>[% LibraryName %]</h3>
 [% IF ( branchname ) %][% branchname %]<br />[% END %]
+<div class="slip-address-info">
+[% IF ( branchphone ) %][% branchphone %]<br />[% END %]
+[% IF ( branchaddress1 ) %][% branchaddress1 %]<br />[% END %]
+[% IF ( branchaddress2 ) %][% branchaddress2 %]<br />[% END %]
+[% IF ( branchaddress3 ) %][% branchaddress3 %]<br />[% END %]
+[% IF ( branchcity ) %][% branchcity %], [% branchstate %] [% branchzip %]<br />[% END %]
+<br />
+</div>
+
 Checked out to [% firstname %] [% surname %] <br />
 (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
 
diff --git a/members/moremember.pl b/members/moremember.pl
index b766f2f..f8e3dfb 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -428,6 +428,9 @@ $template->param( picture => 1 ) if $picture;
 my $branch=C4::Context->userenv->{'branch'};
 
 $template->param(%$data);
+if (C4::Context->preference('LibraryName') eq $branchdetail->{'branchname'}) {
+	$template->param(branchname => '');
+}
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     $template->param(ExtendedPatronAttributes => 1);
-- 
1.7.2.3


From pianohacker at gmail.com  Wed Jun 15 08:24:08 2011
From: pianohacker at gmail.com (Jesse Weaver)
Date: Wed, 15 Jun 2011 00:24:08 -0600
Subject: [Koha-patches] [PATCH] Bug 6485 - Remove debugging cruft from
	earlier patch
Message-ID: <1308119048-31584-1-git-send-email-pianohacker@gmail.com>

---
 .../prog/en/modules/members/moremember-receipt.tt  |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index 0ef561c..f8c252a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -6,7 +6,6 @@
 
 <script language="javascript">
     function printThenClose() {
-        return;
         window.print();
         window.close();
     }
-- 
1.7.4.1


From magnus at enger.priv.no  Wed Jun 15 08:46:34 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 15 Jun 2011 08:46:34 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] add another example to
	README.robots
Message-ID: <1308120394-2780-1-git-send-email-magnus@enger.priv.no>

From: JAMES Mason <mason at kohaaloha.com>


Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 README.robots |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/README.robots b/README.robots
index a08371d..6865d0a 100644
--- a/README.robots
+++ b/README.robots
@@ -5,13 +5,23 @@ look for the file /robots.txt.  If this file is found and has lines that apply
 to them they will do as instructed.  A very basic robots.txt follow as an
 example:
 
+-------------------------------------------
 # go away
 User-agent: *
 Disallow: /
+-------------------------------------------
 
 This tells every search engine that cares (User-agent: *) to not index the site
 (Disallow everything past /).
 
+Another slightly more intelligent robots.txt file example allows for some bot indexing (good for your site in google, etc), but also stops your Koha from getting thrashing by ignoring URLs that cause heavy search load
+
+-------------------------------------------
+# do some indexing, but dont index search URLs
+User-agent: *
+Disallow: /cgi-bin/koha/opac-search.pl
+-------------------------------------------
+
 If you have installed Koha to /usr/local/koha3 then this file would be placed
 in the directory /usr/local/koha3/opac/htdocs/.  This should prevent search
 engines from browsing every biblio record, and every view of each record, on
-- 
1.7.4.1


From chris at bigballofwax.co.nz  Wed Jun 15 09:37:29 2011
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Wed, 15 Jun 2011 19:37:29 +1200
Subject: [Koha-patches] [Signed Off] [PATCH] Bug 6468 - Authorities browsing
	error in OPAC
Message-ID: <1308123449-17626-1-git-send-email-chris@bigballofwax.co.nz>

From: Janusz Kaczmarek <januszop at gmail.com>

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 .../en/modules/opac-authoritiessearchresultlist.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 203cf7f..1b57410 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -20,7 +20,7 @@
 				[% IF ( number.highlight ) %]
 					<span class="current">[% number.number %]</span>
 				[% ELSE %]
-					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% number.resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% number.authtypecode %]&amp;orderby=[% number.orderby %]">[% number.number %]</a>
+					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode %]&amp;orderby=[% orderby %]">[% number.number %]</a>
 				[% END %]
 			[% END %]
 			[% IF ( displaynext ) %]
@@ -71,7 +71,7 @@
 			[% END %]
 			[% FOREACH number IN numbers %]
 				[% IF ( number.highlight ) %]<span class="current">[% number.number %]</span>[% ELSE %]
-					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% number.resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% number.authtypecode %]&amp;orderby=[% number.orderby %]">[% number.number %]</a>
+					<a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode %]&amp;orderby=[% orderby %]">[% number.number %]</a>
 				[% END %]
 			[% END %]
 			[% IF ( displaynext ) %]
-- 
1.7.2.2


From magnus at enger.priv.no  Wed Jun 15 12:59:09 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 15 Jun 2011 12:59:09 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6460 - No log generated if
	Action set to All or Modify or Delete
Message-ID: <1308135549-7605-1-git-send-email-magnus@enger.priv.no>

From: Janusz Kaczmarek <januszop at gmail.com>


Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 C4/Log.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Log.pm b/C4/Log.pm
index 822cda5..fa258f2 100644
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -221,9 +221,9 @@ sub GetLogs {
     	$query .= " AND module IN (".join(",",map {"?"} @$modules).") ";
 	push(@parameters,@$modules);
     }
-    if($action && scalar(@$action)) {
-    	$query .= " AND action IN (".join(",",map {"?"} @$action).") ";
-	push(@parameters,@$action);
+    if($action->[0]) {
+    	$query .= " AND action LIKE ? ";
+	push(@parameters,"%".$action->[0]."%");
     }
     if($object) {
     	$query .= " AND object = ? ";
-- 
1.7.4.1


From magnus at enger.priv.no  Wed Jun 15 13:16:26 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 15 Jun 2011 13:16:26 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6470 - Unable to filter out
	log entries for kohaadmin (user 0)
Message-ID: <1308136586-8011-1-git-send-email-magnus@enger.priv.no>

From: Janusz Kaczmarek <januszop at gmail.com>


Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 C4/Log.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Log.pm b/C4/Log.pm
index 822cda5..98cd8d5 100644
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -213,7 +213,7 @@ sub GetLogs {
     my @parameters;
     $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$iso_datefrom."\" " if $iso_datefrom;   #fix me - mysql specific
     $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"".$iso_dateto."\" " if $iso_dateto;
-    if($user) {
+    if($user ne "") {
     	$query .= " AND user = ? ";
     	push(@parameters,$user);
     }
-- 
1.7.4.1


From magnus at enger.priv.no  Wed Jun 15 16:34:53 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 15 Jun 2011 16:34:53 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] MT6196: strange order in CSV
	upload
Message-ID: <1308148493-11277-1-git-send-email-magnus@enger.priv.no>

From: Paul Poulain <paul.poulain at biblibre.com>

uploading the circ overdues result in a csv with columns in a strange order
and not the order of the screen
This patch reorder the column by putting the usefull ones first

Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 circ/overdue.pl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/circ/overdue.pl b/circ/overdue.pl
index 18851a6..59ce220 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -392,7 +392,8 @@ sub build_csv {
     my @lines = ();
 
     # build header ...
-    my @keys = grep { $_ ne 'patron_attr_value_loop' } sort keys %{ $overdues->[0] };
+    my @keys = qw /duedate title author borrowertitle name phone barcode email address address2 zipcode city country
+                branchcode itemcallnumber biblionumber borrowernumber itemnum replacementprice streetnumber streettype/;
     my $csv = Text::CSV_XS->new();
     $csv->combine(@keys);
     push @lines, $csv->string();
-- 
1.7.4.1


From lrea at nekls.org  Wed Jun 15 18:34:05 2011
From: lrea at nekls.org (Liz Rea)
Date: Wed, 15 Jun 2011 11:34:05 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] Bug 5379 - import_borrowers.pl
	fails with db insert/update errors
Message-ID: <1308155645-7149-1-git-send-email-lrea@nekls.org>

From: Chris Nighswonger <cnighswonger at foundations.edu>

Some spreadsheet programs use smart quotes which causes the db to throw
an error when an insert/update is attempted due to improper processing
of the CSV file. This patch adds code to check for smart quotes and change
them to "dumb" quotes.

This patch also adds more logging of errors and a notice to the user to check
the logs for errors when they occur.

Signed-off-by: Liz Rea <lrea at nekls.org>
---
 C4/Members.pm             |   29 ++++++++++++++++++-----------
 C4/Members/Attributes.pm  |    5 +++++
 tools/import_borrowers.pl |   10 ++++++++--
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..7cd88af 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -772,17 +772,17 @@ sub ModMember {
         }
     }
 	my $execute_success=UpdateInTable("borrowers",\%data);
-# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
-# so when we update information for an adult we should check for guarantees and update the relevant part
-# of their records, ie addresses and phone numbers
-    my $borrowercategory= GetBorrowercategory( $data{'category_type'} );
-    if ( exists  $borrowercategory->{'category_type'} && $borrowercategory->{'category_type'} eq ('A' || 'S') ) {
-        # is adult check guarantees;
-        UpdateGuarantees(%data);
+    if ($execute_success) { # only proceed if the update was a success
+        # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
+        # so when we update information for an adult we should check for guarantees and update the relevant part
+        # of their records, ie addresses and phone numbers
+        my $borrowercategory= GetBorrowercategory( $data{'category_type'} );
+        if ( exists  $borrowercategory->{'category_type'} && $borrowercategory->{'category_type'} eq ('A' || 'S') ) {
+            # is adult check guarantees;
+            UpdateGuarantees(%data);
+        }
+        logaction("MEMBERS", "MODIFY", $data{'borrowernumber'}, "UPDATE (executed w/ arg: $data{'borrowernumber'})") if C4::Context->preference("BorrowersLog");
     }
-    logaction("MEMBERS", "MODIFY", $data{'borrowernumber'}, "UPDATE (executed w/ arg: $data{'borrowernumber'})") 
-        if C4::Context->preference("BorrowersLog");
-
     return $execute_success;
 }
 
@@ -792,7 +792,9 @@ sub ModMember {
   $borrowernumber = &AddMember(%borrower);
 
 insert new borrower into table
-Returns the borrowernumber
+Returns the borrowernumber upon success
+
+Returns as undef upon any db error without further processing
 
 =cut
 
@@ -810,10 +812,15 @@ sub AddMember {
     my $sth = $dbh->prepare("SELECT enrolmentfee FROM categories WHERE categorycode=?");
     $sth->execute($data{'categorycode'});
     my ($enrolmentfee) = $sth->fetchrow;
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        return;
+    }
     if ($enrolmentfee && $enrolmentfee > 0) {
         # insert fee in patron debts
         manualinvoice($data{'borrowernumber'}, '', '', 'A', $enrolmentfee);
     }
+
     return $data{'borrowernumber'};
 }
 
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 24c6f71..35d6702 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -203,7 +203,12 @@ sub SetBorrowerAttributes {
     foreach my $attr (@$attr_list) {
         $attr->{password} = undef unless exists $attr->{password};
         $sth->execute($borrowernumber, $attr->{code}, $attr->{value}, $attr->{password});
+        if ($sth->err) {
+            warn sprintf('Database returned the following error: %s', $sth->errstr);
+            return; # bail immediately on errors
+        }
     }
+    return 1; # borower attributes successfully set
 }
 
 =head2 extended_attributes_code_value_arrayref 
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 6141998..74a5889 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -66,7 +66,7 @@ my $columnkeystpl = [ map { {'key' => $_} }  grep {$_ ne 'borrowernumber' && $_
 
 my $input = CGI->new();
 our $csv  = Text::CSV->new({binary => 1});  # binary needed for non-ASCII Unicode
-# push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend};
+#push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend}; #XXX
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         template_name   => "tools/import_borrowers.tmpl",
@@ -193,6 +193,9 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
         }
         if ($extended) {
             my $attr_str = $borrower{patron_attributes};
+            $attr_str =~ s/\xe2\x80\x9c/"/g; # fixup double quotes in case we are passed smart quotes
+            $attr_str =~ s/\xe2\x80\x9d/"/g;
+            push @feedback, {feedback=>1, name=>'attribute string', value=>$attr_str, filename=>$uploadborrowers};
             delete $borrower{patron_attributes};    # not really a field in borrowers, so we don't want to pass it to ModMember.
             $patron_attributes = extended_attributes_code_value_arrayref($attr_str); 
         }
@@ -246,6 +249,8 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
             }
             unless (ModMember(%borrower)) {
                 $invalid++;
+                # untill we have better error trapping, we have no way of knowing why ModMember errored out...
+                push @errors, {unknown_error => 1};
                 $template->param('lastinvalid'=>$borrower{'surname'}.' / '.$borrowernumber);
                 next LINE;
             }
@@ -254,7 +259,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                     my $old_attributes = GetBorrowerAttributes($borrowernumber);
                     $patron_attributes = extended_attributes_merge($old_attributes, $patron_attributes);  #TODO: expose repeatable options in template
                 }
-                SetBorrowerAttributes($borrower{'borrowernumber'}, $patron_attributes);
+                push @errors, {unknown_error => 1} unless SetBorrowerAttributes($borrower{'borrowernumber'}, $patron_attributes);
             }
             $overwritten++;
             $template->param('lastoverwritten'=>$borrower{'surname'}.' / '.$borrowernumber);
@@ -276,6 +281,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                 $template->param('lastimported'=>$borrower{'surname'}.' / '.$borrowernumber);
             } else {
                 $invalid++;
+                push @errors, {unknown_error => 1};
                 $template->param('lastinvalid'=>$borrower{'surname'}.' / AddMember');
             }
         }
-- 
1.7.2.5


From sjohnson at hpplnj.org  Thu Jun 16 12:00:33 2011
From: sjohnson at hpplnj.org (sjohnson at hpplnj.org)
Date: Thu, 16 Jun 2011 06:00:33 -0400
Subject: [Koha-patches] Out of office
Message-ID: <cbcccb458e96447d8c9f98bf0e5d664f@dc3ea5015a1c47b68b5da89e90340f8e>

I will be out of the office beginning Friday July 1st and will return on Wednesday July 20th, If you need assistance please call the Highland Park Public Library at 732-572-2750.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110616/5ea64e49/attachment.htm>

From magnus at enger.priv.no  Thu Jun 16 12:49:44 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 16 Jun 2011 12:49:44 +0200
Subject: [Koha-patches] [PATCH] Bug 6510 - Sort by in intranet search alters
	search and number of hits
Message-ID: <1308221384-2888-1-git-send-email-magnus@enger.priv.no>

To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
  the hits have been re-ordered
---
 catalogue/search.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index a41b18a..35c2a8a 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -471,7 +471,7 @@ my $scan_index_to_use;
 
 for my $this_cgi ( split('&',$query_cgi) ) {
     next unless $this_cgi;
-    $this_cgi =~ m/(.?)=(.*)/;
+    $this_cgi =~ m/(.*)=(.*)/;
     my $input_name = $1;
     my $input_value = $2;
     push @query_inputs, { input_name => $input_name, input_value => $input_value };
-- 
1.7.4.1


From magnus at enger.priv.no  Thu Jun 16 13:54:04 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 16 Jun 2011 13:54:04 +0200
Subject: [Koha-patches] [PATCH] Bug 6510 - [REVISED] Sort by in intranet
	search alters search and number of hits
Message-ID: <1308225244-2367-1-git-send-email-magnus@enger.priv.no>

This patch uses .*? instead of .*

To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
  the hits have been re-ordered
---
 catalogue/search.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index a41b18a..8899d59 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -471,7 +471,7 @@ my $scan_index_to_use;
 
 for my $this_cgi ( split('&',$query_cgi) ) {
     next unless $this_cgi;
-    $this_cgi =~ m/(.?)=(.*)/;
+    $this_cgi =~ m/(.*?)=(.*)/;
     my $input_name = $1;
     my $input_value = $2;
     push @query_inputs, { input_name => $input_name, input_value => $input_value };
-- 
1.7.4.1


From oleonard at myacpl.org  Thu Jun 16 14:51:17 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 16 Jun 2011 08:51:17 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 6501 - missing scroll bar when
	updating child
Message-ID: <1308228677-20462-1-git-send-email-oleonard@myacpl.org>

Adding "scrollbars=yes" to window.open javascript.

To test, open a child patron record and choose more ->
Update Child to Adult Patron from the toolbar menu. The
resulting pop-up should have scrollbars.
---
 .../prog/en/includes/circ-toolbar.inc              |    2 +-
 .../prog/en/includes/members-toolbar.inc           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 1377aa5..503f954 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -27,7 +27,7 @@ function confirm_reregistration() {
 function update_child() {
     // var borrowernumbervalue= $("#borrowernumber").attr("value"); 
 [% IF ( CATCODE_MULTI ) %]
- window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=no,resizable=yes');
+ window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
 [% ELSE %]
  confirm_updatechild();
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 9331f5f..afad863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -25,7 +25,7 @@ function confirm_reregistration() {
 
 function update_child() {
 [% IF ( CATCODE_MULTI ) %]
- window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=no,resizable=yes');
+ window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
 [% ELSE %]
  confirm_updatechild();
 [% END %]
-- 
1.7.3


From lrea at nekls.org  Thu Jun 16 19:55:26 2011
From: lrea at nekls.org (Liz Rea)
Date: Thu, 16 Jun 2011 12:55:26 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] Fix for Bug 6501 - missing
	scroll bar when updating child
Message-ID: <1308246926-2174-1-git-send-email-lrea@nekls.org>

From: Owen Leonard <oleonard at myacpl.org>

- Adding "scrollbars=yes" to window.open javascript.
- Adding javascript tablesorter to categories table

To test, open a child patron record and choose more ->
Update Child to Adult Patron from the toolbar menu. The
resulting pop-up should have scrollbars. The table
of categories should be sortable with a default sort
on the description.

Signed-off-by: Liz Rea <lrea at nekls.org>
---
 .../prog/en/includes/circ-toolbar.inc              |    2 +-
 .../prog/en/includes/members-toolbar.inc           |    2 +-
 .../prog/en/modules/members/update-child.tt        |   18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 1377aa5..503f954 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -27,7 +27,7 @@ function confirm_reregistration() {
 function update_child() {
     // var borrowernumbervalue= $("#borrowernumber").attr("value"); 
 [% IF ( CATCODE_MULTI ) %]
- window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=no,resizable=yes');
+ window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
 [% ELSE %]
  confirm_updatechild();
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 9331f5f..afad863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -25,7 +25,7 @@ function confirm_reregistration() {
 
 function update_child() {
 [% IF ( CATCODE_MULTI ) %]
- window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=no,resizable=yes');
+ window.open('update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
 [% ELSE %]
  confirm_updatechild();
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
index f73ce2d..81fa3b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
@@ -1,6 +1,16 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Choose Adult category</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$.tablesorter.defaults.widgets = ['zebra'];
+		$("#catst").tablesorter({
+			sortList: [[2,0]],
+			headers: { 0: { sorter: false }}
+		});
+	});
+</script>
 <style type="text/css"> 
 	   #custom-doc { width:29em;*width:28.3em;min-width:377px; margin:auto; text-align:left; } 
 </style> 
@@ -41,12 +51,15 @@ window.close();
 
 <form method="post" action="update-child.pl">
 <fieldset>
-<table>
+<table id="catst">
+<thead>
 <tr>
 <th>&nbsp;</th>
 <th>Code</th>
 <th>Description</th>
 </tr>
+</thead>
+<tbody>
 [% FOREACH CAT_LOO IN CAT_LOOP %]
 <tr>
 <td>
@@ -55,6 +68,7 @@ window.close();
 <td><label for="catcode[% CAT_LOO.catcode %]"><strong>[% CAT_LOO.catdesc %]</strong></label></td> 
 </tr>
 [% END %]
+</tbody>
 </table>
 <input type="hidden" name="op" value="update" />
 <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
@@ -72,4 +86,4 @@ window.close();
 
 
 </div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'popup-bottom.inc' %]
-- 
1.7.2.5


From nengard at bywatersolutions.com  Sun Jun 12 23:24:46 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 12 Jun 2011 17:24:46 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6512: time missing from
	item circulation history
Message-ID: <1307913886-10786-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/circ/bookcount.tt              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
index f22e407..43ef0c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
@@ -49,7 +49,7 @@ $(document).ready(function(){
             <td>[% IF ( branchloo.seen ) %]
                     <span style="display:none;">[% branchloo.seen %][% branchloo.seentime %]</span>
                     <!-- invisible span for eventual use by tablesorter -->
-                    [% DEFAULT branchloo.seentime="??:??" %] [% branchloo.seen %] 
+                    [% branchloo.seen %] [% branchloo.seentime %]
                 [% ELSE %]Never
                 [% END %]
             </td>
-- 
1.7.2.3


From nengard at bywatersolutions.com  Mon Jun 13 10:08:28 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Mon, 13 Jun 2011 04:08:28 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6497: MARC URLs not showing
	up in details pages under normal view
Message-ID: <1307952508-12692-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

Part one:  followup to the original patch.  The variable name for the URL itself was wrong, so despite
getting the link to show up, the href was the catalog page itself, NOT the 856$u.  Updating "MARCurl.MARCurl"
to "MARCurl.MARCURL" fixes this issue.

To test:  go to the OPAC, and see that the URL in the link is the same as the URL in the MARC

Part two:  this problem is present on the staff side, as well.  This patch implements both parts of the fix
(renaming "MARCurlS" to "MARCURLS" and "MARCurl.MARCurl" to "MARCurl.MARCURL")

To test:  go to the staff client, and check that a)URLs show up and b)they link to the URL in the MARC record

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/catalogue/detail.tt            |    6 +++---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 39c2cd3..fffe411 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -138,14 +138,14 @@ function verify_images() {
                 [% IF ( pages ) %] [% END %][% pages %] [% IF ( illus ) %][% illus %][% END %]
                 [% IF ( size ) %][% size %][% END %]
         </li>
-[% IF ( MARCurlS ) %]<li>
+[% IF ( MARCURLS ) %]<li>
     
 	<strong>Online Resources:</strong>
-    <ul>    [% FOREACH MARCurl IN MARCurlS %]
+    <ul>    [% FOREACH MARCurl IN MARCURLS %]
 		<li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
 			<br />[% END %] 
 		<!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
-		<a href="[% MARCurl.MARCurl %]" title="[% MARCurl.MARCurl %]">[% MARCurl.linktext %]</a>
+		<a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">[% MARCurl.linktext %]</a>
 			[% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note %]</li>[% END %]</ul>[% END %]</li>
             [% END %]</ul>
 </li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 534aeee..01a66a3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -189,7 +189,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             <br />[% END %] 
         <!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
         
-        [% IF ( MARCurl.OPACurlOpenInNewWindow ) %]<a href="[% MARCurl.MARCurl %]" title="[% MARCurl.MARCurl %]" target="_blank">[% ELSE %]<a href="[% MARCurl.MARCurl %]" title="[% MARCurl.MARCurl %]">[% END %]
+        [% IF ( MARCurl.OPACurlOpenInNewWindow ) %]<a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]" target="_blank">[% ELSE %]<a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">[% END %]
         
         [% MARCurl.linktext %]</a>
             [% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note %]</li>[% END %]</ul>[% END %]</li>
-- 
1.7.2.3


From januszop at gmail.com  Sat Jun 18 13:52:09 2011
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Sat, 18 Jun 2011 13:52:09 +0200
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_6465_-_Errors_in_UNIMARC?=
	=?utf-8?q?_plugins_for_fixed_length_fields_=28for_=7C_and_space=29?=
	=?utf-8?b?IChUOjpUIGlzc3VlKQ==?=
Message-ID: <1308397929-26701-1-git-send-email-januszop@gmail.com>

A corrected version of the patch of 6 June 2011.

---
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +++++--
 cataloguing/value_builder/unimarc_field_105.pl     |   37 ++++++++------
 cataloguing/value_builder/unimarc_field_110.pl     |   24 ++++++---
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++++++++------
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 ++++++---
 cataloguing/value_builder/unimarc_field_116.pl     |   31 +++++++----
 cataloguing/value_builder/unimarc_field_117.pl     |   20 ++++++--
 cataloguing/value_builder/unimarc_field_120.pl     |   21 ++++++--
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 ++++-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +++++--
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +++-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +++-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++++++++------
 cataloguing/value_builder/unimarc_leader.pl        |   19 +++++--
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 ++--
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +++---
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 ++++++++++----------
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 ++++++------
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +++---
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +++---
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++++++------
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 31 files changed, 339 insertions(+), 211 deletions(-)

diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index c49b956..0d01554 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -67,6 +67,14 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index  = $input->param('index');
@@ -90,14 +98,14 @@ sub plugin {
         my @today = Date::Calc::Today();
         $f1 = $today[0] . sprintf('%02s',$today[1]) . sprintf('%02s',$today[2]);
     }
-    my $f2  = substr( $result, 8,  1 );
+    my $f2  = substr( $result, 8,  1 ); $f2  = wrapper( $f2 ) if $f2;
     my $f3  = substr( $result, 9,  4 );
     $f3='' if $f3 eq '    '; # empty publication year if only spaces, otherwise it's hard to fill the field
     my $f4  = substr( $result, 13, 4 );
     $f4='' if $f4 eq '    ';
-    my $f5  = substr( $result, 17, 1 );
-    my $f6  = substr( $result, 18, 1 );
-    my $f7  = substr( $result, 19, 1 );
+    my $f5  = substr( $result, 17, 1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 18, 1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 19, 1 ); $f7  = wrapper( $f7 ) if $f7;
     my $f8  = substr( $result, 20, 1 );
     my $f9  = substr( $result, 21, 1 );
     my $f10 = substr( $result, 22, 3 );
@@ -105,7 +113,7 @@ sub plugin {
     my $f12 = substr( $result, 26, 2 );
     my $f13 = substr( $result, 28, 2 );
     my $f14 = substr( $result, 30, 4 );
-    my $f15 = substr( $result, 34, 2 );
+    my $f15 = substr( $result, 34, 2 ); $f15 = wrapper( $f15 ) if $f15;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 8d44a82..c84e826 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -63,6 +63,13 @@ sub plugin_javascript {
     return ($field_number,$res);
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index= $input->param('index');
@@ -78,21 +85,21 @@ sub plugin {
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
-
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-
-	my $f9  = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-        my $f11 = substr($result,10,1);
-        my $f12 = substr($result,11,1);
-        my $f13 = substr($result,12,1);
+ 	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+
+	my $f9  = substr($result,8,1); $f9  = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+        my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+        my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+        my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 848a53a..2c301ae 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -62,6 +62,14 @@ sub plugin_javascript {
 
     return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,15 +84,15 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
+ 	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
  	my $f5 = substr($result,4,3);
- 	my $f6 = substr($result,7,1);
- 	my $f7 = substr($result,8,1);
- 	my $f8 = substr($result,9,1);
- 	my $f9 = substr($result,10,1);
+ 	my $f6 = substr($result,7,1); $f6 = wrapper( $f6 ) if $f6;
+ 	my $f7 = substr($result,8,1); $f7 = wrapper( $f7 ) if $f7;
+ 	my $f8 = substr($result,9,1); $f8 = wrapper( $f8 ) if $f8;
+ 	my $f9 = substr($result,10,1); $f9 = wrapper( $f9 ) if $f9;
 
 	$template->param(index => $index,
                         "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 6144771..2cd6806 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -69,6 +69,13 @@ sub plugin_javascript {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -86,24 +93,24 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
+    my $f1  = substr( $result, 0,  1 ); $f1  = wrapper( $f1 ) if $f1;
     my $f2  = substr( $result, 1,  3 );
-    my $f3  = substr( $result, 4,  1 );
-    my $f4  = substr( $result, 5,  1 );
-    my $f5  = substr( $result, 6,  1 );
-    my $f6  = substr( $result, 7,  1 );
-    my $f7  = substr( $result, 8,  1 );
-    my $f8  = substr( $result, 9,  1 );
-    my $f9  = substr( $result, 10, 1 );
-    my $f10 = substr( $result, 11, 1 );
-    my $f11 = substr( $result, 12, 1 );
-    my $f12 = substr( $result, 13, 1 );
-    my $f13 = substr( $result, 14, 1 );
-    my $f14 = substr( $result, 15, 1 );
-    my $f15 = substr( $result, 16, 1 );
-    my $f16 = substr( $result, 17, 1 );
-    my $f17 = substr( $result, 18, 1 );
-    my $f18 = substr( $result, 19, 1 );
+    my $f3  = substr( $result, 4,  1 ); $f3  = wrapper( $f3 ) if $f3;
+    my $f4  = substr( $result, 5,  1 ); $f4  = wrapper( $f4 ) if $f4;
+    my $f5  = substr( $result, 6,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 7,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 8,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 9,  1 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 10, 1 ); $f9  = wrapper( $f9 ) if $f9;
+    my $f10 = substr( $result, 11, 1 ); $f10 = wrapper( $f10 ) if $f10;
+    my $f11 = substr( $result, 12, 1 ); $f11 = wrapper( $f11 ) if $f11;
+    my $f12 = substr( $result, 13, 1 ); $f12 = wrapper( $f12 ) if $f12;
+    my $f13 = substr( $result, 14, 1 ); $f13 = wrapper( $f13 ) if $f13;
+    my $f14 = substr( $result, 15, 1 ); $f14 = wrapper( $f14 ) if $f14;
+    my $f15 = substr( $result, 16, 1 ); $f15 = wrapper( $f15 ) if $f15;
+    my $f16 = substr( $result, 17, 1 ); $f16 = wrapper( $f16 ) if $f16;
+    my $f17 = substr( $result, 18, 1 ); $f17 = wrapper( $f17 ) if $f17;
+    my $f18 = substr( $result, 19, 1 ); $f18 = wrapper( $f18 ) if $f18;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 7582e74..919b1fa 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -63,6 +63,13 @@ function Clic$field_number() {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -80,15 +87,15 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1  = substr( $result, 0,  1 );
-    my $f2  = substr( $result, 1,  1 );
-    my $f3  = substr( $result, 2,  1 );
-    my $f4  = substr( $result, 3,  1 );
-    my $f5  = substr( $result, 4,  1 );
-    my $f6  = substr( $result, 5,  1 );
-    my $f7  = substr( $result, 6,  1 );
-    my $f8  = substr( $result, 7,  1 );
-    my $f9  = substr( $result, 8,  1 );
+    my $f1  = substr( $result, 0,  1 ); $f1  = wrapper( $f1 ) if $f1;
+    my $f2  = substr( $result, 1,  1 ); $f2  = wrapper( $f2 ) if $f2;
+    my $f3  = substr( $result, 2,  1 ); $f3  = wrapper( $f3 ) if $f3;
+    my $f4  = substr( $result, 3,  1 ); $f4  = wrapper( $f4 ) if $f4;
+    my $f5  = substr( $result, 4,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 5,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 6,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 7,  1 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 8,  1 ); $f9  = wrapper( $f9 ) if $f9;
     my $f10 = substr( $result, 9,  4 );
     my $f11 = substr( $result, 13, 2 );
 
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 21e2368..67f6875 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -63,6 +63,15 @@ function Clic$field_number(i) {
     return ( $field_number, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -79,20 +88,20 @@ sub plugin {
             debug           => 1,
         }
     );
-    my $f1 = substr( $result, 0, 1 );
-    my $f2 = substr( $result, 1, 1 );
-    my $f3 = substr( $result, 2, 1 );
-    my $f4 = substr( $result, 3, 1 );
+    my $f1 = substr( $result, 0, 1 ); $f1 = wrapper( $f1 ) if $f1;
+    my $f2 = substr( $result, 1, 1 ); $f2 = wrapper( $f2 ) if $f2;
+    my $f3 = substr( $result, 2, 1 ); $f3 = wrapper( $f3 ) if $f3;
+    my $f4 = substr( $result, 3, 1 ); $f4 = wrapper( $f4 ) if $f4;
 
-    my $f5 = substr( $result, 4, 2 );
-    my $f6 = substr( $result, 6, 2 );
-    my $f7 = substr( $result, 8, 2 );
+    my $f5 = substr( $result, 4, 2 ); $f5 = wrapper( $f5 ) if $f5;
+    my $f6 = substr( $result, 6, 2 ); $f6 = wrapper( $f6 ) if $f6;
+    my $f7 = substr( $result, 8, 2 ); $f7 = wrapper( $f7 ) if $f7;
 
-    my $f8  = substr( $result, 10, 2 );
-    my $f9  = substr( $result, 12, 2 );
-    my $f10 = substr( $result, 14, 2 );
+    my $f8  = substr( $result, 10, 2 ); $f8  = wrapper( $f8 ) if $f8;
+    my $f9  = substr( $result, 12, 2 ); $f9  = wrapper( $f9 ) if $f9;
+    my $f10 = substr( $result, 14, 2 ); $f10 = wrapper( $f10 ) if $f10;
 
-    my $f11 = substr( $result, 16, 2 );
+    my $f11 = substr( $result, 16, 2 ); $f11 = wrapper( $f11 ) if $f11;
 
     $template->param(
         index     => $index,
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index ff206f7..fcbb18f 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -62,6 +62,16 @@ function Clic$field_number(i) {
 
 return ($field_number,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,12 +86,12 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
- 	my $f1 = substr($result,0,2);
- 	my $f2 = substr($result,2,2);
- 	my $f3 = substr($result,4,2);
- 	my $f4 = substr($result,6,2);
+ 	my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
+ 	my $f2 = substr($result,2,2); $f2 = wrapper( $f2 ) if $f2;
+ 	my $f3 = substr($result,4,2); $f3 = wrapper( $f3 ) if $f3;
+ 	my $f4 = substr($result,6,2); $f4 = wrapper( $f4 ) if $f4;
 
- 	my $f5 = substr($result,8,1);
+ 	my $f5 = substr($result,8,1); $f5 = wrapper( $f5 ) if $f5;
 
 	$template->param(index => $index,
 							"f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 3f72c85..f140fce 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -63,6 +63,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -82,13 +91,13 @@ my ($template, $loggedinuser, $cookie)
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
+	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
 	my $f8 = substr($result,7,2);
-	my $f9 = substr($result,9,2);
-	my $f10 = substr($result,11,2);
+	my $f9 = substr($result,9,2); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,11,2); $f10 = wrapper( $f10 ) if $f10;
 	$template->param(index => $index,
 							"f1$f1" => 1,
 							"f2$f2" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index a855332..d40f49c 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -63,6 +63,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -80,8 +88,8 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
 	my $f4 = substr($result,3,2);
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index b356956..8c66161 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index 2f85f9e..e3d47b5 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -83,12 +91,12 @@ my ($template, $loggedinuser, $cookie)
 	my $f5 = substr($result,4,1);
 	my $f6 = substr($result,5,1);
 	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,1);
-	my $f11 = substr($result,10,1);
-	my $f12 = substr($result,11,1);
-	my $f13 = substr($result,12,1);
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+	my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+	my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+	my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+	my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
 	my $f14 = substr($result,13,1);
 	my $f15 = substr($result,14,1);
 	$template->param(index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index b44bd21..1f196ac 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -60,6 +60,13 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "dblpipe" if $char eq "||";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +83,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,2);
+	my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
 	$template->param(index => $index,
 			 "f1$f1" => 1);
         output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index caf6ba3..d0eb5c9 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -61,6 +61,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -79,7 +87,7 @@ my ($template, $loggedinuser, $cookie)
 			     });
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
 	my $f4 = substr($result,3,1);
 	my $f5 = substr($result,4,3);
 	my $f6 = substr($result,7,1);
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index de631c2..93454aa 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -60,6 +60,14 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
 	my $f2 = substr($result,1,1);
 	my $f3 = substr($result,2,1);
 	my $f4 = substr($result,3,1);
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index ac50f32..201e31a 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -60,6 +60,15 @@ function Clic$function_name(i) {
 
 return ($function_name,$res);
 }
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
@@ -76,23 +85,23 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	my $f1 = substr($result,0,1);
-	my $f2 = substr($result,1,1);
-	my $f3 = substr($result,2,1);
-	my $f4 = substr($result,3,1);
-	my $f5 = substr($result,4,1);
-	my $f6 = substr($result,5,1);
-	my $f7 = substr($result,6,1);
-	my $f8 = substr($result,7,1);
-	my $f9 = substr($result,8,1);
-	my $f10 = substr($result,9,2);
-	my $f11 = substr($result,11,2);
-	my $f12 = substr($result,13,2);
-	my $f13 = substr($result,15,2);
-	my $f14 = substr($result,17,2);
-	my $f15 = substr($result,19,1);
-	my $f16 = substr($result,20,1);
-	my $f17 = substr($result,21,1);
+	my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+	my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+	my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+	my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+	my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+	my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+	my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+	my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+	my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+	my $f10 = substr($result,9,2); $f10 = wrapper( $f10 ) if $f10;
+	my $f11 = substr($result,11,2); $f11 = wrapper( $f11 ) if $f11;
+	my $f12 = substr($result,13,2); $f12 = wrapper( $f12 ) if $f12;
+	my $f13 = substr($result,15,2); $f13 = wrapper( $f13 ) if $f13;
+	my $f14 = substr($result,17,2); $f14 = wrapper( $f14 ) if $f14;
+	my $f15 = substr($result,19,1); $f15 = wrapper( $f15 ) if $f15;
+	my $f16 = substr($result,20,1); $f16 = wrapper( $f16 ) if $f16;
+	my $f17 = substr($result,21,1); $f17 = wrapper( $f17 ) if $f17;
 	my $f18 = substr($result,22,1);
 	my $f19 = substr($result,23,1);
 	my $f20 = substr($result,24,1);
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 05748a2..af4d808 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -66,6 +66,13 @@ function Clic$function_name(i) {
     return ( $function_name, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -83,13 +90,13 @@ sub plugin {
         }
     );
     $result = "     nam         3       " unless $result;
-    my $f5  = substr( $result, 5,  1 );
-    my $f6  = substr( $result, 6,  1 );
-    my $f7  = substr( $result, 7,  1 );
-    my $f8  = substr( $result, 8,  1 );
+    my $f5  = substr( $result, 5,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 6,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 7,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 8,  1 ); $f8  = wrapper( $f8 ) if $f8;
     my $f9  = substr( $result, 9,  1 );
-    my $f17 = substr( $result, 17, 1 );
-    my $f18 = substr( $result, 18, 1 );
+    my $f17 = substr( $result, 17, 1 ); $f17 = wrapper( $f17 ) if $f17;
+    my $f18 = substr( $result, 18, 1 ); $f18 = wrapper( $f18 ) if $f18;
     my $f19 = substr( $result, 19, 1 );
 
     $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index d186dfa..4686148 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -14,7 +14,7 @@
         <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
         <td>
             <select name="f2" id="f2" size="1">
-            [% IF ( f2 ) %]
+            [% IF ( f2space ) %]
                 <option value=" " selected="selected">Non required value</option>
             [% ELSE %]
                 <option value=" ">Non required value</option>
@@ -494,7 +494,7 @@ languages and obsolete typography)
         <td>
             <select name="f13" id="f13" size="1">
             
-            [% IF ( f13 ) %]
+            [% IF ( f13dblspace ) %]
                     <option value="  " selected="selected">non required value</option>
             [% ELSE %]
                     <option value="  ">non required value</option>
@@ -578,10 +578,10 @@ languages and obsolete typography)</option>
     <td><label for="f15">Script of Title</label></td>
     <td>
     <select name="f15" id="f15" size="1">
-            [% IF ( f15 ) %]
-                    <option value=" " selected="selected">Non required value</option>
+            [% IF ( f15dblspace ) %]
+                    <option value="  " selected="selected">Non required value</option>
             [% ELSE %]
-                    <option value=" ">Non required value</option>
+                    <option value="  ">Non required value</option>
             [% END %]
             
             [% IF ( f15ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 18f652f..f7e5884 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -16,7 +16,7 @@
             	           <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -114,7 +114,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -211,7 +211,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -307,7 +307,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -404,7 +404,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -542,7 +542,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -680,7 +680,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -817,7 +817,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
                         
-                        [% IF ( f8 ) %]
+                        [% IF ( f8space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -949,7 +949,7 @@
         <td><label for="f9">Conference or meeting code:</label></td>
                 <td>
                 <select name="f9" id="f9" size="1">
-               	[% IF ( f1pipe ) %]
+               	[% IF ( f9pipe ) %]
             		<option value="|" selected="selected">|- Filling character</option>
 	            [% ELSE %]
     	        	<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index ccb7624..b661898 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -198,7 +198,7 @@
                             <option value="|">|- Filling character</option>
                         [% END %]
             
-                    [% IF ( f4 ) %]
+                    [% IF ( f4space ) %]
                         <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                         <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 03a94e1..8a7b2eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -48,7 +48,7 @@
 		<td><label for="f3">Colour indicator</label></td>
 		<td>
 	<select name="f3" id="f3" size="1">
-			[% IF ( f1pipe ) %]
+			[% IF ( f3pipe ) %]
 				<option value="|" selected="selected">|- Filling character</option>
 			[% ELSE %]
 				<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index acb0695..70cd050 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -287,12 +287,12 @@
 		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f5dblpipe ) %]
+                            <option value="||" selected="selected">|- Filling character</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f5 ) %]
+                        [% IF ( f5dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -484,12 +484,12 @@
 		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
-			[% IF ( f6pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f6dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f6 ) %]
+			[% IF ( f6dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -685,12 +685,12 @@
 		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-			[% IF ( f7pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f7dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
-			[% IF ( f7 ) %]
+			[% IF ( f7dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -889,12 +889,12 @@
 		<td><label for="f8">Technique (Prints) 1</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f8dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling character</option>
             [% END %]
-                        [% IF ( f8 ) %]
+                        [% IF ( f8dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
@@ -1082,13 +1082,13 @@
 		<td><label for="f9">Technique (Prints) 2</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f9dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1278,13 +1278,13 @@
 		<td><label for="f10">Technique (Prints) 3</label></td>
 		<td>
 			<select name="f10" id="f10" size="1">
-			[% IF ( f10pipe ) %]
-            	<option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f10dblpipe ) %]
+            	<option value="||" selected="selected">||- Filling characters</option>
             [% ELSE %]
-            	<option value="|">|- Filling character</option>
+            	<option value="||">||- Filling characters</option>
             [% END %]
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1472,10 +1472,10 @@
 		<td><label for="f11">Functional Designation</label></td>
 		<td>
 			<select name="f11" id="f11" size="1">
-			[% IF ( f11pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f11dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
                         
 			[% IF ( f11aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index b42650f..376641a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Specific Material Designation</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	           <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f1dblpipe ) %]
+            	           <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
 			[% IF ( f1aa ) %]
@@ -220,13 +220,13 @@
 		<td><label for="f2">Material 1</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f2dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f2 ) %]
+			[% IF ( f2dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -399,13 +399,13 @@
 		<td><label for="f3">Material 2</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f3dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
             
-			[% IF ( f3 ) %]
+			[% IF ( f3dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -579,12 +579,12 @@
 		<td><label for="f4">Material 3</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4pipe ) %]
-                            <option value="|" selected="selected">|- Filling character</option>
+			[% IF ( f4dblpipe ) %]
+                            <option value="||" selected="selected">||- Filling characters</option>
                         [% ELSE %]
-                            <option value="|">|- Filling character</option>
+                            <option value="||">||- Filling characters</option>
                         [% END %]
-                        [% IF ( f4 ) %]
+                        [% IF ( f4dblspace ) %]
                                 <option value="  " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value="  ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index d072701..09ac0df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -71,7 +71,7 @@
 		<td><label for="f4">Relief codes 1:</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -148,7 +148,7 @@
 		<td><label for="f5">Relief codes 2:</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -226,7 +226,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
                         
-                        [% IF ( f6 ) %]
+                        [% IF ( f6space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -304,7 +304,7 @@
 		<td><label for="f7">Relief codes 4:</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
-                        [% IF ( f7 ) %]
+                        [% IF ( f7space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
@@ -661,7 +661,7 @@
 		</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
-			[% IF ( f9 ) %]
+			[% IF ( f9dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -901,10 +901,10 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
-				<option value=" ">non required value</option>
+				<option value="  ">non required value</option>
 			[% END %]
 
 			[% IF ( f10aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index f43bea8..827c506 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -27,7 +27,7 @@
 		<td>
 			<select name="f2" id="f2" size="1">
             
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -64,7 +64,7 @@
 		<td><label for="f3">Primary cartographic image 2:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-                        [% IF ( f3 ) %]
+                        [% IF ( f3space ) %]
                                 <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index c8612de..7bee0bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Literary Text Indicator:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index e212a05..959e4a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -415,7 +415,7 @@
 		<td><label for="f8">Accompanying textual material 1:</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -502,7 +502,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
 			
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -589,7 +589,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
 			
-			[% IF ( f10 ) %]
+			[% IF ( f10space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -676,7 +676,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
 			
-			[% IF ( f11 ) %]
+			[% IF ( f11space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -762,7 +762,7 @@
 		<td><label for="f12">Accompanying textual material 5:</label></td>
 		<td>
 			<select name="f12" id="f12" size="1">
-                        [% IF ( f12 ) %]
+                        [% IF ( f12space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -848,7 +848,7 @@
 		<td><label for="f13">Accompanying textual material 6:</label></td>
 		<td>
 			<select name="f13" id="f13" size="1">
-                        [% IF ( f13 ) %]
+                        [% IF ( f13space ) %]
                             <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                             <option value=" ">non required value</option>
@@ -1038,4 +1038,4 @@
 //]]>
 </script>
 
-[% INCLUDE 'popup-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 7aad5b3..5751b2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -10,10 +10,10 @@
 		<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1pipe ) %]
-            	<option value="|" selected="selected">|- Caract?re de remplissage</option>
+			[% IF ( f1dblpipe ) %]
+            	<option value="||" selected="selected">||- Caract?res de remplissage</option>
             [% ELSE %]
-            	<option value="|">|- Caract?re de remplissage</option>
+            	<option value="||">||- Caract?res de remplissage</option>
             [% END %]
 
 			[% IF ( f1ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 8e66d82..6edba01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -89,7 +89,7 @@
 		<td>
 			<select name="f3" id="f3" size="1">
 
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 29b46e4..152c6f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -11,7 +11,7 @@
 		<td>
 			<select name="f1" id="f1" size="1">
             
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 0201d04..689e775 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -10,7 +10,7 @@
 		<td><label for="f1">Illustration - Book 1:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
-			[% IF ( f1 ) %]
+			[% IF ( f1space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -105,7 +105,7 @@
 		<td><label for="f2">Illustration - Book 2:</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
-			[% IF ( f2 ) %]
+			[% IF ( f2space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -201,7 +201,7 @@
 		<td><label for="f3">Illustration - Book 3:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
-			[% IF ( f3 ) %]
+			[% IF ( f3space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -297,7 +297,7 @@
 		<td>
 			<select name="f4" id="f4" size="1">
             
-			[% IF ( f4 ) %]
+			[% IF ( f4space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -394,7 +394,7 @@
 		<td>
 			<select name="f5" id="f5" size="1">
             
-			[% IF ( f5 ) %]
+			[% IF ( f5space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -465,7 +465,7 @@
 		<td>
 			<select name="f6" id="f6" size="1">
             
-			[% IF ( f6 ) %]
+			[% IF ( f6space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -537,7 +537,7 @@
 		<td>
 			<select name="f7" id="f7" size="1">
             
-			[% IF ( f7 ) %]
+			[% IF ( f7space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -608,7 +608,7 @@
 		<td>
 			<select name="f8" id="f8" size="1">
             
-			[% IF ( f8 ) %]
+			[% IF ( f8space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -679,7 +679,7 @@
 		<td>
 			<select name="f9" id="f9" size="1">
             
-			[% IF ( f9 ) %]
+			[% IF ( f9space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -732,7 +732,7 @@
 		<td>
 			<select name="f10" id="f10" size="1">
             
-			[% IF ( f10 ) %]
+			[% IF ( f10dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -888,7 +888,7 @@
 		<td>
 			<select name="f11" id="f11" size="1">
             
-			[% IF ( f11 ) %]
+			[% IF ( f11dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1046,7 +1046,7 @@
 			<td>
 			<select name="f12" id="f12" size="1">
             
-			[% IF ( f12 ) %]
+			[% IF ( f12dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1202,7 +1202,7 @@
 		<td>
 			<select name="f13" id="f13" size="1">
             
-			[% IF ( f13 ) %]
+			[% IF ( f13dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1358,7 +1358,7 @@
 		<td>
 			<select name="f14" id="f14" size="1">
 
-			[% IF ( f14 ) %]
+			[% IF ( f14dblspace ) %]
 				<option value="  " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value="  ">non required value</option>
@@ -1527,7 +1527,7 @@
 		<td>
 			<select name="f15" id="f15" size="1">
 
-			[% IF ( f15 ) %]
+			[% IF ( f15space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1570,7 +1570,7 @@
 		<td>
 			<select name="f16" id="f16" size="1">
 
-			[% IF ( f16 ) %]
+			[% IF ( f16space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
@@ -1611,7 +1611,7 @@
 		<td>
 			<select name="f17" id="f17" size="1">
 
-         		[% IF ( f17 ) %]
+         		[% IF ( f17space ) %]
 				<option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 24ffc74..6e53881 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -188,7 +188,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f8 ) %]
+				[% IF ( f8space ) %]
 					<option value=" " selected="selected"> - Hierarchical relationship undefined</option>
 				[% ELSE %]
 					<option value=" "> - Hierarchical relationship undefined</option>
@@ -230,7 +230,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f17 ) %]
+				[% IF ( f17space ) %]
 					<option value=" " selected="selected"> Full level ("item in hand")</option>
 				[% ELSE %]
 					<option value=" "> Full level ("item in hand")</option>
@@ -264,7 +264,7 @@
             	<option value="|">|- Filling character</option>
             [% END %]
             
-				[% IF ( f18 ) %]
+				[% IF ( f18space ) %]
 					<option value=" " selected="selected"> - In full ISBD form</option>
 				[% ELSE %]
 					<option value=" "> - In full ISBD form</option>
-- 
1.7.2.5


From robin at catalyst.net.nz  Mon Jun 20 08:06:10 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 20 Jun 2011 18:06:10 +1200
Subject: [Koha-patches] [PATCH] Bug 6513 - make the routing list search work
	properly, and faster too.
Message-ID: <1308549970-19617-1-git-send-email-robin@catalyst.net.nz>

---
 C4/Members.pm                                      |   71 ++++++++++++-
 .../prog/en/modules/serials/member-search.tt       |    7 +-
 serials/member-search.pl                           |  111 ++++++++-----------
 3 files changed, 119 insertions(+), 70 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..07a06b3 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -124,6 +124,10 @@ BEGIN {
         &fixup_cardnumber
         &checkcardnumber
     );
+
+    push @EXPORT_OK, qw(
+        FindByPartialName
+    );
 }
 
 =head1 NAME
@@ -285,10 +289,14 @@ C<&search_on_fields> is an array ref to the fieldnames you want to limit search
 
 C<&searchtype> is a string telling the type of search you want todo : start_with, exact or contains are allowed
 
+C<skipExtendedAttributes> is a boolean that tells us to avoid searching the
+extended attributes even if we otherwise would.
+
 =cut
 
 sub Search {
-    my ( $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype ) = @_;
+    my ( $filter, $orderby, $limit, $columns_out, $search_on_fields,
+        $searchtype, $skipExtendedAttributes ) = @_;
     my @filters;
     my %filtersmatching_record;
     my @finalfilter;
@@ -297,7 +305,8 @@ sub Search {
     } else {
         push @filters, $filter;
     }
-    if ( C4::Context->preference('ExtendedPatronAttributes') ) {
+    if (!$skipExtendedAttributes &&
+    	C4::Context->preference('ExtendedPatronAttributes') ) {
         my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter);
         if(scalar(@$matching_records)>0) {
 			foreach my $matching_record (@$matching_records) {
@@ -314,6 +323,64 @@ sub Search {
     return ($data);
 }
 
+=head2 FindByPartialName
+
+  @result = FindByPartialName('string', categorycode => 'C', branchcode => 'L' );
+
+This is a simplified version of the "Search" function above. It compares what
+has been entered against the surname, firstname, othernames, and email as 
+a prefix, a literal match against the barcode, and allows filtering by the
+user's library and category.
+
+=head3 RETURNS
+
+An array of hashrefs that contain the values from the borrowers table of things
+that match.
+
+=head3 NOTES
+
+Supplying all fields as blank or C<undef> will return all users. Searches that
+have no result will end up in an empty list. If you get undef, there was
+an error of some sort.
+
+=cut
+
+sub FindByPartialName {
+    my ($prefix, %options) = @_;
+
+    my $qry_start = 'SELECT * FROM borrowers';
+    my ($qry_end, @params);
+    if ($prefix) {
+    	$qry_end .= <<EOH;
+(surname LIKE ? OR
+firstname LIKE ? OR
+othernames  LIKE ? OR
+email LIKE ? OR
+cardnumber=?)
+EOH
+        push @params, ("$prefix%","$prefix%","$prefix%","$prefix%", $prefix);
+    }
+    foreach my $field ("categorycode", "branchcode") {
+    	next if !$options{$field};
+    	my $val = $options{$field};
+        my $q = "($field=?)";
+        push @params, $val;
+        $qry_end .= ($qry_end ? " AND $q" : $q) . "\n";
+    }
+    my $qry_sort = " ORDER BY surname,firstname DESC";
+    my $query = "$qry_start " . ($qry_end ? "WHERE $qry_end" : '') . " $qry_sort";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    eval { $sth->execute(@params) };
+	if ($@) {
+    	warn $@;
+    	return undef;
+    }
+    my $result = $sth->fetchall_arrayref( {} );
+    return @$result;
+}
+
 =head2 GetMemberDetails
 
 ($borrower) = &GetMemberDetails($borrowernumber, $cardnumber);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
index 91172be..67e3614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
@@ -24,10 +24,9 @@ function add_member(subscriptionid,borrowernumber){
 	<form action="[% actionname %]" method="get">
             <input type="hidden" name="subscriptionid" id="subscriptionid" value="[% subscriptionid %]" />
 		<fieldset class="rows">
-			<legend> Filter :</legend>
+			<legend> Filter:</legend>
 			<ol>
-			<li><label for="member">Name:</label> <input type="hidden" name="surname" value="[% surname %]" />
-			<input type="text" name="member" id="member" value="[% member %]" /></li>
+			<li><label for="member">Name:</label><input type="text" name="member" id="member" value="[% member %]" /></li>
 			<li><label for="branchcode"> Library :</label><select name="branchcode" id="branchcode">
 			<option value="">Any</option>[% FOREACH branchloo IN branchloop %]
 			[% IF ( branchloo.selected ) %]
@@ -46,7 +45,7 @@ function add_member(subscriptionid,borrowernumber){
 	  </form>
 </div> 
 [% IF ( resultsloop ) %]
-<div id="searchheader" style="margin-top:.7em;"> <h3>Results [% from %] to [% to %] of [% numresults %] found for [% IF ( member ) %]'<span class="ex">[% member %]</span>'[% END %][% IF ( surname ) %]'<span class="ex">[% surname %]</span>'[% END %]</h3></div>
+<div id="searchheader" style="margin-top:.7em;"> <h3>Results [% from %] to [% to %] of [% numresults %] found [% IF ( member ) %]for '<span class="ex">[% member %]</span>'[% END %]</h3></div>
 <div class="searchresults">
 
 <table id="memberresultst">
diff --git a/serials/member-search.pl b/serials/member-search.pl
index f027df5..60b19e3 100755
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -28,7 +28,7 @@ use warnings;
 use CGI;
 use C4::Auth;       # get_template_and_user
 use C4::Output;
-use C4::Members;    # BornameSearch
+use C4::Members qw/ FindByPartialName /;
 use C4::Branch;
 use C4::Category;
 use File::Basename;
@@ -38,19 +38,17 @@ my $theme = $cgi->param('theme') || "default";
 my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
 my $startfrom = $cgi->param('startfrom')||1;
 
-my $patron = $cgi->Vars;
-foreach (keys %$patron){
-    delete $$patron{$_} unless($$patron{$_});
-}
+my $member=$cgi->param('member');
+my $branchcode = $cgi->param('branchcode');
+my $categorycode = $cgi->param('categorycode');
 
 my @categories=C4::Category->all;
-my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop());
-my $subscriptionid = $cgi->param('subscriptionid');
-my $searchstring   = $cgi->param('member');
+my @branches=@{ GetBranchesLoop(
+    $branchcode || undef
+) };
 
-my %categories_dislay;
-my ($template, $loggedinuser, $cookie);
-    ($template, $loggedinuser, $cookie)
+my %categories_display;
+my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "serials/member-search.tmpl",
                  query => $cgi,
                  type => "intranet",
@@ -63,84 +61,69 @@ foreach my $category (@categories){
 			category_description=>$$category{description},
 			category_type=>$$category{category_type}
 			 };
-	$categories_dislay{$$category{categorycode}} = $hash;
+	$categories_display{$$category{categorycode}} = $hash;
 }
-$template->param(
-        "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
-            );
 if (C4::Context->preference("AddPatronLists")=~/code/){
     $categories[0]->{'first'}=1;
 }
 
-my $member=$cgi->param('member');
-my $orderby=$cgi->param('orderby');
-$orderby = "surname,firstname" unless $orderby;
-if (defined $member) {
-    $member =~ s/,//g;   #remove any commas from search string
-    $member =~ s/\*/%/g;
-}
 
-my ($count,$results);
+my ($count, at results) = (0);
+
+my $shouldsearch = $branchcode || $categorycode || $member;
 
 if (C4::Context->preference("IndependantBranches")){
    if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){
-        $$patron{branchcode}=C4::Context->userenv->{'branch'} unless (C4::Context->userenv->{'branch'} eq "insecure");
+        $branchcode = C4::Context->userenv->{'branch'} unless (C4::Context->userenv->{'branch'} eq "insecure");
    }
 }
-$$patron{firstname}.="\%" if ($$patron{firstname});
-$$patron{surname}.="\%" if ($$patron{surname});
 
-my @searchpatron;
-push @searchpatron, $member if ($member);
-push @searchpatron, $patron if ( keys %$patron );
+
 my $from = ( $startfrom - 1 ) * $resultsperpage;
 my $to   = $from + $resultsperpage;
-if (@searchpatron) {
-    ($results) = Search(
-        \@searchpatron,
-        [ { surname => 0 }, { firstname => 0 } ],
-        undef,
-        undef,
-        [ "firstname", "surname", "email", "othernames", "cardnumber" ],
-        "start_with"
+if ($shouldsearch) {
+    @results = FindByPartialName(
+        $member,
+        categorycode    => $categorycode,
+        branchcode      => $branchcode,
     );
 }
-if ($results) {
-    $count = scalar(@$results);
+if (@results) {
+    $count = @results;
 }
 my @resultsdata;
 $to=($count>$to?$to:$count);
 my $index=$from;
-foreach my $borrower(@$results[$from..$to-1]){
+foreach my $borrower (@results[$from..$to-1]){
     # find out stats
-    $borrower->{'dateexpiry'}= C4::Dates->new($borrower->{'dateexpiry'},'iso')->output('syspref');
-    if ($categories_dislay{$borrower->{'categorycode'}}){
+    if ($categories_display{$borrower->{'categorycode'}}){
         my %row = (
-	    count => $index++,
-	    %$borrower,
-	    %{$categories_dislay{$$borrower{categorycode}}},
-	);
-	push(@resultsdata, \%row);
-    }
-    else {
-	 warn $borrower->{'cardnumber'} ." has a bad category code of " . $borrower->{'categorycode'} ."\n";
+            count => $index++,
+            %$borrower,
+            %{$categories_display{$$borrower{categorycode}}},
+        );
+        push(@resultsdata, \%row);
+    } else {
+        warn $borrower->{'cardnumber'} ." has a bad category code of " . $borrower->{'categorycode'} ."\n";
     }
 }
-if ($$patron{branchcode}){
-	foreach my $branch (grep{$_->{value} eq $$patron{branchcode}}@$branches){
+if ($branchcode){
+	foreach my $branch (grep {$_->{value} eq $branchcode} @branches){
 		$$branch{selected}=1;
 	}
 }
-if ($$patron{categorycode}){
-	foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){
+if ($categorycode){
+	foreach my $category (grep {$_->{categorycode} eq $categorycode} @categories){
 		$$category{selected}=1;
 	}
 }
-my %parameters=
-(  %{$patron},
-    'orderby' => $orderby,
-    'resultsperpage' => $resultsperpage,
-    'type'=> 'intranet');
+my %parameters=(
+    member          => $member,
+    categorycode    => $categorycode,
+    branchcode      => $branchcode,
+    resultsperpage  => $resultsperpage,
+    type            => 'intranet'
+);
 my $base_url =
     'member-search.pl?&amp;'
   . join(
@@ -158,18 +141,18 @@ $template->param(
     to        => $to,
     multipage => ($count != $to+1 || $startfrom!=1),
 );
+
 $template->param(
-    branchloop=>$branches,
+    branchloop=>\@branches,
 	categoryloop=>\@categories,
 );
 
-
 $template->param(
-        searching       => "1",
+        searching       => $shouldsearch,
 		actionname		=> basename($0),
-		%$patron,
+		%parameters,
         numresults      => $count,
         resultsloop     => \@resultsdata,
-            );
+);
 
 output_html_with_http_headers $cgi, $cookie, $template->output;
-- 
1.7.4.1


From robin at catalyst.net.nz  Mon Jun 20 09:07:37 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 20 Jun 2011 19:07:37 +1200
Subject: [Koha-patches] [PATCH] Bug 6513 - ensure the subscription ID gets
	carried across
In-Reply-To: <1308549970-19617-1-git-send-email-robin@catalyst.net.nz>
References: <1308549970-19617-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <1308553657-20875-1-git-send-email-robin@catalyst.net.nz>

---
 .../prog/en/modules/serials/member-search.tt       |    2 +-
 serials/member-search.pl                           |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
index 67e3614..ddb8445 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
@@ -63,7 +63,7 @@ function add_member(subscriptionid,borrowernumber){
 		<td>[% resultsloo.cardnumber %] </td>
 		<td>[% resultsloo.surname %], [% resultsloo.firstname %] </td>
 		<td>[% resultsloo.branchcode %] </td>
-		<td><a onclick="add_member([% subscriptionid %],[% resultsloo.borrowernumber %]); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% resultsloo.subscriptionid %]&amp;borrowernumber=[% resultsloo.borrowernumber %]&amp;op=add">Add</a></td></tr>
+		<td><a onclick="add_member([% subscriptionid %],[% resultsloo.borrowernumber %]); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;borrowernumber=[% resultsloo.borrowernumber %]&amp;op=add">Add</a></td></tr>
 		[% END %]
 	</tbody>
 </table>
diff --git a/serials/member-search.pl b/serials/member-search.pl
index 60b19e3..7f12277 100755
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -41,6 +41,7 @@ my $startfrom = $cgi->param('startfrom')||1;
 my $member=$cgi->param('member');
 my $branchcode = $cgi->param('branchcode');
 my $categorycode = $cgi->param('categorycode');
+my $subscriptionid = $cgi->param('subscriptionid');
 
 my @categories=C4::Category->all;
 my @branches=@{ GetBranchesLoop(
@@ -122,6 +123,7 @@ my %parameters=(
     categorycode    => $categorycode,
     branchcode      => $branchcode,
     resultsperpage  => $resultsperpage,
+    subscriptionid  => $subscriptionid,
     type            => 'intranet'
 );
 my $base_url =
-- 
1.7.4.1


From robin at catalyst.net.nz  Tue Jun 21 06:42:58 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Tue, 21 Jun 2011 16:42:58 +1200
Subject: [Koha-patches] [PATCH] Bug 6521 - allow blank cardnumbers to not
	trigger "already in use"
Message-ID: <1308631378-4809-1-git-send-email-robin@catalyst.net.nz>

Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.
---
 C4/Members.pm          |    3 +++
 members/memberentry.pl |   28 +++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..c6c6985 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -900,6 +900,7 @@ sub fixup_cardnumber ($) {
 
     #     if ($cardnumber !~ /\S/ && $autonumber_members) {
     ($autonumber_members) or return $cardnumber;
+    defined($cardnumber) or return $cardnumber;
     my $checkdigit = C4::Context->preference('checkdigit');
     my $dbh = C4::Context->dbh;
     if ( $checkdigit and $checkdigit eq 'katipo' ) {
@@ -1261,6 +1262,8 @@ sub checkuniquemember {
 
 sub checkcardnumber {
     my ($cardnumber,$borrowernumber) = @_;
+    # If cardnumber is null, we assume they're allowed.
+    return 0 if !defined($cardnumber);
     my $dbh = C4::Context->dbh;
     my $query = "SELECT * FROM borrowers WHERE cardnumber=?";
     $query .= " AND borrowernumber <> ?" if ($borrowernumber);
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 61c3c2c..be34cc4 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -236,19 +236,22 @@ if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){
 $debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
 my $extended_patron_attributes = ();
 if ($op eq 'save' || $op eq 'insert'){
-  if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
-    push @errors, 'ERROR_cardnumber';
-  } 
-  my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
-  if ($newdata{dateofbirth} && $dateofbirthmandatory) {
-    my $age = GetAge($newdata{dateofbirth});
-    my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
-	my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
-    if (($high && ($age > $high)) or ($age < $low)) {
-      push @errors, 'ERROR_age_limitations';
-	  $template->param('ERROR_age_limitations' => "$low to $high");
+    # If the cardnumber is blank, treat it as null.
+    $newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
+
+    if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
+        push @errors, 'ERROR_cardnumber';
+    } 
+    my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
+    if ($newdata{dateofbirth} && $dateofbirthmandatory) {
+        my $age = GetAge($newdata{dateofbirth});
+        my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
+        my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
+        if (($high && ($age > $high)) or ($age < $low)) {
+            push @errors, 'ERROR_age_limitations';
+            $template->param('ERROR_age_limitations' => "$low to $high");
+        }
     }
-  }
   
     if($newdata{surname} && C4::Context->preference('uppercasesurnames')) {
         $newdata{'surname'} = uc($newdata{'surname'});
@@ -396,7 +399,6 @@ if ( $op eq "duplicate" ) {
     $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
 }
 
-# my $cardnumber=$data{'cardnumber'};
 $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
 if(!defined($data{'sex'})){
     $template->param( none => 1);
-- 
1.7.4.1


From magnus at enger.priv.no  Tue Jun 21 09:06:58 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Tue, 21 Jun 2011 09:06:58 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6483 - Paging in
	opac-detail when coming from a search
Message-ID: <1308640018-3332-1-git-send-email-magnus@enger.priv.no>

From: Salvador Zaragoza Rubio <salvazm at masmedios.com>

Add paging in opac-detail when coming from a search to be
able to continue viewing the previous and next register
from the detail without returning to the results.
The partial list pagination can be showed to increase forwarding
or rewinding in the pagination.
It's implemented for Zebra search and not build_grouped_results.

The param busc with all the information from the search is stored
on the session when running opac-search and opac-detail, outside these
pages the busc param is removed from the session.

A list of the biblionumbers inside the OPACnumSearchResults range
is passed to avoid repeating the searching everytime we see the
previous or next biblio. The searching will be run again when
we are going to exceed the list and a new one will be calculated
from the new search.

Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 C4/Auth.pm                                         |    5 +
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  165 +++++++++++-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |  176 ++++++++++++
 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif  |  Bin 0 -> 58 bytes
 opac/opac-detail.pl                                |  284 +++++++++++++++++++-
 opac/opac-search.pl                                |   37 +++
 6 files changed, 665 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 C4/Auth.pm
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/css/opac.css
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif

diff --git a/C4/Auth.pm b/C4/Auth.pm
old mode 100644
new mode 100755
index b416449..0b931df
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -386,6 +386,11 @@ sub get_template_and_user {
         my $LibraryNameTitle = C4::Context->preference("LibraryName");
         $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
         $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
+        # clean up the busc param in the session if the page is not opac-detail
+        if ($in->{'template_name'} =~ /opac-(.+)\.(?:tt|tmpl)$/ && $1 !~ /^(?:MARC|ISBD)?detail$/) {
+            my $sessionSearch = get_session($sessionID || $in->{'query'}->cookie("CGISESSID"));
+            $sessionSearch->clear(["busc"]) if ($sessionSearch->param("busc"));
+        }
         # variables passed from CGI: opac_css_override and opac_search_limits.
         my $opac_search_limit = $ENV{'OPAC_SEARCH_LIMIT'};
         my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
old mode 100644
new mode 100755
index aa295c9..6d0bfe9
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1884,7 +1884,7 @@ table#items th {
 	padding : 2px;
 }
 #action {
-	margin-top: 0;
+	/*margin-top: 0;*/
 }
 #similars h4 {
 	text-align : left;
@@ -2014,3 +2014,166 @@ div.ft {
 #opac-isbddetail #isbdcontents { margin-top: 2em; }
 
 div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }
+
+
+/* pagination */
+.pagination {
+    position: absolute;
+    top:32px;
+    left: -1px;
+    width: 100%;
+    height:auto;
+    border: 1px solid #D0D0D0;
+    display: none;
+	background-color:#F3F3F3;
+	padding-bottom:10px;
+}
+
+
+/* nav */
+.nav .close_pagination {
+    padding-right: 10px;
+    position: absolute;
+    right: 3px;
+    top: -25px;
+}
+.nav .close_pagination a {
+    text-decoration:none!important;
+}
+
+.nav ul {
+    padding-top: 10px;
+}
+
+.nav li {
+	list-style:none;
+	float:left;
+	padding:4px;
+	color:#999;
+}
+
+.nav li a {
+	text-decoration:none!important;
+}
+
+.nav li a:hover {
+	text-decoration:underline;
+}
+
+.nav li ul {
+	float:left;
+}
+
+.back {
+	float:right;
+}
+
+.back input{
+	background:none!important;
+	color:#999!important;
+}
+
+.pagination_list {
+	float:bottom;
+}
+.pagination_list ul {
+    padding-top: 40px;
+	padding-left:0px;
+}
+.pagination_list li {
+	list-style:none;
+	float:bottom;
+	padding:4px;
+	color:#999;
+   /* border-bottom : 1px solid #DDDDDD;*/
+}
+.pagination_list li.highlight {
+   background-color : #F3F3F3;
+   border-top : 1px solid #DDDDDD;
+   border-bottom : 1px solid #DDDDDD;
+}
+.pagination_list span.li_pag_index {
+   color: #999999;
+    float: left;
+    font-size: 15px;
+    font-weight: bold;
+    padding-right: 10px;
+    text-align: right;
+    width: 13px;
+	
+}
+
+.pagination_list li a {padding-left:0px;}
+
+
+.nav_results {
+    background-color: #F3F3F3;
+    border: 1px solid #D0D0D0;
+    margin-top: 0.5em;
+	position:relative;
+}
+
+.nav_results .l_Results a {
+    background:#E1E1E1 url("../../images/ico_b_results.gif") 14px 13px no-repeat;
+    color:#006699;
+    display:block;
+    padding:8px 28px;
+    text-decoration:none;
+}
+.nav_results .l_Results a:hover {
+    background-color:#D9D9D9;
+}
+.nav_results ul.pg_menu {
+    height:25px;
+    border-top: 1px solid #D0D0D0;
+}
+.nav_results ul.pg_menu li {
+    color:#B2B2B2;
+    display:block;
+    float:left;
+    padding:5px 0;
+    list-style:none;
+    text-align:center;
+}
+.nav_results ul.pg_menu li.back_results {
+    padding:5px 0px;
+    width:45%;
+    border-left: 1px solid #D0D0D0;
+    border-right: 1px solid #D0D0D0;
+}
+.nav_results ul.pg_menu li a {
+    text-decoration:none;
+    font-weight:normal;
+    color:#4D4D4D;
+}
+.nav_results ul.pg_menu li a:hover {
+    color:#006699;
+}
+.nav_results ul.pg_menu li.left_results {
+    margin-right:10px;
+}
+.nav_results ul.pg_menu li.right_results {
+    margin-left:10px;
+}
+
+.nav_results #listResults{
+    line-height: 0.7em;
+}
+
+.nav_results  #listResults li  {
+    background-color:#999999;
+    color:#C5C5C5;
+    font-weight:normal;
+	display:block;
+	margin-right:1px;
+	font-size:0.9em;
+	padding:5px 0px;
+	text-align:center;
+	min-width:20px;
+}
+
+.nav_results  #listResults li:hover  {background-color:#006699;}
+
+.nav_results  #listResults li a { color:#FFFFFF; font-weight:normal;}
+
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
old mode 100644
new mode 100755
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
old mode 100644
new mode 100755
index 534aeee..3676dfd
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -3,6 +3,17 @@
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
+    [% IF ( busc ) %]
+        var arrPagination = new Array();
+        var pag_index_ini = [% indexPag %];
+        [% IF ( listResults ) %]
+            [% FOREACH listResult IN listResults %]
+                arrPagination[[% listResult.index %]] = {url:"[% listResult.url %]", title:"[% listResult.title|html %]", author:"[% listResult.author|html %]", biblionumber:[% listResult.biblionumber %]};
+           [% END %]
+        [% END %]
+    [% END %]
+
+
      $(document).ready(function() { 
         $('#bibliodescriptions > ul').tabs();
 [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]$("#tagform").hide();
@@ -24,9 +35,151 @@
         });[% IF ( GoogleJackets ) %]
         KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);[% END %][% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]
         $(".tagbutton").click(KOHA.Tags.add_tag_button);[% END %][% END %][% END %]
+        [% IF ( busc ) %]
+        if (arrPagination.length > 0) {
+            renderPagIndexList(pag_index_ini, $("#listResults"));
+        }
+        $("#a_listResults").click(function(e) {
+            if (arrPagination.length > 0) {
+                e.preventDefault();
+                var navigation = $(".pagination");
+                if (navigation.css("display") == 'none') {
+                    navigation.show();
+                    var newtitle = $(this).attr('title').replace('Show', 'Hide')
+                    $(this).attr('title',newtitle);
+                    renderPagination(pag_index_ini, arrPagination.length - 1, $("#ul_pagination_list"), false);
+                } else {
+                    navigation.hide();
+                    var newtitle = $(this).attr('title').replace('Hide', 'Show')
+                    $(this).attr('title',newtitle);
+                }
+            }
+        });
+        $("#close_pagination").click(function(e) {
+            e.preventDefault();
+            var navigation = $(".pagination");
+            navigation.hide();
+        });
+        [% END %]
 
 });
 
+
+[% IF ( busc ) %]
+
+var timeoutRFW;
+var totalPagItemList = 10;
+
+function rewindList()
+{
+    var ul = $("#listResults");
+    var li_ini = ul.children(':first').next();
+    var index_ini = pag_index_ini;
+    if (li_ini) {
+        index_ini = parseInt(li_ini.attr("class").substring(7), 10);
+    }
+    var li_end = ul.children(':last').prev();
+    var index_end = arrPagination.length - 1;
+    if (li_end) {
+        index_end = parseInt(li_end.attr("class").substring(7), 10);
+    }
+    if (index_ini > pag_index_ini) {
+        renderPagIndexList(index_ini - 1, ul, false);
+        renderPagination(index_ini - 1, arrPagination.length - 1, $("#ul_pagination_list"), true);
+    }
+}//rewindList
+
+function forwardList()
+{
+    var ul = $("#listResults");
+    var li_ini = ul.children(':first').next();
+    var index_ini = pag_index_ini;
+    if (li_ini) {
+        index_ini = parseInt(li_ini.attr("class").substring(7), 10);
+    }
+    var li_end = ul.children(':last').prev();
+    var index_end = arrPagination.length - 1;
+    if (li_end) {
+        index_end = parseInt(li_end.attr("class").substring(7), 10);
+    }
+    if (index_end < arrPagination.length - 1) {
+        renderPagIndexList(index_ini + 1, ul, false);
+        renderPagination(index_ini + 1, arrPagination.length - 1, $("#ul_pagination_list"), true);
+    }
+}//forwardList
+
+function renderPagIndexList(index, ul)
+{
+    var $kids = ul.children("li");
+    if ($kids.length > 0) {
+        $kids.each(function() {
+            $(this).remove();
+        });
+    }
+    var li;
+    var html = "";
+    var ini = index - 1;
+    var end = ini + totalPagItemList - 1;
+    li = $("<li />");
+    html = (index > pag_index_ini)?"<a href='#' id='rew_list_index' onclick='rewindList()' title='Click to rewind the list to " + ini + " - " + end + "'>&laquo;</a>":"&laquo;";
+    li.html(html);
+    ul.append(li);
+    var title = "";
+    for (var i=index; i < arrPagination.length && i < index + totalPagItemList; i++) {
+        if (arrPagination[i] == undefined) continue;
+        var li = $("<li />");
+        if (arrPagination[i].url != "") {
+            title = "See biblio &quot;" + arrPagination[i].title + "&quot; ";
+            if (arrPagination[i].author != "") title += " by &quot;" + arrPagination[i].author + "&quot;";
+            title += " with biblionumber " + arrPagination[i].biblionumber;
+            html = "<a href='" + arrPagination[i].url + "' title='" + title + "' class='a_pag' id='a_pag_" + i + "'";
+            html += " onmouseover='renderPagination(" + i + ", " + (arrPagination.length - 1) + ", $(\"#ul_pagination_list\"), true)'";
+            html += ">" + i + "</a>";
+        } else html = i;
+        li.html(html);
+        li.attr("class", "li_pag_" + i);
+        ul.append(li);
+    }
+    li = $("<li />");
+    ini = index + 1;
+    end = (arrPagination.length > index + totalPagItemList)?index + totalPagItemList:arrPagination.length - 1;
+    html = (end <= arrPagination.length - 1 && (end - index) >= totalPagItemList)?"<a href='#' id='fw_list_index' onclick='forwardList()' title='Click to forward the list to " + ini + " - " + end + "'>&raquo;</a>":"&raquo;";
+    li.html(html);
+    ul.append(li);
+}//renderPagIndexList
+
+
+function renderPagination(index, total, ul, highlIndex)
+{
+    for (var i = pag_index_ini; i <= total; i++) {
+        if (arrPagination[i] == undefined || arrPagination[i].url == "") continue;
+        $("#li_pag_" + i).remove();
+    }
+    var j = 0;
+    for (var i = index; i <= total && j < totalPagItemList; i++) {
+        if (arrPagination[i] == undefined || arrPagination[i].url == "") continue;
+        var li = $("<li id='li_pag_" + i + "' " + ((j % 2 == 0)?"class='highlight'":"")  + " title='Go to detail' />");
+        var html = "<span class='li_pag_index'>" + i + "</span><a href='" + arrPagination[i].url + "'>" + arrPagination[i].title + "</a>";
+        if (arrPagination[i].author) html += "<br /> by " + arrPagination[i].author;
+        li.html(html);
+        if (highlIndex && i == index) li.css("backgroundColor", "#DDDDDD");
+        ul.append(li);
+        j++;
+    }
+    for (i = pag_index_ini; i < index && j < totalPagItemList; i++) {
+        if (arrPagination[i] == undefined || arrPagination[i].url == "") continue;
+        $("#li_pag_" + i).remove();
+        var li = $("<li id='li_pag_" + i + "' " + ((j % 2 == 0)?"class='highlight'":"")  + " title='Go to detail' />");
+        var html = "<span class='li_pag_index'>" + i + "</span><a href='" + arrPagination[i].url + "'>" + arrPagination[i].title + "</a>";
+        if (arrPagination[i].author) html += "<br /> by " + arrPagination[i].author;
+        li.html(html);
+        ul.append(li);
+        j++;
+    }
+}//renderPagination
+[% END %]
+
+
 YAHOO.util.Event.onContentReady("furtherm", function () {
     $("#furtherm").css("display","block").css("visibility","hidden");
 	$("#furthersearches").parent().show();
@@ -787,12 +940,35 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %]
 [% END %]
 
+
 </div>
 </div>
 </div>
 
+
 <div class="yui-u">
 <div id="ulactioncontainer" class="container">
+[% IF ( busc ) %]
+    <div class="nav_results">
+        <div class="l_Results">[% IF ( listResults ) %]<a href="#" id="a_listResults" title="Show pagination list ([% indexPag %]-[% indexPagEnd %] / [% totalPag %])">Browse results</a>[% ELSE %]Browse results[% END %]</div>
+        <ul class="pg_menu">
+            <li class="left_results">[% IF ( previous ) %]<a href="[% previous %]" title="See: [% IF ( previousTitle ) %][% previousTitle |html %][% ELSE %]previous biblio[% END %]">&laquo; Previous</a>[% ELSE %]Previous[% END %]</li>
+            <li class="back_results"><a href="opac-search.pl?[% busc %]" title="Back to the results search list">Back to results</a></li>
+            <li class="right_results">[% IF ( next ) %]<a href="[% next %]" title="See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END %]">Next &raquo;</a>[% ELSE %]Next[% END %]</li>
+        </ul>
+        [% IF ( listResults ) %]
+        <div class="pagination">
+            <div class="nav">
+                <span class="close_pagination"><a href="#" id="close_pagination">Close</a></span>
+                <ul id="listResults"></ul>
+            </div>
+            <div class="pagination_list">
+                <ul id="ul_pagination_list"></ul>
+            </div>
+        </div>
+        [% END %]
+    </div>
+[% END %]
 <ul id="action">
 
 [% UNLESS ( norequests ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
old mode 100644
new mode 100755
diff --git a/koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif b/koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3db88f2775d87022ab4e4c101ead50f6215b9383
GIT binary patch
literal 58
zcmZ?wbhEHb<X~WDn8*ME|NsAINSg^H6 at RiYGB7YR=zv5)@(fJeQ}P$D?l^O&(R&sX
GgEau(#SqW{

literal 0
HcmV?d00001

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 6345da1..3cd871a 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -23,7 +23,7 @@ use strict;
 use warnings;
 
 use CGI;
-use C4::Auth;
+use C4::Auth qw(:DEFAULT get_session);
 use C4::Branch;
 use C4::Koha;
 use C4::Serials;    #uses getsubscriptionfrom biblionumber
@@ -66,6 +66,288 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 
 my $biblionumber = $query->param('biblionumber') || $query->param('bib');
 
+# We look for the busc param to build the simple paging from the search
+my $session = get_session($query->cookie("CGISESSID"));
+my %paging = (previous => {}, next => {});
+if ($session->param('busc')) {
+    use C4::Search;
+
+    # Rebuild the string to store on session
+    sub rebuildBuscParam
+    {
+        my $arrParamsBusc = shift;
+
+        my $pasarParams = '';
+        my $j = 0;
+        for (keys %$arrParamsBusc) {
+            if ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|total|offset|offsetSearch|next|previous|count|expand|scan)/) {
+                if (defined($arrParamsBusc->{$_})) {
+                    $pasarParams .= '&amp;' if ($j);
+                    $pasarParams .= $_ . '=' . $arrParamsBusc->{$_};
+                    $j++;
+                }
+            } else {
+                for my $value (@{$arrParamsBusc->{$_}}) {
+                    $pasarParams .= '&amp;' if ($j);
+                    $pasarParams .= $_ . '=' . $value;
+                    $j++;
+                }
+            }
+        }
+        return $pasarParams;
+    }#rebuildBuscParam
+
+    # Search given the current values from the busc param
+    sub searchAgain
+    {
+        my ($arrParamsBusc, $offset, $results_per_page) = @_;
+
+        my $expanded_facet = $arrParamsBusc->{'expand'};
+        my $branches = GetBranches();
+        my @servers;
+        @servers = @{$arrParamsBusc->{'server'}} if $arrParamsBusc->{'server'};
+        @servers = ("biblioserver") unless (@servers);
+        my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
+        my @sort_by = @{$arrParamsBusc->{'sort_by'}} if $arrParamsBusc->{'sort_by'};
+        $sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
+        my ($error, $results_hashref, $facets);
+        eval {
+            ($error, $results_hashref, $facets) = getRecords($arrParamsBusc->{'query'},$arrParamsBusc->{'simple_query'},\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'});
+        };
+        my $hits;
+        my @newresults;
+        for (my $i=0;$i<@servers;$i++) {
+            my $server = $servers[$i];
+            $hits = $results_hashref->{$server}->{"hits"};
+            @newresults = searchResults('opac', '', $hits, $results_per_page, $offset, $arrParamsBusc->{'scan'}, @{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems'));
+        }
+        return \@newresults;
+    }#searchAgain
+
+    # Build the current list of biblionumbers in this search
+    sub buildListBiblios
+    {
+        my ($newresultsRef, $results_per_page) = @_;
+
+        my $listBiblios = '';
+        my $j = 0;
+        foreach (@$newresultsRef) {
+            my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
+            $listBiblios .= $bibnum . ',';
+            $j++;
+            last if ($j == $results_per_page);
+        }
+        chop $listBiblios if ($listBiblios =~ /,$/);
+        return $listBiblios;
+    }#buildListBiblios
+
+    my $busc = $session->param("busc");
+    my @arrBusc = split(/\&(?:amp;)?/, $busc);
+    my ($key, $value);
+    my %arrParamsBusc = ();
+    for (@arrBusc) {
+        ($key, $value) = split(/=/, $_, 2);
+        if ($key =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|offset|offsetSearch|count|expand|scan)/) {
+            $arrParamsBusc{$key} = $value;
+        } else {
+            unless (exists($arrParamsBusc{$key})) {
+                $arrParamsBusc{$key} = [];
+            }
+            push @{$arrParamsBusc{$key}}, $value;
+        }
+    }
+    my $searchAgain = 0;
+    my $count = C4::Context->preference('OPACnumSearchResults') || 20;
+    my $results_per_page = ($arrParamsBusc{'count'} && $arrParamsBusc{'count'} =~ /^[0-9]+?/)?$arrParamsBusc{'count'}:$count;
+    $arrParamsBusc{'count'} = $results_per_page;
+    my $offset = ($arrParamsBusc{'offset'} && $arrParamsBusc{'offset'} =~ /^[0-9]+?/)?$arrParamsBusc{'offset'}:0;
+    # The value OPACnumSearchResults has changed and the search has to be rebuild
+    if ($count != $results_per_page) {
+        if (exists($arrParamsBusc{'listBiblios'}) && $arrParamsBusc{'listBiblios'} =~ /^[0-9]+(?:,[0-9]+)*$/) {
+            my $indexBiblio = 0;
+            my @arrBibliosAux = split(',', $arrParamsBusc{'listBiblios'});
+            for (@arrBibliosAux) {
+                last if ($_ == $biblionumber);
+                $indexBiblio++;
+            }
+            $indexBiblio += $offset;
+            $offset = int($indexBiblio / $count) * $count;
+            $arrParamsBusc{'offset'} = $offset;
+        }
+        $arrParamsBusc{'count'} = $count;
+        $results_per_page = $count;
+        my $newresultsRef = searchAgain(\%arrParamsBusc, $offset, $results_per_page);
+        $arrParamsBusc{'listBiblios'} = buildListBiblios($newresultsRef, $results_per_page);
+        delete $arrParamsBusc{'previous'} if (exists($arrParamsBusc{'previous'}));
+        delete $arrParamsBusc{'next'} if (exists($arrParamsBusc{'next'}));
+        delete $arrParamsBusc{'offsetSearch'} if (exists($arrParamsBusc{'offsetSearch'}));
+        delete $arrParamsBusc{'newlistBiblios'} if (exists($arrParamsBusc{'newlistBiblios'}));
+        my $newbusc = rebuildBuscParam(\%arrParamsBusc);
+        $session->param("busc" => $newbusc);
+        @arrBusc = split(/\&(?:amp;)?/, $newbusc);
+    } else {
+        my $modifyListBiblios = 0;
+        # We come from a previous click
+        if (exists($arrParamsBusc{'previous'})) {
+            $modifyListBiblios = 1 if ($biblionumber == $arrParamsBusc{'previous'});
+            delete $arrParamsBusc{'previous'};
+        } elsif (exists($arrParamsBusc{'next'})) { # We come from a next click
+            $modifyListBiblios = 2 if ($biblionumber == $arrParamsBusc{'next'});
+            delete $arrParamsBusc{'next'};
+        }
+        if ($modifyListBiblios) {
+            if (exists($arrParamsBusc{'newlistBiblios'})) {
+                my $listBibliosAux = $arrParamsBusc{'listBiblios'};
+                $arrParamsBusc{'listBiblios'} = $arrParamsBusc{'newlistBiblios'};
+                my @arrAux = split(',', $listBibliosAux);
+                $arrParamsBusc{'newlistBiblios'} = $listBibliosAux;
+                if ($modifyListBiblios == 1) {
+                    $arrParamsBusc{'next'} = $arrAux[0];
+                    $paging{'next'}->{biblionumber} = $arrAux[0];
+                }else {
+                    $arrParamsBusc{'previous'} = $arrAux[$#arrAux];
+                    $paging{'previous'}->{biblionumber} = $arrAux[$#arrAux];
+                }
+            } else {
+                delete $arrParamsBusc{'listBiblios'};
+            }
+            my $offsetAux = $arrParamsBusc{'offset'};
+            $arrParamsBusc{'offset'} = $arrParamsBusc{'offsetSearch'};
+            $arrParamsBusc{'offsetSearch'} = $offsetAux;
+            $offset = $arrParamsBusc{'offset'};
+            my $newbusc = rebuildBuscParam(\%arrParamsBusc);
+            $session->param("busc" => $newbusc);
+            @arrBusc = split(/\&(?:amp;)?/, $newbusc);
+        }
+    }
+    my $buscParam = '';
+    my $j = 0;
+    # Rebuild the query for the button "back to results"
+    for (@arrBusc) {
+        unless ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|count|offsetSearch)/) {
+            $buscParam .= '&amp;' unless ($j == 0);
+            $buscParam .= $_;
+            $j++;
+        }
+    }
+    $template->param('busc' => $buscParam);
+    my $offsetSearch;
+    my @arrBiblios;
+    # We are inside the list of biblios and we don't have to search
+    if (exists($arrParamsBusc{'listBiblios'}) && $arrParamsBusc{'listBiblios'} =~ /^[0-9]+(?:,[0-9]+)*$/) {
+        @arrBiblios = split(',', $arrParamsBusc{'listBiblios'});
+        if (@arrBiblios) {
+            # We are at the first item of the list
+            if ($arrBiblios[0] == $biblionumber) {
+                if (@arrBiblios > 1) {
+                    for (my $j = 1; $j < @arrBiblios; $j++) {
+                        next unless ($arrBiblios[$j]);
+                        $paging{'next'}->{biblionumber} = $arrBiblios[$j];
+                        last;
+                    }
+                }
+                # search again if we are not at the first searching list
+                if ($offset && !$arrParamsBusc{'previous'}) {
+                    $searchAgain = 1;
+                    $offsetSearch = $offset - $results_per_page;
+                }
+            # we are at the last item of the list
+            } elsif ($arrBiblios[$#arrBiblios] == $biblionumber) {
+                for (my $j = $#arrBiblios - 1; $j >= 0; $j--) {
+                    next unless ($arrBiblios[$j]);
+                    $paging{'previous'}->{biblionumber} = $arrBiblios[$j];
+                    last;
+                }
+                if (!$offset) {
+                    # search again if we are at the first list and there is more results
+                    $searchAgain = 1 if (!$arrParamsBusc{'next'} && $arrParamsBusc{'total'} != @arrBiblios);
+                } else {
+                    # search again if we aren't at the first list and there is more results
+                    $searchAgain = 1 if (!$arrParamsBusc{'next'} && $arrParamsBusc{'total'} > ($offset + @arrBiblios));
+                }
+                $offsetSearch = $offset + $results_per_page if ($searchAgain);
+            } else {
+                for (my $j = 1; $j < $#arrBiblios; $j++) {
+                    if ($arrBiblios[$j] == $biblionumber) {
+                        for (my $z = $j - 1; $z >= 0; $z--) {
+                            next unless ($arrBiblios[$z]);
+                            $paging{'previous'}->{biblionumber} = $arrBiblios[$z];
+                            last;
+                        }
+                        for (my $z = $j + 1; $z < @arrBiblios; $z++) {
+                            next unless ($arrBiblios[$z]);
+                            $paging{'next'}->{biblionumber} = $arrBiblios[$z];
+                            last;
+                        }
+                        last;
+                    }
+                }
+            }
+        }
+        $offsetSearch = 0 if (defined($offsetSearch) && $offsetSearch < 0);
+    }
+    if ($searchAgain) {
+        my $newresultsRef = searchAgain(\%arrParamsBusc, $offsetSearch, $results_per_page);
+        my @newresults = @$newresultsRef;
+        # build the new listBiblios
+        my $listBiblios = buildListBiblios(\@newresults, $results_per_page);
+        unless (exists($arrParamsBusc{'listBiblios'})) {
+            $arrParamsBusc{'listBiblios'} = $listBiblios;
+            @arrBiblios = split(',', $arrParamsBusc{'listBiblios'});
+        } else {
+            $arrParamsBusc{'newlistBiblios'} = $listBiblios;
+        }
+        # From the new list we build again the next and previous result
+        if (@arrBiblios) {
+            if ($arrBiblios[0] == $biblionumber) {
+                for (my $j = $#newresults; $j >= 0; $j--) {
+                    next unless ($newresults[$j]);
+                    $paging{'previous'}->{biblionumber} = $newresults[$j]->{biblionumber};
+                    $arrParamsBusc{'previous'} = $paging{'previous'}->{biblionumber};
+                    $arrParamsBusc{'offsetSearch'} = $offsetSearch;
+                   last;
+                }
+            } elsif ($arrBiblios[$#arrBiblios] == $biblionumber) {
+                for (my $j = 0; $j < @newresults; $j++) {
+                    next unless ($newresults[$j]);
+                    $paging{'next'}->{biblionumber} = $newresults[$j]->{biblionumber};
+                    $arrParamsBusc{'next'} = $paging{'next'}->{biblionumber};
+                    $arrParamsBusc{'offsetSearch'} = $offsetSearch;
+                    last;
+                }
+            }
+        }
+        # build new busc param
+        my $newbusc = rebuildBuscParam(\%arrParamsBusc);
+        $session->param("busc" => $newbusc);
+    }
+    my ($previous, $next, $dataBiblioPaging);
+    # Previous biblio
+    if ($paging{'previous'}->{biblionumber}) {
+        $previous = 'opac-detail.pl?biblionumber=' . $paging{'previous'}->{biblionumber};
+        $dataBiblioPaging = GetBiblioData($paging{'previous'}->{biblionumber});
+        $template->param('previousTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging);
+    }
+    # Next biblio
+    if ($paging{'next'}->{biblionumber}) {
+        $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber};
+        $dataBiblioPaging = GetBiblioData($paging{'next'}->{biblionumber});
+        $template->param('nextTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging);
+    }
+    $template->param('previous' => $previous, 'next' => $next);
+    # Partial list of biblio results
+    my @listResults;
+    for (my $j = 0; $j < @arrBiblios; $j++) {
+        next unless ($arrBiblios[$j]);
+        $dataBiblioPaging = GetBiblioData($arrBiblios[$j]) if ($arrBiblios[$j] != $biblionumber);
+        push @listResults, {index => $j + 1 + $offset, biblionumber => $arrBiblios[$j], title => ($arrBiblios[$j] == $biblionumber)?'':$dataBiblioPaging->{title}, author => ($arrBiblios[$j] != $biblionumber && $dataBiblioPaging->{author})?$dataBiblioPaging->{author}:'', url => ($arrBiblios[$j] == $biblionumber)?'':'opac-detail.pl?biblionumber=' . $arrBiblios[$j]};
+    }
+    $template->param('listResults' => \@listResults) if (@listResults);
+    $template->param('indexPag' => 1 + $offset, 'totalPag' => $arrParamsBusc{'total'}, 'indexPagEnd' => scalar(@arrBiblios) + $offset);
+}
+
+
+
 $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 7f247c7..dbc3792 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -269,6 +269,21 @@ my $params = $cgi->Vars;
 my $tag;
 $tag = $params->{tag} if $params->{tag};
 
+
+# String with params with the search criteria for the paging in opac-detail
+my $pasarParams = '';
+my $j = 0;
+for (keys %$params) {
+    my @pasarParam = split("\0", $params->{$_});
+    for my $paramValue(@pasarParam) {
+        $pasarParams .= '&amp;' if ($j > 0);
+        $pasarParams .= $_ . '=' . $paramValue;
+        $j++;
+    }
+}
+#
+
+
 # Params that can have more than one value
 # sort by is used to sort the query
 # in theory can have more than one but generally there's just one
@@ -422,6 +437,10 @@ elsif (C4::Context->preference('NoZebra')) {
         ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
     };
 } else {
+    $pasarParams .= '&amp;query=' . $query;
+    $pasarParams .= '&amp;count=' . $results_per_page;
+    $pasarParams .= '&amp;simple_query=' . $simple_query;
+    $pasarParams .= '&amp;query_type=' . $query_type if ($query_type);
     eval {
         ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
     };
@@ -543,6 +562,24 @@ for (my $i=0;$i<@servers;$i++) {
             exit;
         }
         if ($hits) {
+            if (!C4::Context->preference('NoZebra') && !$build_grouped_results) {
+                # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail
+                $pasarParams .= '&amp;listBiblios=';
+                my $j = 0;
+                foreach (@newresults) {
+                    my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0;
+                    $pasarParams .= $bibnum . ',';
+                    $j++;
+                    last if ($j == $results_per_page);
+                }
+                chop $pasarParams if ($pasarParams =~ /,$/);
+                $pasarParams .= '&amp;total=' . int($total) if ($pasarParams !~ /total=(?:[0-9]+)?/);
+                if ($pasarParams) {
+                    my $session = get_session($cgi->cookie("CGISESSID"));
+                    $session->param('busc' => $pasarParams);
+                }
+                #
+            }
             $template->param(total => $hits);
             my $limit_cgi_not_availablity = $limit_cgi;
             $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
-- 
1.7.4.1


From magnus at enger.priv.no  Tue Jun 21 09:29:39 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Tue, 21 Jun 2011 09:29:39 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Added LSB information and
	copyright headers to two scripts in misc/bin. Thanks to
	Mahesh T Pai <paivakil@gmail.com> for the mailing list post
	Message-ID: <87y60x10de.fsf@gmail.com> containing them.
Message-ID: <1308641379-5756-1-git-send-email-magnus@enger.priv.no>

From: MJ Ray <mjr at phonecoop.coop>

http://bugs.koha-community.org/show_bug.cgi?id=4406

Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
 misc/bin/koha-pazpar2-ctl.sh |   25 +++++++++++++++++++++++++
 misc/bin/koha-zebra-ctl.sh   |   25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/misc/bin/koha-pazpar2-ctl.sh b/misc/bin/koha-pazpar2-ctl.sh
index c894702..bcedfea 100755
--- a/misc/bin/koha-pazpar2-ctl.sh
+++ b/misc/bin/koha-pazpar2-ctl.sh
@@ -1,4 +1,29 @@
 #!/bin/bash
+
+# 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
+
+### BEGIN INIT INFO
+# Provides:          koha-pazpar-daemon
+# Required-Start:    $syslog $remote_fs
+# Required-Stop:     $syslog $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: PazPar2 server daemon for Koha
+### END INIT INFO
+
 USER=__KOHA_USER__
 GROUP=__KOHA_GROUP__
 DBNAME=__DB_NAME__
diff --git a/misc/bin/koha-zebra-ctl.sh b/misc/bin/koha-zebra-ctl.sh
index 01e4fad..397eb19 100755
--- a/misc/bin/koha-zebra-ctl.sh
+++ b/misc/bin/koha-zebra-ctl.sh
@@ -1,4 +1,29 @@
 #!/bin/bash
+
+# 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
+
+### BEGIN INIT INFO
+# Provides:          koha-zebra-daemon
+# Required-Start:    $syslog $remote_fs
+# Required-Stop:     $syslog $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Zebra server daemon for Koha indexing
+### END INIT INFO
+
 USER=__KOHA_USER__
 GROUP=__KOHA_GROUP__
 DBNAME=__DB_NAME__
-- 
1.7.4.1


From henridamien.laurent at biblibre.com  Tue Jun 21 15:10:09 2011
From: henridamien.laurent at biblibre.com (henridamien.laurent at biblibre.com)
Date: Tue, 21 Jun 2011 15:10:09 +0200
Subject: [Koha-patches] [PATCH] Bug 6522: Problem in results display (5917
	followup)
Message-ID: <1308661809-4089-1-git-send-email-henridamien.laurent@biblibre.com>

From: BibLibre <dev_patches at biblibre.com>

The table header was broken.
This patch adds a nbsp as header for chackboxes.
---
 .../prog/en/modules/catalogue/results.tt           |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 456cacf..6e68c8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -411,6 +411,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                     <!-- TABLE RESULTS START -->
                 <table>
                     <tr>
+                        <th>&nbsp;</th>
                         [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]<th>&nbsp;</th>[% END %][% END %]
                         <th>Results</th>
                         <th>Location</th>
-- 
1.7.1


From oleonard at myacpl.org  Tue Jun 21 16:39:57 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 21 Jun 2011 10:39:57 -0400
Subject: [Koha-patches] [PATCH] Alternate fix for Bug 6522 - search result
	list broken
Message-ID: <1308667197-24866-1-git-send-email-oleonard@myacpl.org>

- Adding back the colspan removed in a previous commit
- Correcting the scope of two template variables.

Before applying this patch, the search results page in the
staff client will have misaligned headers if AmazonCoverImages
is turned off. After applying this patch headers should
appear correctly with AmazonCoverImages on or off.
---
 .../prog/en/modules/catalogue/results.tt           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 456cacf..e1f84b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -412,13 +412,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                 <table>
                     <tr>
                         [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]<th>&nbsp;</th>[% END %][% END %]
-                        <th>Results</th>
+                        <th colspan="2">Results</th>
                         <th>Location</th>
                     </tr>
                         <!-- Actual Search Results -->
                         [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
                          [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
-                            [% IF ( SEARCH_RESULT.AmazonEnabled ) %][% IF ( SEARCH_RESULT.AmazonCoverImages ) %]
+                            [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]
                                 <td>
                                     <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]">
 									
-- 
1.7.3


From lrea at nekls.org  Tue Jun 21 19:23:58 2011
From: lrea at nekls.org (Liz Rea)
Date: Tue, 21 Jun 2011 12:23:58 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] Alternate fix for Bug 6522 -
	search result list broken
Message-ID: <1308677038-654-1-git-send-email-lrea@nekls.org>

From: Owen Leonard <oleonard at myacpl.org>

- Adding back the colspan removed in a previous commit
- Correcting the scope of two template variables.

Before applying this patch, the search results page in the
staff client will have misaligned headers if AmazonCoverImages
is turned off. After applying this patch headers should
appear correctly with AmazonCoverImages on or off.

Signed-off-by: Liz Rea <lrea at nekls.org>
---
 .../prog/en/modules/catalogue/results.tt           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 456cacf..e1f84b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -412,13 +412,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                 <table>
                     <tr>
                         [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]<th>&nbsp;</th>[% END %][% END %]
-                        <th>Results</th>
+                        <th colspan="2">Results</th>
                         <th>Location</th>
                     </tr>
                         <!-- Actual Search Results -->
                         [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
                          [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
-                            [% IF ( SEARCH_RESULT.AmazonEnabled ) %][% IF ( SEARCH_RESULT.AmazonCoverImages ) %]
+                            [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]
                                 <td>
                                     <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]">
 									
-- 
1.7.2.5


From nengard at bywatersolutions.com  Tue Jun 21 13:54:55 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 21 Jun 2011 07:54:55 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6521 - allow blank
	cardnumbers to not trigger "already in use"
Message-ID: <1308657295-4725-1-git-send-email-nengard@bywatersolutions.com>

From: Robin Sheat <robin at catalyst.net.nz>

Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 C4/Members.pm          |    3 +++
 members/memberentry.pl |   28 +++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..c6c6985 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -900,6 +900,7 @@ sub fixup_cardnumber ($) {
 
     #     if ($cardnumber !~ /\S/ && $autonumber_members) {
     ($autonumber_members) or return $cardnumber;
+    defined($cardnumber) or return $cardnumber;
     my $checkdigit = C4::Context->preference('checkdigit');
     my $dbh = C4::Context->dbh;
     if ( $checkdigit and $checkdigit eq 'katipo' ) {
@@ -1261,6 +1262,8 @@ sub checkuniquemember {
 
 sub checkcardnumber {
     my ($cardnumber,$borrowernumber) = @_;
+    # If cardnumber is null, we assume they're allowed.
+    return 0 if !defined($cardnumber);
     my $dbh = C4::Context->dbh;
     my $query = "SELECT * FROM borrowers WHERE cardnumber=?";
     $query .= " AND borrowernumber <> ?" if ($borrowernumber);
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 61c3c2c..be34cc4 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -236,19 +236,22 @@ if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){
 $debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
 my $extended_patron_attributes = ();
 if ($op eq 'save' || $op eq 'insert'){
-  if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
-    push @errors, 'ERROR_cardnumber';
-  } 
-  my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
-  if ($newdata{dateofbirth} && $dateofbirthmandatory) {
-    my $age = GetAge($newdata{dateofbirth});
-    my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
-	my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
-    if (($high && ($age > $high)) or ($age < $low)) {
-      push @errors, 'ERROR_age_limitations';
-	  $template->param('ERROR_age_limitations' => "$low to $high");
+    # If the cardnumber is blank, treat it as null.
+    $newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
+
+    if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
+        push @errors, 'ERROR_cardnumber';
+    } 
+    my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
+    if ($newdata{dateofbirth} && $dateofbirthmandatory) {
+        my $age = GetAge($newdata{dateofbirth});
+        my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
+        my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
+        if (($high && ($age > $high)) or ($age < $low)) {
+            push @errors, 'ERROR_age_limitations';
+            $template->param('ERROR_age_limitations' => "$low to $high");
+        }
     }
-  }
   
     if($newdata{surname} && C4::Context->preference('uppercasesurnames')) {
         $newdata{'surname'} = uc($newdata{'surname'});
@@ -396,7 +399,6 @@ if ( $op eq "duplicate" ) {
     $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
 }
 
-# my $cardnumber=$data{'cardnumber'};
 $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
 if(!defined($data{'sex'})){
     $template->param( none => 1);
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Jun 21 18:46:52 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 21 Jun 2011 12:46:52 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6525: hold filled emails
	not going out
Message-ID: <1308674812-5634-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

When the message name was updated from "Hold Filled" to "Hold_Filled" for T::T compatibility,
the line in _koha_notify_reserve that looked up the letter code by the message name no longer
matched, so none of the messages were sent.  This patch just replaces the space with an underscore
to get the names aligned properly.

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 C4/Reserves.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 87e2325..fde1223 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -1666,7 +1666,7 @@ sub _koha_notify_reserve {
     my $print_mode = 0;
     my $messagingprefs;
     if ( $borrower->{'email'} || $borrower->{'smsalertnumber'} ) {
-        $messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold Filled' } );
+        $messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold_Filled' } );
 
         return if ( !defined( $messagingprefs->{'letter_code'} ) );
         $letter_code = $messagingprefs->{'letter_code'};
-- 
1.7.2.3


From robin at catalyst.net.nz  Thu Jun 23 11:20:06 2011
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu, 23 Jun 2011 21:20:06 +1200
Subject: [Koha-patches] [PATCH] Bug 6526 - make the reserves code use the
	borrowernumber
Message-ID: <1308820806-19976-1-git-send-email-robin@catalyst.net.nz>

Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.
---
 .../prog/en/modules/reserve/request.tt             |   16 ++--
 reserve/placerequest.pl                            |   22 +++---
 reserve/request.pl                                 |   77 ++++++++++----------
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 4b7aa7c..cbcfc55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -169,7 +169,7 @@ function checkMultiHold() {
     <h1>Confirm Holds</h1>
   [% END %]
 
-  [% UNLESS ( cardnumber ) %]
+  [% UNLESS ( borrowernumber ) %]
     [% IF ( messageborrower ) %]
       <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, Please, try another</p> </div>
     [% END %]
@@ -243,7 +243,7 @@ function checkMultiHold() {
             <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
         [% END %]
 
-        <input type="hidden" size="10" name="member" value="[% cardnumber %]" />
+        <input type="hidden" size="10" name="borrowernumber" value="[% borrowernumber %]" />
         <input type="hidden" name="type" value="str8" />
 
         [% IF ( multi_hold ) %]
@@ -262,7 +262,7 @@ function checkMultiHold() {
         [% END %]
 
        <ol> <li><span class="label">Patron:</span>
-            [% IF ( cardnumber ) %]
+            [% IF ( borrowernumber ) %]
                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
             [% ELSE %]
                 Not defined yet
@@ -358,7 +358,7 @@ function checkMultiHold() {
 </ol>
    [% UNLESS ( multi_hold ) %]
         <fieldset class="action">
-            [% IF ( cardnumber ) %]
+            [% IF ( borrowernumber ) %]
                 [% IF ( override_required ) %]
                     <input type="submit" class="warning" value="Place Hold" />
                 [% ELSIF ( none_available ) %]
@@ -465,7 +465,7 @@ function checkMultiHold() {
         </table>
     [% IF ( bibitemloo.hiddencount ) %]
         <form>
-        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber %]&cardnumber=[% bibitemloo.cardnumber %]&showallitems=1">Show all items ([% bibitemloo.hiddencount %] hidden)</a></p>
+        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber %]&borrowernumber=[% bibitemloo.borrowernumber %]&showallitems=1">Show all items ([% bibitemloo.hiddencount %] hidden)</a></p>
         </form>
     [% END %] <!-- hiddencount -->
     [% END %] <!-- bibitemloop -->
@@ -538,7 +538,7 @@ function checkMultiHold() {
   [% END %]<!-- /multi_hold -->
 
     <fieldset class="action">
-        [% IF ( cardnumber ) %]
+        [% IF ( borrowernumber ) %]
             [% IF ( override_required ) %]
                 <input type="submit" class="warning" value="Place Hold" />
             [% ELSIF ( none_available ) %]
@@ -552,7 +552,7 @@ function checkMultiHold() {
 	</fieldset>
 [% END %]
 
-[% UNLESS ( cardnumber ) %]
+[% UNLESS ( borrowernumber ) %]
 [% IF ( reserveloop ) %]
 <form name="T[% time %]" action="modrequest.pl" method="post">
   [% IF ( multi_hold ) %]
@@ -631,7 +631,7 @@ function checkMultiHold() {
         <td>
           <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
 	  [% IF ( reserveloo.hidename ) %]
-	      [% reserveloo.cardnumber %]
+	      [% reserveloo.cardnumber (reserveloo.borrowernumber) %]
 	  [% ELSE %]
 	      [% reserveloo.firstname %] [% reserveloo.surname %]
 	  [% END %]
diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index d14c0a4..ed1a82b 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -44,14 +44,14 @@ my @bibitems=$input->param('biblioitem');
 #       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
 my @reqbib=$input->param('reqbib'); 
 my $biblionumber=$input->param('biblionumber');
-my $borrower=$input->param('member');
+my $borrowernumber=$input->param('borrowernumber');
 my $notes=$input->param('notes');
 my $branch=$input->param('pickup');
 my $startdate=$input->param('reserve_date') || '';
 my @rank=$input->param('rank-request');
 my $type=$input->param('type');
 my $title=$input->param('title');
-my $borrowernumber=GetMember('cardnumber'=>$borrower);
+my $borrower=GetMember('borrowernumber'=>$borrowernumber);
 my $checkitem=$input->param('checkitem');
 my $expirationdate = $input->param('expiration_date');
 
@@ -81,7 +81,7 @@ if ($checkitem ne ''){
     }
 }
 
-if ($type eq 'str8' && $borrowernumber ne ''){
+if ($type eq 'str8' && $borrower){
 
     foreach my $biblionumber (keys %bibinfos) {
         my $count=@bibitems;
@@ -100,18 +100,18 @@ if ($type eq 'str8' && $borrowernumber ne ''){
 
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
-            AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
+            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
                        $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
         } else {
             if ($input->param('request') eq 'any'){
                 # place a request on 1st available
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
             } elsif ($reqbib[0] ne ''){
                 # FIXME : elsif probably never reached, (see top of the script)
                 # place a request on a given item
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
             } else {
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
             }
         }
     }
@@ -124,8 +124,10 @@ if ($type eq 'str8' && $borrowernumber ne ''){
     } else {
         print $input->redirect("request.pl?biblionumber=$biblionumber");
     }
-} elsif ($borrowernumber eq ''){
+} elsif ($borrower eq ''){
 	print $input->header();
-	print "Invalid card number please try again";
-	print $input->Dump;
+	print "Invalid borrower number please try again";
+# Not sure that Dump() does HTML escaping. Use firebug or something to trace
+# instead.
+#	print $input->Dump;
 }
diff --git a/reserve/request.pl b/reserve/request.pl
index c3c7a36..784651c 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -85,7 +85,7 @@ my $CGIbranch = CGI::scrolling_list(
 my $findborrower = $input->param('findborrower');
 $findborrower = '' unless defined $findborrower;
 $findborrower =~ s|,| |g;
-my $cardnumber = $input->param('cardnumber') || '';
+my $borrowernumber_hold = $input->param('borrowernumber') || '';
 my $borrowerslist;
 my $messageborrower;
 my $warnings;
@@ -117,21 +117,19 @@ if ($findborrower) {
 
     my @borrowers = @$borrowers;
 
-    if ( $#borrowers == -1 ) {
-        $input->param( 'findborrower', '' );
+    if ( !@borrowers ) {
         $messageborrower = "'$findborrower'";
     }
-    elsif ( $#borrowers == 0 ) {
-        $input->param( 'cardnumber', $borrowers[0]->{'cardnumber'} );
-        $cardnumber = $borrowers[0]->{'cardnumber'};
+    elsif ( @borrowers == 1 ) {
+        $borrowernumber_hold = $borrowers[0]->{'borrowernumber'};
     }
     else {
         $borrowerslist = \@borrowers;
     }
 }
 
-if ($cardnumber) {
-    my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
+if ($borrowernumber_hold) {
+    my $borrowerinfo = GetMemberDetails( $borrowernumber_hold );
     my $diffbranch;
     my @getreservloop;
     my $count_reserv = 0;
@@ -143,7 +141,7 @@ if ($cardnumber) {
     my $number_reserves =
       GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
-    if ( C4::Context->preference('maxreserves') && $number_reserves >= C4::Context->preference('maxreserves') ) {
+    if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {
 		$warnings = 1;
         $maxreserves = 1;
     }
@@ -164,24 +162,25 @@ if ($cardnumber) {
     }
 
     $template->param(
-                borrowernumber => $borrowerinfo->{'borrowernumber'},
-                borrowersurname   => $borrowerinfo->{'surname'},
-                borrowerfirstname => $borrowerinfo->{'firstname'},
-                borrowerstreetaddress => $borrowerinfo->{'address'},
-                borrowercity => $borrowerinfo->{'city'},
-                borrowerphone => $borrowerinfo->{'phone'},
-                borrowermobile => $borrowerinfo->{'mobile'},
-                borrowerfax => $borrowerinfo->{'fax'},
-                borrowerphonepro => $borrowerinfo->{'phonepro'},
-                borroweremail => $borrowerinfo->{'email'},
-                borroweremailpro => $borrowerinfo->{'emailpro'},
-                borrowercategory => $borrowerinfo->{'category'},
-                borrowerreservs   => $count_reserv,
-                maxreserves       => $maxreserves,
-                expiry            => $expiry,
-                diffbranch        => $diffbranch,
-				messages => $messages,
-				warnings => $warnings
+                borrowernumber      => $borrowerinfo->{'borrowernumber'},
+                borrowersurname     => $borrowerinfo->{'surname'},
+                borrowerfirstname   => $borrowerinfo->{'firstname'},
+                borrowerstreetaddress   => $borrowerinfo->{'address'},
+                borrowercity        => $borrowerinfo->{'city'},
+                borrowerphone       => $borrowerinfo->{'phone'},
+                borrowermobile      => $borrowerinfo->{'mobile'},
+                borrowerfax         => $borrowerinfo->{'fax'},
+                borrowerphonepro    => $borrowerinfo->{'phonepro'},
+                borroweremail       => $borrowerinfo->{'email'},
+                borroweremailpro    => $borrowerinfo->{'emailpro'},
+                borrowercategory    => $borrowerinfo->{'category'},
+                borrowerreservs     => $count_reserv,
+                cardnumber          => $borrowerinfo->{'cardnumber'},
+                maxreserves         => $maxreserves,
+                expiry              => $expiry,
+                diffbranch          => $diffbranch,
+				messages            => $messages,
+				warnings            => $warnings
     );
 }
 
@@ -200,18 +199,18 @@ if ($borrowerslist) {
         } @{$borrowerslist}
       )
     {
-        push @values, $borrower->{cardnumber};
+        push @values, $borrower->{borrowernumber};
 
-        $labels{ $borrower->{cardnumber} } = sprintf(
+        $labels{ $borrower->{borrowernumber} } = sprintf(
             '%s, %s ... (%s - %s) ... %s',
-            $borrower->{surname},    $borrower->{firstname},
-            $borrower->{cardnumber}, $borrower->{categorycode},
-            $borrower->{address},
+            $borrower->{surname} ||'',    $borrower->{firstname} || '',
+            $borrower->{cardnumber} || '', $borrower->{categorycode} || '',
+            $borrower->{address} || '',
         );
     }
 
     $CGIselectborrower = CGI::scrolling_list(
-        -name     => 'cardnumber',
+        -name     => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,
         -size     => 7,
@@ -220,7 +219,7 @@ if ($borrowerslist) {
 }
 
 # FIXME launch another time GetMemberDetails perhaps until
-my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
+my $borrowerinfo = GetMemberDetails( $borrowernumber_hold );
 
 my @biblionumbers = ();
 my $biblionumbers = $input->param('biblionumbers');
@@ -238,7 +237,7 @@ foreach my $biblionumber (@biblionumbers) {
 
     my $dat          = GetBiblioData($biblionumber);
 
-    if ( not CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
+    unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
  		$warnings = 1;
         $maxreserves = 1;
     }
@@ -429,11 +428,14 @@ foreach my $biblionumber (@biblionumbers) {
             $item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
             
             if ( $branchitemrule->{'holdallowed'} == 0 ||
-                 ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
+                 ( $branchitemrule->{'holdallowed'} == 1 && 
+                     $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
                 $policy_holdallowed = 0;
             }
             
-            if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
+            if (IsAvailableForItemLevelRequest($itemnumber) and 
+            	not $item->{cantreserve} and 
+            	CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
                 if ( $policy_holdallowed ) {
                     $item->{available} = 1;
                     $num_available++;
@@ -564,7 +566,6 @@ foreach my $biblionumber (@biblionumbers) {
                      date              => $date,
                      biblionumber      => $biblionumber,
                      findborrower      => $findborrower,
-                     cardnumber        => $cardnumber,
                      title             => $dat->{title},
                      author            => $dat->{author},
                      holdsview => 1,
-- 
1.7.4.1


From lrea at nekls.org  Thu Jun 23 16:59:50 2011
From: lrea at nekls.org (Liz Rea)
Date: Thu, 23 Jun 2011 09:59:50 -0500
Subject: [Koha-patches] [PATCH 21/21] Bug 6527 - Table striping not working
	on cataloguing search
Message-ID: <1308841190-20026-1-git-send-email-lrea@nekls.org>

Resolves TT issue causing the results list in cataloguing search (addbooks.pl) to not be
striped.

To test:
More -> Cataloging
do a search

Without patch:
results will not alternate striping as originally intended.

With patch:
Results will be alternating white/grey.
---
 .../prog/en/modules/cataloguing/addbooks.tt        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index f5e3712..a5e2a96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -41,7 +41,7 @@
             [% IF ( CAN_user_editcatalogue_edit_items ) %]<th>&nbsp;</th>[% END %]
         </tr>
     [% FOREACH resultsloo IN resultsloop %]
-        [% IF ( resultsloo.even ) %]
+        [% IF ( loop.even ) %]
             <tr class="highlight">
         [% ELSE %]
             <tr>
-- 
1.7.2.5


From lrea at nekls.org  Fri Jun 24 23:11:30 2011
From: lrea at nekls.org (Liz Rea)
Date: Fri, 24 Jun 2011 16:11:30 -0500
Subject: [Koha-patches] [PATCH 23/23] [SIGNED OFF] Bug 6526 - make the
	reserves code use the borrowernumber
Message-ID: <1308949890-20181-1-git-send-email-lrea@nekls.org>

From: Robin Sheat <robin at catalyst.net.nz>

Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.
---
 .../prog/en/modules/reserve/request.tt             |   16 ++--
 reserve/placerequest.pl                            |   22 +++---
 reserve/request.pl                                 |   77 ++++++++++----------
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 4b7aa7c..cbcfc55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -169,7 +169,7 @@ function checkMultiHold() {
     <h1>Confirm Holds</h1>
   [% END %]
 
-  [% UNLESS ( cardnumber ) %]
+  [% UNLESS ( borrowernumber ) %]
     [% IF ( messageborrower ) %]
       <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, Please, try another</p> </div>
     [% END %]
@@ -243,7 +243,7 @@ function checkMultiHold() {
             <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
         [% END %]
 
-        <input type="hidden" size="10" name="member" value="[% cardnumber %]" />
+        <input type="hidden" size="10" name="borrowernumber" value="[% borrowernumber %]" />
         <input type="hidden" name="type" value="str8" />
 
         [% IF ( multi_hold ) %]
@@ -262,7 +262,7 @@ function checkMultiHold() {
         [% END %]
 
        <ol> <li><span class="label">Patron:</span>
-            [% IF ( cardnumber ) %]
+            [% IF ( borrowernumber ) %]
                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
             [% ELSE %]
                 Not defined yet
@@ -358,7 +358,7 @@ function checkMultiHold() {
 </ol>
    [% UNLESS ( multi_hold ) %]
         <fieldset class="action">
-            [% IF ( cardnumber ) %]
+            [% IF ( borrowernumber ) %]
                 [% IF ( override_required ) %]
                     <input type="submit" class="warning" value="Place Hold" />
                 [% ELSIF ( none_available ) %]
@@ -465,7 +465,7 @@ function checkMultiHold() {
         </table>
     [% IF ( bibitemloo.hiddencount ) %]
         <form>
-        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber %]&cardnumber=[% bibitemloo.cardnumber %]&showallitems=1">Show all items ([% bibitemloo.hiddencount %] hidden)</a></p>
+        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber %]&borrowernumber=[% bibitemloo.borrowernumber %]&showallitems=1">Show all items ([% bibitemloo.hiddencount %] hidden)</a></p>
         </form>
     [% END %] <!-- hiddencount -->
     [% END %] <!-- bibitemloop -->
@@ -538,7 +538,7 @@ function checkMultiHold() {
   [% END %]<!-- /multi_hold -->
 
     <fieldset class="action">
-        [% IF ( cardnumber ) %]
+        [% IF ( borrowernumber ) %]
             [% IF ( override_required ) %]
                 <input type="submit" class="warning" value="Place Hold" />
             [% ELSIF ( none_available ) %]
@@ -552,7 +552,7 @@ function checkMultiHold() {
 	</fieldset>
 [% END %]
 
-[% UNLESS ( cardnumber ) %]
+[% UNLESS ( borrowernumber ) %]
 [% IF ( reserveloop ) %]
 <form name="T[% time %]" action="modrequest.pl" method="post">
   [% IF ( multi_hold ) %]
@@ -631,7 +631,7 @@ function checkMultiHold() {
         <td>
           <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
 	  [% IF ( reserveloo.hidename ) %]
-	      [% reserveloo.cardnumber %]
+	      [% reserveloo.cardnumber (reserveloo.borrowernumber) %]
 	  [% ELSE %]
 	      [% reserveloo.firstname %] [% reserveloo.surname %]
 	  [% END %]
diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index bc3fc74..19d76be 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -44,14 +44,14 @@ my @bibitems=$input->param('biblioitem');
 #       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
 my @reqbib=$input->param('reqbib'); 
 my $biblionumber=$input->param('biblionumber');
-my $borrower=$input->param('member');
+my $borrowernumber=$input->param('borrowernumber');
 my $notes=$input->param('notes');
 my $branch=$input->param('pickup');
 my $startdate=$input->param('reserve_date') || '';
 my @rank=$input->param('rank-request');
 my $type=$input->param('type');
 my $title=$input->param('title');
-my $borrowernumber=GetMember('cardnumber'=>$borrower);
+my $borrower=GetMember('borrowernumber'=>$borrowernumber);
 my $checkitem=$input->param('checkitem');
 my $expirationdate = $input->param('expiration_date');
 
@@ -81,7 +81,7 @@ if ($checkitem ne ''){
     }
 }
 
-if ($type eq 'str8' && $borrowernumber ne ''){
+if ($type eq 'str8' && $borrower){
 
     foreach my $biblionumber (keys %bibinfos) {
         my $count=@bibitems;
@@ -100,18 +100,18 @@ if ($type eq 'str8' && $borrowernumber ne ''){
 
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
-            AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
+            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
                        $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
         } else {
             if ($input->param('request') eq 'any'){
                 # place a request on 1st available
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
             } elsif ($reqbib[0] ne ''){
                 # FIXME : elsif probably never reached, (see top of the script)
                 # place a request on a given item
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
             } else {
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
+                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
             }
         }
     }
@@ -124,8 +124,10 @@ if ($type eq 'str8' && $borrowernumber ne ''){
     } else {
         print $input->redirect("request.pl?biblionumber=$biblionumber");
     }
-} elsif ($borrowernumber eq ''){
+} elsif ($borrower eq ''){
 	print $input->header();
-	print "Invalid card number please try again";
-	print $input->Dump;
+	print "Invalid borrower number please try again";
+# Not sure that Dump() does HTML escaping. Use firebug or something to trace
+# instead.
+#	print $input->Dump;
 }
diff --git a/reserve/request.pl b/reserve/request.pl
index 0b3bebc..79ff6b5 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -85,7 +85,7 @@ my $CGIbranch = CGI::scrolling_list(
 my $findborrower = $input->param('findborrower');
 $findborrower = '' unless defined $findborrower;
 $findborrower =~ s|,| |g;
-my $cardnumber = $input->param('cardnumber') || '';
+my $borrowernumber_hold = $input->param('borrowernumber') || '';
 my $borrowerslist;
 my $messageborrower;
 my $warnings;
@@ -117,21 +117,19 @@ if ($findborrower) {
 
     my @borrowers = @$borrowers;
 
-    if ( $#borrowers == -1 ) {
-        $input->param( 'findborrower', '' );
+    if ( !@borrowers ) {
         $messageborrower = "'$findborrower'";
     }
-    elsif ( $#borrowers == 0 ) {
-        $input->param( 'cardnumber', $borrowers[0]->{'cardnumber'} );
-        $cardnumber = $borrowers[0]->{'cardnumber'};
+    elsif ( @borrowers == 1 ) {
+        $borrowernumber_hold = $borrowers[0]->{'borrowernumber'};
     }
     else {
         $borrowerslist = \@borrowers;
     }
 }
 
-if ($cardnumber) {
-    my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
+if ($borrowernumber_hold) {
+    my $borrowerinfo = GetMemberDetails( $borrowernumber_hold );
     my $diffbranch;
     my @getreservloop;
     my $count_reserv = 0;
@@ -143,7 +141,7 @@ if ($cardnumber) {
     my $number_reserves =
       GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
-    if ( C4::Context->preference('maxreserves') && $number_reserves >= C4::Context->preference('maxreserves') ) {
+    if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {
 		$warnings = 1;
         $maxreserves = 1;
     }
@@ -164,24 +162,25 @@ if ($cardnumber) {
     }
 
     $template->param(
-                borrowernumber => $borrowerinfo->{'borrowernumber'},
-                borrowersurname   => $borrowerinfo->{'surname'},
-                borrowerfirstname => $borrowerinfo->{'firstname'},
-                borrowerstreetaddress => $borrowerinfo->{'address'},
-                borrowercity => $borrowerinfo->{'city'},
-                borrowerphone => $borrowerinfo->{'phone'},
-                borrowermobile => $borrowerinfo->{'mobile'},
-                borrowerfax => $borrowerinfo->{'fax'},
-                borrowerphonepro => $borrowerinfo->{'phonepro'},
-                borroweremail => $borrowerinfo->{'email'},
-                borroweremailpro => $borrowerinfo->{'emailpro'},
-                borrowercategory => $borrowerinfo->{'category'},
-                borrowerreservs   => $count_reserv,
-                maxreserves       => $maxreserves,
-                expiry            => $expiry,
-                diffbranch        => $diffbranch,
-				messages => $messages,
-				warnings => $warnings
+                borrowernumber      => $borrowerinfo->{'borrowernumber'},
+                borrowersurname     => $borrowerinfo->{'surname'},
+                borrowerfirstname   => $borrowerinfo->{'firstname'},
+                borrowerstreetaddress   => $borrowerinfo->{'address'},
+                borrowercity        => $borrowerinfo->{'city'},
+                borrowerphone       => $borrowerinfo->{'phone'},
+                borrowermobile      => $borrowerinfo->{'mobile'},
+                borrowerfax         => $borrowerinfo->{'fax'},
+                borrowerphonepro    => $borrowerinfo->{'phonepro'},
+                borroweremail       => $borrowerinfo->{'email'},
+                borroweremailpro    => $borrowerinfo->{'emailpro'},
+                borrowercategory    => $borrowerinfo->{'category'},
+                borrowerreservs     => $count_reserv,
+                cardnumber          => $borrowerinfo->{'cardnumber'},
+                maxreserves         => $maxreserves,
+                expiry              => $expiry,
+                diffbranch          => $diffbranch,
+				messages            => $messages,
+				warnings            => $warnings
     );
 }
 
@@ -200,18 +199,18 @@ if ($borrowerslist) {
         } @{$borrowerslist}
       )
     {
-        push @values, $borrower->{cardnumber};
+        push @values, $borrower->{borrowernumber};
 
-        $labels{ $borrower->{cardnumber} } = sprintf(
+        $labels{ $borrower->{borrowernumber} } = sprintf(
             '%s, %s ... (%s - %s) ... %s',
-            $borrower->{surname},    $borrower->{firstname},
-            $borrower->{cardnumber}, $borrower->{categorycode},
-            $borrower->{address},
+            $borrower->{surname} ||'',    $borrower->{firstname} || '',
+            $borrower->{cardnumber} || '', $borrower->{categorycode} || '',
+            $borrower->{address} || '',
         );
     }
 
     $CGIselectborrower = CGI::scrolling_list(
-        -name     => 'cardnumber',
+        -name     => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,
         -size     => 7,
@@ -220,7 +219,7 @@ if ($borrowerslist) {
 }
 
 # FIXME launch another time GetMemberDetails perhaps until
-my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
+my $borrowerinfo = GetMemberDetails( $borrowernumber_hold );
 
 my @biblionumbers = ();
 my $biblionumbers = $input->param('biblionumbers');
@@ -238,7 +237,7 @@ foreach my $biblionumber (@biblionumbers) {
 
     my $dat          = GetBiblioData($biblionumber);
 
-    if ( not CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
+    unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
  		$warnings = 1;
         $maxreserves = 1;
     }
@@ -429,11 +428,14 @@ foreach my $biblionumber (@biblionumbers) {
             $item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
             
             if ( $branchitemrule->{'holdallowed'} == 0 ||
-                 ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
+                 ( $branchitemrule->{'holdallowed'} == 1 && 
+                     $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
                 $policy_holdallowed = 0;
             }
             
-            if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
+            if (IsAvailableForItemLevelRequest($itemnumber) and 
+            	not $item->{cantreserve} and 
+            	CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
                 if ( $policy_holdallowed ) {
                     $item->{available} = 1;
                     $num_available++;
@@ -564,7 +566,6 @@ foreach my $biblionumber (@biblionumbers) {
                      date              => $date,
                      biblionumber      => $biblionumber,
                      findborrower      => $findborrower,
-                     cardnumber        => $cardnumber,
                      title             => $dat->{title},
                      author            => $dat->{author},
                      holdsview => 1,
-- 
1.7.2.5


From tdavis at uttyler.edu  Sun Jun 26 22:51:36 2011
From: tdavis at uttyler.edu (Elliott Davis)
Date: Sun, 26 Jun 2011 15:51:36 -0500
Subject: [Koha-patches] Opac Shelving Location Patch
Message-ID: <8754F6E19960C249BB9C8FFECA627740013FB9CD26@dogbert>

Added system preference to display shelving location of an item on opac reults.  The system preference is called OpacItemLocation.  I also moved the call number to a new line called Location along with the shelving location if it is enabled.  To Test: run database update script to add syspref. Enable OpacItemLocation to show locations on the opac-search page.  If it is working you should see the shelving location of the item before the call number.  Multiple home branch shelving locations are separated by a |.

Elliott Davis
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110626/707c7fb2/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Added-system-preference-to-display-shelving-location.patch
Type: application/octet-stream
Size: 11834 bytes
Desc:  0001-Added-system-preference-to-display-shelving-location.patch
URL: </pipermail/koha-patches/attachments/20110626/707c7fb2/attachment.obj>

From tdavis at uttyler.edu  Sun Jun 26 23:13:31 2011
From: tdavis at uttyler.edu (Elliott Davis)
Date: Sun, 26 Jun 2011 16:13:31 -0500
Subject: [Koha-patches] Opac Shelving Location Patch
Message-ID: <66DB28B4-31B3-4162-9ACC-C6D50EC4004A@uttyler.edu>

Patch to bug 5079



----- Reply message -----
From: "Elliott Davis" <tdavis at uttyler.edu>
To: "koha-patches at lists.koha-community.org" <koha-patches at lists.koha-community.org>
Subject: Opac Shelving Location Patch
Date: Sun, Jun 26, 2011 3:51 pm



Added system preference to display shelving location of an item on opac reults.  The system preference is called OpacItemLocation.  I also moved the call number to a new line called Location along with the shelving location if it is enabled.  To Test: run database update script to add syspref. Enable OpacItemLocation to show locations on the opac-search page.  If it is working you should see the shelving location of the item before the call number.  Multiple home branch shelving locations are separated by a |.

Elliott Davis
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110626/eaf9a4a9/attachment.htm>

From nengard at bywatersolutions.com  Tue Jun 28 21:26:03 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 28 Jun 2011 15:26:03 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_bug_6538_update_letter=2Epl_?=
	=?utf-8?q?help_file?=
Message-ID: <1309289163-1662-1-git-send-email-nengard@bywatersolutions.com>


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/help/tools/letter.tt           |  131 +++++++++++++++-----
 1 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
index 693c8e0..85f731b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
@@ -1,35 +1,104 @@
 [% INCLUDE 'help-top.inc' %]
 
 <h1>Notices</h1>
+All notices sent by Koha can be customized using the Notices Tool. The system comes with several predefined templates that will appear when you first visit the Notices Tool
 
-<p>Notices are messages sent to patrons, vendors and staff to notify them at key times.</p>
-<h2>Add a new notice</h2>
-		<ul>
-			<li>Click 'New Notice'</li>
-			<li>Choose a 'Koha Module' to associate your notice with from the dropdown box</li>
-			<li>Enter a 'Code' abbreviation for your new notice (for example: 'ODUE' for Overdue Notice)</li>
-			<li>Enter a 'Name' for your new notice (for example 'Overdue Notice')</li>
-			<li>Enter a 'Message Subject' (for example 'Item Overdue')</li>
-			<li>Design your 'Message Body'</li>
-		</ul>
-		<ul>
-			<li> 
-			<ul>
-				<li>Choose a field from the scroll down menu on the left side
-				<ul>
-					<li>
-				    <span style="background-color: #ffe599">
-TIP: For help with what each field is, see the Notices: Database Fields section of this manual</span></li>
-				</ul></li>
-				<li>Click the '&gt;&gt;' button to insert that field into your text message where you'd like it to appear in the notice.</li>
-				<li>Continue adding 'field's and clicking '&gt;&gt;' to insert them into the notice until your message is completed.</li>
-				<li>Then, click 'Submit'</li>
-			</ul></li>
-			<li>
-		    <span style="color: #ff0000">
-IMPORTANT: Currently, Koha can not reference multiple biblios in a single notice (in other words--in the example below-- there is not just ONE email sent that describes ALL currently overdue items, but an email sent for EACH overdue item) </span></li>
-		</ul><h3>	   
-	   How do I schedule overdue notices?</h3>To schedule overdue notices, you must use Koha's 'Notice/Status Trigger' tool.<br/>
-		<ul>
-			<li><em>Get there:</em> More &gt; Tools &gt; Overdue notice/status triggers</li>
-		</ul>	[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+Each notice can be edited, but only a few can be deleted, this is to prevent system errors should a message try to send without a template.
+<h2>Adding Notices</h2>
+<ul>
+	<li>To add a new notice
+<ul>
+	<li>Click 'New Notice'</li>
+	<li>Choose the module this notice is related to</li>
+	<li>The Code is limited to 20 characters</li>
+	<li>Use the name field to expand on your Code</li>
+	<li>Message Subject is what will appear in the subject line of the email</li>
+	<li>In the message body feel free to type whatever message you feel is best, use the fields on the left hand side to enter individualized data from the from database.
+<ul>
+	<li style="color: #ff0000;">Important: On overdue notices make sure to use &lt;&lt;items.content&gt;&gt; to print out the data related to all items that are overdue. The other option is to use the &lt;item&gt;&lt;/item&gt; tags to span the line so that it will print out multiple lines</li>
+	<li style="color: #ff0000;">Important: Only the overdue notices take advantage of the &lt;item&gt;&lt;/item&gt; tags, all other notices referencing items need to use &lt;&lt;items.content&gt;&gt;</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<h3>Notice Markup</h3>
+When creating your overdue notices there are two tags in addition to the various database fields that you can use in your notices.
+<p style="color: #ff0000;">Important: These new tags only work on the overdue notices, not other circulation related notices at this time.</p>
+
+<ul>
+	<li>&lt;item&gt;&lt;/item&gt; which should enclose all fields from the biblio, biblioitems, and items tables.</li>
+	<li>&lt;fine&gt;&lt;/fine&gt; which should be enclosed by the item tag and should enclose a currency identifier per ISO 4217. If this tag is present with a proper identifier, the fine for that item will be displayed in the proper currency format.
+<ul>
+	<li>Note: ISO 4217 changes from time to time therefore all currencies may not be supported. If you find one that is not supported, please file a bug with the Locale::Currency::Format author Tan D Nguyen &lt;tnguyen at cpan doe org&gt;.</li>
+</ul>
+</li>
+</ul>
+An example of using these two tags in a notice template might be like:
+<pre>The following item(s) is/are currently overdue:
+
+   &lt;item&gt;"&lt;&lt;biblio.title&gt;&gt;" by &lt;&lt;biblio.author&gt;&gt;, &lt;&lt;items.itemcallnumber&gt;&gt;, Barcode: &lt;&lt;items.barcode&gt;&gt; Fine: &lt;fine&gt;GBP&lt;/fine&gt;&lt;/item&gt;</pre>
+Which, assuming two items were overdue, would result in a notice like:
+<pre>The following item(s) is/are currently overdue:
+
+   "A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: ?3.50
+   "History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: ?3.50</pre>
+<h2>Existing Notices</h2>
+Among the default notices are notices for several common actions within Koha, here are some of what those notices do
+<ul>
+	<li>ACCTDETAILS
+<ul>
+	<li>Sent to patrons when their account is set up if the AutoEmailOPACUser preference is set to 'Send'</li>
+</ul>
+</li>
+	<li>ACQCLAIM (Acquisition Claim)
+<ul>
+	<li>Used in the claim acquisition module</li>
+	<li>Get there: More &gt; Acquisitions &gt; Late issues</li>
+</ul>
+</li>
+	<li>HOLD (Hold Available for Pickup)
+<ul>
+	<li>This notice is used if two criteria are met:
+<ul>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice
+<ul>
+	<li>Get there: OPAC &gt; Login &gt; my messaging</li>
+	<li>Get there: Staff Client &gt; Patron Record &gt; Messaging</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+	<li>HOLDPLACED (a notice to the library staff that a hold has been placed)
+<ul>
+	<li>This notice requires the emailLibrarianWhenHoldIsPlaced system preference to be set to 'Enable'</li>
+</ul>
+</li>
+	<li>HOLD_PRINT (Printed notice when hold available for pickup)
+<ul>
+	<li>This notice is used for hold confirmation notices that are sent out in print format. This will not effect what the email notice looks like.</li>
+</ul>
+</li>
+	<li>ODUE (Overdue Notice)
+<ul>
+	<li>This notice is used to send Overdue Notices to Patrons</li>
+	<li>See a Sample Overdue Notice</li>
+	<li>Requires that you set Overdue Notice/Status Triggers</li>
+</ul>
+</li>
+	<li>RLIST (Routing List)
+<ul>
+	<li>Used in the serials module to notify patrons/staff of new issues of a serial
+<ul>
+	<li>Get there: More &gt; Serials &gt; New Subscription</li>
+</ul>
+</li>
+	<li>You have the option to select the 'Routing List' notice when creating a new subscription (Choose from the 'Patron notification' drop down).</li>
+	<li style="background-color: #ffe599;">Tip: Notice also that if you'd like to notify patrons of new serial issues, you can click on 'define a notice' which will take you to the 'Notices' tool</li>
+</ul>
+</li>
+</ul>
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From peter at oslo.ie  Wed Jun 29 15:17:43 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Wed, 29 Jun 2011 14:17:43 +0100
Subject: [Koha-patches] [PATCH] Bug 6539: Creates a function to validate an
	isbn and uses it to populate the Z3950 search popup isbn with
	this value,
	the the value is not an isbn number the title field is populated.
In-Reply-To: <ISBN fiels z3950 search>
References: <ISBN fiels z3950 search>
Message-ID: <1309353463-23605-1-git-send-email-peter@oslo.ie>

To Test:
Performa a catalogue search then hit the Z39.50 search button and your search term should populate the Title field in the pop up window. Now perform a search on a valid ISBN (10 or 13) number and the term you searched for should populate the ISBN field on the popup window.
---
 C4/Search.pm |   73 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index c3cff65..be96946 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -33,6 +33,7 @@ use C4::Debug;
 use C4::Items;
 use YAML;
 use URI::Escape;
+use POSIX;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
@@ -1423,7 +1424,7 @@ sub searchResults {
     #find branchname
     #get branch information.....
     my %branches;
-    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches"); # FIXME : use C4::Branch::GetBranches
+    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");                
     $bsth->execute();
     while ( my $bdata = $bsth->fetchrow_hashref ) {
         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
@@ -1671,7 +1672,7 @@ sub searchResults {
 		    ($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
                 }
 
-                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
+                # item is withdrawn, lost or damaged
                 if (   $item->{wthdrawn}
                     || $item->{itemlost}
                     || $item->{damaged}
@@ -1686,15 +1687,6 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
-                    
-                    # can place hold on item ?
-                    if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
-                      && !$item->{itemlost}
-                      && !$item->{withdrawn}
-                    ) {
-                        $can_place_holds = 1;
-                    }
-                    
                     $other_count++;
 
                     my $key = $prefix . $item->{status};
@@ -2599,9 +2591,20 @@ $template->param ( MYLOOP => C4::Search::z3950_search_args($searchscalar) )
 
 =cut
 
+
+
+
 sub z3950_search_args {
     my $bibrec = shift;
-    $bibrec = { title => $bibrec } if !ref $bibrec;
+  
+ 
+    if (validate_isbn($bibrec) == 1)
+    {
+    $bibrec = { isbn => $bibrec } if !ref $bibrec;
+}
+else {
+     $bibrec = { title => $bibrec } if !ref $bibrec;
+}
     my $array = [];
     for my $field (qw/ lccn isbn issn title author dewey subject /)
     {
@@ -2641,6 +2644,52 @@ OR adds a new authority record
 =cut
 
 
+=head
+BOOL validate_isbn($isbn_number)
+
+This function validates an isbn number by:
+
+1. Checking it is 10 or 13 characters long
+2. If it is 10 characters long, checks the lasd character is an 'X' and all other characters are digits
+3. If it is 13 characters long, checks it begins with '97' and all other characters are digits
+
+=cut
+sub validate_isbn { 
+  my $isbn = shift; 
+    
+    # Handle ISBNs with spaces or hyphens in them 
+    $isbn =~ s/\s+//g;
+    $isbn =~ s/\-//g;
+    
+    # Is it the correct length ?
+         if (length($isbn) != 10 && length($isbn) != 13)
+         { return 0; } 
+                     else {   
+                         
+                         # Is the last char 'x' for ISBN10 ?  
+                            my @chars = split('', $isbn); 
+                              if (length($isbn) == 10 && uc($chars[9]) eq 'X')
+                               {
+                                    # Are all but the last characters digits ? 
+                                    if (isdigit(substr($isbn,0,length($isbn)-1)) )
+                                     { return 1;}
+                               }
+  
+                    # Is it 13 chars long and begin with '97' ?
+                   if ( ($chars[0] eq '9' && $chars[1] eq '7') && length($isbn) == 13)
+                   {
+                       # is it made up of digits? 
+                    if (isdigit($isbn))  
+                     { return 1;}
+         
+      
+                    }
+      
+                 } 
+     # If this function has not yet successfully returned the return failure
+     return 0;
+}
+
 sub BiblioAddAuthorities{
   my ( $record, $frameworkcode ) = @_;
   my $dbh=C4::Context->dbh;
-- 
1.7.4.1


From f.demians at tamil.fr  Wed Jun 29 15:52:35 2011
From: f.demians at tamil.fr (=?ISO-8859-1?Q?Fr=E9d=E9ric_DEMIANS?=)
Date: Wed, 29 Jun 2011 15:52:35 +0200
Subject: [Koha-patches] [PATCH] Bug 6539: Creates a function to validate
 an	isbn and uses it to populate the Z3950 search popup isbn with	this value,
 the the value is not an isbn number the title field is populated.
In-Reply-To: <1309353463-23605-1-git-send-email-peter@oslo.ie>
References: <ISBN fiels z3950 search>
	<1309353463-23605-1-git-send-email-peter@oslo.ie>
Message-ID: <4E0B2E23.4050204@tamil.fr>

A generic, and robust, Perl ISBN module is already used in Koha : 
Business::ISBN

   http://search.cpan.org/dist/Business-ISBN/

Please, use it rather than partially recoding it.

-- 
Fr?d?ric DEMIANS
http://www.tamil.fr/u/fdemians.html


From peter at oslo.ie  Wed Jun 29 16:57:24 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Wed, 29 Jun 2011 15:57:24 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug: 6539 - Used Business::ISBN to
	validate the ISBN intead of rolling my own
Message-ID: <1309359444-24545-1-git-send-email-peter@oslo.ie>

---
 C4/Search.pm |   69 ++++++++++++++++++---------------------------------------
 1 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index be96946..5648faa 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -33,7 +33,7 @@ use C4::Debug;
 use C4::Items;
 use YAML;
 use URI::Escape;
-use POSIX;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
@@ -1424,7 +1424,15 @@ sub searchResults {
     #find branchname
     #get branch information.....
     my %branches;
     my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");                
     $bsth->execute();
     while ( my $bdata = $bsth->fetchrow_hashref ) {
         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
@@ -1687,6 +1695,16 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};

 # can place hold on item ?
                    if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
                      && !$item->{itemlost}
                      && !$item->{withdrawn}
                    ) {
                        $can_place_holds = 1;
                    }
                    

                     $other_count++;
 
                     my $key = $prefix . $item->{status};
@@ -2596,9 +2614,9 @@ $template->param ( MYLOOP => C4::Search::z3950_search_args($searchscalar) )
 
 sub z3950_search_args {
     my $bibrec = shift;
-  
+    my $isbn = Business::ISBN->new($bibrec); 
  
-    if (validate_isbn($bibrec) == 1)
+    if (defined $isbn && $isbn->is_valid)
     {
     $bibrec = { isbn => $bibrec } if !ref $bibrec;
 }
@@ -2644,51 +2662,8 @@ OR adds a new authority record
 =cut
 
 
-=head
-BOOL validate_isbn($isbn_number)
 
-This function validates an isbn number by:
 
-1. Checking it is 10 or 13 characters long
-2. If it is 10 characters long, checks the lasd character is an 'X' and all other characters are digits
-3. If it is 13 characters long, checks it begins with '97' and all other characters are digits
-
-=cut
-sub validate_isbn { 
-  my $isbn = shift; 
-    
-    # Handle ISBNs with spaces or hyphens in them 
-    $isbn =~ s/\s+//g;
-    $isbn =~ s/\-//g;
-    
-    # Is it the correct length ?
-         if (length($isbn) != 10 && length($isbn) != 13)
-         { return 0; } 
-                     else {   
-                         
-                         # Is the last char 'x' for ISBN10 ?  
-                            my @chars = split('', $isbn); 
-                              if (length($isbn) == 10 && uc($chars[9]) eq 'X')
-                               {
-                                    # Are all but the last characters digits ? 
-                                    if (isdigit(substr($isbn,0,length($isbn)-1)) )
-                                     { return 1;}
-                               }
-  
-                    # Is it 13 chars long and begin with '97' ?
-                   if ( ($chars[0] eq '9' && $chars[1] eq '7') && length($isbn) == 13)
-                   {
-                       # is it made up of digits? 
-                    if (isdigit($isbn))  
-                     { return 1;}
-         
-      
-                    }
-      
-                 } 
-     # If this function has not yet successfully returned the return failure
-     return 0;
-}
 
 sub BiblioAddAuthorities{
   my ( $record, $frameworkcode ) = @_;
-- 
1.7.4.1


From f.demians at tamil.fr  Wed Jun 29 17:19:52 2011
From: f.demians at tamil.fr (=?ISO-8859-1?Q?Fr=E9d=E9ric_DEMIANS?=)
Date: Wed, 29 Jun 2011 17:19:52 +0200
Subject: [Koha-patches] [PATCH 2/2] Bug: 6539 - Used Business::ISBN to
 validate the ISBN intead of rolling my own
In-Reply-To: <1309359444-24545-1-git-send-email-peter@oslo.ie>
References: <1309359444-24545-1-git-send-email-peter@oslo.ie>
Message-ID: <4E0B4298.9070706@tamil.fr>

Thanks for your reactivity.

diff --git a/C4/Search.pm b/C4/Search.pm
 > index be96946..5648faa 100644
 > --- a/C4/Search.pm
 > +++ b/C4/Search.pm
 > @@ -33,7 +33,7 @@ use C4::Debug;
 >  use C4::Items;
 >  use YAML;
 >  use URI::Escape;
 > -use POSIX;
 > +use Business::ISBN;

This means that your patch is based on your previous patch. You must
send a patch based on current HEAD: Koha last version as available on
git repository.


From peter at oslo.ie  Wed Jun 29 18:44:21 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Wed, 29 Jun 2011 17:44:21 +0100
Subject: [Koha-patches] [PATCH] When searching the catalogue,
	if I get no results then hit the Z39.50 search the title field in
	the pop up window is populated with what I searched for.
Message-ID: <1309365861-25399-1-git-send-email-peter@oslo.ie>

If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.
---
 C4/Search.pm |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index c3cff65..5648faa 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -33,6 +33,7 @@ use C4::Debug;
 use C4::Items;
 use YAML;
 use URI::Escape;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
@@ -1423,7 +1424,15 @@ sub searchResults {
     #find branchname
     #get branch information.....
     my %branches;
-    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches"); # FIXME : use C4::Branch::GetBranches
+    my $bsth;
+              if ( C4::Context->preference("searchMyLibraryOnly")  )
+           {
+            $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = '". C4::Branch::mybranch() ."' "); # FIXME : use C4::Branch::GetBranches
+            }
+            else
+            {
+             $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");                
+            }
     $bsth->execute();
     while ( my $bdata = $bsth->fetchrow_hashref ) {
         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
@@ -1671,7 +1680,7 @@ sub searchResults {
 		    ($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
                 }
 
-                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
+                # item is withdrawn, lost or damaged
                 if (   $item->{wthdrawn}
                     || $item->{itemlost}
                     || $item->{damaged}
@@ -1686,8 +1695,8 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
-                    
-                    # can place hold on item ?
+
+ # can place hold on item ?
                     if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
                       && !$item->{itemlost}
                       && !$item->{withdrawn}
@@ -1695,6 +1704,7 @@ sub searchResults {
                         $can_place_holds = 1;
                     }
                     
+
                     $other_count++;
 
                     my $key = $prefix . $item->{status};
@@ -2599,9 +2609,20 @@ $template->param ( MYLOOP => C4::Search::z3950_search_args($searchscalar) )
 
 =cut
 
+
+
+
 sub z3950_search_args {
     my $bibrec = shift;
-    $bibrec = { title => $bibrec } if !ref $bibrec;
+    my $isbn = Business::ISBN->new($bibrec); 
+ 
+    if (defined $isbn && $isbn->is_valid)
+    {
+    $bibrec = { isbn => $bibrec } if !ref $bibrec;
+}
+else {
+     $bibrec = { title => $bibrec } if !ref $bibrec;
+}
     my $array = [];
     for my $field (qw/ lccn isbn issn title author dewey subject /)
     {
@@ -2641,6 +2662,9 @@ OR adds a new authority record
 =cut
 
 
+
+
+
 sub BiblioAddAuthorities{
   my ( $record, $frameworkcode ) = @_;
   my $dbh=C4::Context->dbh;
-- 
1.7.4.1


From chad at pennmanor.net  Wed Jun 29 19:37:48 2011
From: chad at pennmanor.net (Chad Billman)
Date: Wed, 29 Jun 2011 13:37:48 -0400
Subject: [Koha-patches] LDAP auth and bug 5995
Message-ID: <4E0B62EC.5070806@pennmanor.net>

I updated our koha server to the latest 3.4.x via git and noticed that 
ldap authentication was broken for the staff side.

In our environment our userid != cardnumber. During debugging I noticed 
the getuserflags function was actually comparing against the cardnumber 
and not the permission bits. This happens when the query in 
haspermission() does not return any rows.

The second patch removes part of the patch for bug 5995. If I am 
understanding that bug correctly this ok as long as haspermission is fixed.

Chad Billman

From chad at pennmanor.net  Wed Jun 29 18:30:15 2011
From: chad at pennmanor.net (Chad Billman)
Date: Wed, 29 Jun 2011 12:30:15 -0400
Subject: [PATCH 1/2] Make sure haspermission function does not pass along a null value
Message-ID: <mailman.51.1309369075.21660.koha-patches@lists.koha-community.org>

---
 C4/Auth.pm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index b416449..2569ff1 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1580,7 +1580,12 @@ 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);
+    
+    # Make sure the query returns a value before passing to getuserflags
+    my $flags = $sth->fetchrow();
+    if( !$flags ) { $flags = 0; }
+    
+    $flags = getuserflags($flags, $userid);
     if ( $userid eq C4::Context->config('user') ) {
         # Super User Account from /etc/koha.conf
         $flags->{'superlibrarian'} = 1;
-- 
1.7.4.1


--------------090602050905080002080504
Content-Type: text/x-patch;
 name="0002-Back-out-part-of-bug-5995-do-not-change-userid-to-ca.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0002-Back-out-part-of-bug-5995-do-not-change-userid-to-ca.pa";
 filename*1="tch"


From chad at pennmanor.net  Wed Jun 29 18:45:18 2011
From: chad at pennmanor.net (Chad Billman)
Date: Wed, 29 Jun 2011 12:45:18 -0400
Subject: [PATCH 2/2] Back out part of bug 5995 - do not change userid to cardnumber
Message-ID: <mailman.52.1309369075.21660.koha-patches@lists.koha-community.org>

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

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 2569ff1..a483630 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -737,8 +737,7 @@ sub checkauth {
 		    $info{'invalidCasLogin'} = 1 unless ($return);
         	} else {
 		    my $retuserid;
-		    ( $return, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
-		    $userid = $retuserid if ($retuserid ne '');
+		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
 		}
 		if ($return) {
                _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
-- 
1.7.4.1


--------------090602050905080002080504--


From magnus at enger.priv.no  Wed Jun 29 23:31:38 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 29 Jun 2011 23:31:38 +0200
Subject: [Koha-patches] [PATCH] Bug 6517 - koha-create wants "use database"
	in DEFAULTSQL
Message-ID: <1309383098-10317-1-git-send-email-magnus@enger.priv.no>

This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.

To test:
- Apply the patch
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db
---
 debian/scripts/koha-create |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e3c73fc..bb4dbef 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -189,7 +189,7 @@ then
         # Populate the database with default content.
         zcat "$DEFAULTSQL" |
         sed "s/__KOHASITE__/$name/g" |
-        mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd"
+        mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd" $mysqldb
 
 
         # Change the default user's password.
-- 
1.7.4.1


From semarie-koha at latrappe.fr  Thu Jun 30 06:47:35 2011
From: semarie-koha at latrappe.fr (=?iso-8859-1?Q?Fr=E8re_S=E9bastien?= Marie)
Date: Thu, 30 Jun 2011 06:47:35 +0200
Subject: [Koha-patches] [PATCH] When searching the catalogue,
 if I get no results then hit the Z39.50 search the title field in
 the pop up window is populated with what I searched for.
In-Reply-To: <1309365861-25399-1-git-send-email-peter@oslo.ie>
References: <1309365861-25399-1-git-send-email-peter@oslo.ie>
Message-ID: <20110630044735.GA20559@latrappe.fr>

Hi,

Please use placeholders in SQL statement.

Your patch could result SQL injection if user may change C4::Branch::mybranch return value or result SQL error if branchname contains "'" (quote) character.

The 'safe' way should be:
  $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = ?");
  $bsth->execute(C4::Branch::mybranch());

As here the 'prepare' is in if-clause, the 'execute' should be too (as parameters are dependant of placeholders), resulting something like:

my $bsth;
if ( C4::Context->preference("searchMyLibraryOnly")  ) {
  $bsth = $dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = ?"); # FIXME : use C4::Branch::GetBranches
  $bsth->execute(C4::Branch::mybranch());
} else {
  $bsth = $dbh->prepare("SELECT branchcode,branchname FROM branches");
  $bsth->execute();
}


Thanks.
-- 
Fr?re S?bastien Marie
Abbaye Notre Dame de La Trappe
61380 Soligny-la-Trappe
T?l: 02.33.84.17.00
Fax: 02.33.34.98.57
Web: http://www.latrappe.fr/

On Wed, Jun 29, 2011 at 05:44:21PM +0100, Peter Lorimer wrote:
> If I search for a valid ISBN number and hit the Z39.50 search, the title field
> is populated with the ISBN number I searched for. This number should populate
> the ISBN field and not the title field.
> ---
>  C4/Search.pm |   34 +++++++++++++++++++++++++++++-----
>  1 files changed, 29 insertions(+), 5 deletions(-)

[...]

>+    my $bsth;
>+              if ( C4::Context->preference("searchMyLibraryOnly")  )
>+           {
>+            $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = '". C4::Branch::mybranch() ."'
>+"); # FIXME : use C4::Branch::GetBranches
>+            }
>+            else
>+            {
>+             $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");
>+            }
>     $bsth->execute();

[...]

From magnus at enger.priv.no  Thu Jun 30 08:50:37 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 30 Jun 2011 08:50:37 +0200
Subject: [Koha-patches] [PATCH] Bug 6517 - [REVISED] koha-create wants "use
	database" in DEFAULTSQL
Message-ID: <1309416637-2509-1-git-send-email-magnus@enger.priv.no>

The revised patch quotes the variable $mysqldb, as suggested by Fr?re
S?bastien Marie.

This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.

To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db
---
 debian/scripts/koha-create |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e3c73fc..5ac5430 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -189,7 +189,7 @@ then
         # Populate the database with default content.
         zcat "$DEFAULTSQL" |
         sed "s/__KOHASITE__/$name/g" |
-        mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd"
+        mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd" "$mysqldb"
 
 
         # Change the default user's password.
-- 
1.7.4.1


From peter at oslo.ie  Thu Jun 30 10:51:23 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Thu, 30 Jun 2011 09:51:23 +0100
Subject: [Koha-patches] [PATCH] When searching the catalogue,
	if I get no results then hit the Z39.50 search the title field in
	the pop up window is populated with what I searched for.
Message-ID: <1309423883-32202-1-git-send-email-peter@oslo.ie>

If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.
---
 C4/Search.pm |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index c3cff65..d8d2ec5 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -33,6 +33,7 @@ use C4::Debug;
 use C4::Items;
 use YAML;
 use URI::Escape;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
@@ -1423,7 +1424,7 @@ sub searchResults {
     #find branchname
     #get branch information.....
     my %branches;
-    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches"); # FIXME : use C4::Branch::GetBranches
+    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");                
     $bsth->execute();
     while ( my $bdata = $bsth->fetchrow_hashref ) {
         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
@@ -1671,7 +1672,7 @@ sub searchResults {
 		    ($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
                 }
 
-                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
+                # item is withdrawn, lost or damaged
                 if (   $item->{wthdrawn}
                     || $item->{itemlost}
                     || $item->{damaged}
@@ -1686,8 +1687,8 @@ sub searchResults {
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
-                    
-                    # can place hold on item ?
+
+ # can place hold on item ?
                     if ((!$item->{damaged} || C4::Context->preference('AllowHoldsOnDamagedItems'))
                       && !$item->{itemlost}
                       && !$item->{withdrawn}
@@ -1695,6 +1696,7 @@ sub searchResults {
                         $can_place_holds = 1;
                     }
                     
+
                     $other_count++;
 
                     my $key = $prefix . $item->{status};
@@ -2599,9 +2601,20 @@ $template->param ( MYLOOP => C4::Search::z3950_search_args($searchscalar) )
 
 =cut
 
+
+
+
 sub z3950_search_args {
     my $bibrec = shift;
-    $bibrec = { title => $bibrec } if !ref $bibrec;
+    my $isbn = Business::ISBN->new($bibrec); 
+ 
+    if (defined $isbn && $isbn->is_valid)
+    {
+    $bibrec = { isbn => $bibrec } if !ref $bibrec;
+}
+else {
+     $bibrec = { title => $bibrec } if !ref $bibrec;
+}
     my $array = [];
     for my $field (qw/ lccn isbn issn title author dewey subject /)
     {
@@ -2641,6 +2654,9 @@ OR adds a new authority record
 =cut
 
 
+
+
+
 sub BiblioAddAuthorities{
   my ( $record, $frameworkcode ) = @_;
   my $dbh=C4::Context->dbh;
-- 
1.7.4.1


From nengard at gmail.com  Thu Jun 30 12:23:04 2011
From: nengard at gmail.com (Nicole Engard)
Date: Thu, 30 Jun 2011 06:23:04 -0400
Subject: [Koha-patches] [PATCH] When searching the catalogue,
 if I get no results then hit the Z39.50 search the title field in
 the pop up window is populated with what I searched for.
In-Reply-To: <20110630044735.GA20559@latrappe.fr>
References: <1309365861-25399-1-git-send-email-peter@oslo.ie>
	<20110630044735.GA20559@latrappe.fr>
Message-ID: <BANLkTimfEFmGwqT9gMzA4FdJqQAUKFDu8A@mail.gmail.com>

Also, what bug number is this patch for?

Nicole

2011/6/30 Fr?re S?bastien <semarie-koha at latrappe.fr>:
> Hi,
>
> Please use placeholders in SQL statement.
>
> Your patch could result SQL injection if user may change C4::Branch::mybranch return value or result SQL error if branchname contains "'" (quote) character.
>
> The 'safe' way should be:
> ?$bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = ?");
> ?$bsth->execute(C4::Branch::mybranch());
>
> As here the 'prepare' is in if-clause, the 'execute' should be too (as parameters are dependant of placeholders), resulting something like:
>
> my $bsth;
> if ( C4::Context->preference("searchMyLibraryOnly") ?) {
> ?$bsth = $dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = ?"); # FIXME : use C4::Branch::GetBranches
> ?$bsth->execute(C4::Branch::mybranch());
> } else {
> ?$bsth = $dbh->prepare("SELECT branchcode,branchname FROM branches");
> ?$bsth->execute();
> }
>
>
> Thanks.
> --
> Fr?re S?bastien Marie
> Abbaye Notre Dame de La Trappe
> 61380 Soligny-la-Trappe
> T?l: 02.33.84.17.00
> Fax: 02.33.34.98.57
> Web: http://www.latrappe.fr/
>
> On Wed, Jun 29, 2011 at 05:44:21PM +0100, Peter Lorimer wrote:
>> If I search for a valid ISBN number and hit the Z39.50 search, the title field
>> is populated with the ISBN number I searched for. This number should populate
>> the ISBN field and not the title field.
>> ---
>> ?C4/Search.pm | ? 34 +++++++++++++++++++++++++++++-----
>> ?1 files changed, 29 insertions(+), 5 deletions(-)
>
> [...]
>
>>+ ? ?my $bsth;
>>+ ? ? ? ? ? ? ?if ( C4::Context->preference("searchMyLibraryOnly") ?)
>>+ ? ? ? ? ? {
>>+ ? ? ? ? ? ?$bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches WHERE branchcode = '". C4::Branch::mybranch() ."'
>>+"); # FIXME : use C4::Branch::GetBranches
>>+ ? ? ? ? ? ?}
>>+ ? ? ? ? ? ?else
>>+ ? ? ? ? ? ?{
>>+ ? ? ? ? ? ? $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches ");
>>+ ? ? ? ? ? ?}
>> ? ? $bsth->execute();
>
> [...]
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>

From M.de.Rooy at rijksmuseum.nl  Thu Jun 30 15:01:01 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 30 Jun 2011 13:01:01 +0000
Subject: [Koha-patches] [PATCH] 6536: Z3950 Enhancements (Functionality)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA312E9C36@S-MAIL-1B.rijksmuseum.intra>

Z3950 Enhancements: SRU search targets, MARC conversion and additional XSLT processing
Testplan: see http://wiki.koha-community.org/wiki/Z3950_RFC
---
 C4/Breeding.pm                                     |  439 +++++++-
 acqui/z3950_search.pl                              |  320 +-----
 admin/z3950servers.pl                              |   57 +-
 cataloguing/z3950_search.pl                        |  297 +-----
 .../prog/en/modules/admin/z3950servers.tt          |    2 +
 .../intranet-tmpl/prog/en/xslt/MARC21toUNIMARC.xsl | 1187 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/xslt/UNIMARCtoMARC21.xsl |  523 +++++++++
 7 files changed, 2283 insertions(+), 542 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21toUNIMARC.xsl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCtoMARC21.xsl

diff --git a/C4/Breeding.pm b/C4/Breeding.pm
index 9003f9a..cb04e14 100644
--- a/C4/Breeding.pm
+++ b/C4/Breeding.pm
@@ -21,10 +21,14 @@ use strict;
 use warnings;
 
 use C4::Biblio;
-use C4::Koha;
 use C4::Charset;
-use MARC::File::USMARC;
 use C4::ImportBatch;
+use C4::Koha;
+
+use MARC::File::USMARC;
+use XML::LibXML;
+use XML::LibXSLT;
+use ZOOM;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
@@ -36,6 +40,21 @@ BEGIN {
 	@EXPORT = qw(&ImportBreeding &BreedingSearch);
 }
 
+#-------------------------------------------------------------------------------
+
+use constant MAX_RESULTS => 20;
+use constant TO_UNIMARC_XSLT => 'MARC21toUNIMARC.xsl';
+use constant TO_MARC21_XSLT => 'UNIMARCtoMARC21.xsl';
+
+my ($input, at oConnection, at oResult, at hServer,$zquery, $squery);
+#zquery in z3950 format; squery general sru, needs server translation
+my $xsltconv; #stylesheet for marc conversion
+my $flavour; #system marc flavour
+
+my $DEBUG=0;	#set to 1 for debug warnings
+
+#-------------------------------------------------------------------------------
+
 =head1 NAME
 
 C4::Breeding : module to add biblios to import_records via
@@ -154,7 +173,6 @@ sub ImportBreeding {
     return ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$breedingid);
 }
 
-
 =head2 BreedingSearch
 
 ($count, @results) = &BreedingSearch($title,$isbn,$random);
@@ -216,6 +234,421 @@ sub BreedingSearch {
     return($count, @results);
 } # sub breedingsearch
 
+=head2 z3950_search
+
+($breedingref, $error_ref)= C4::Breeding::z3950_search($input);
+C<$input> is a CGI object: all search parameters are passed via this object
+
+C<$breedingref> is an arrayref of search result hashes.
+C<$error_ref> is an arrayref of error messages per server.
+
+z3950_search does not call ImportBreeding anymore for performance reasons.
+
+=cut
+
+sub z3950_search {
+# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
+# Did some refactoring, introduced SRU searching -MR 20110608
+# And incorporated Biblibre XSLT processing for MARC21/UNIMARC conversion
+  $input= shift; #CGI object passed
+  my (@errconn, @breeding_loop);
+
+  init_vars();
+  build_query();
+  my $s= create_connections();
+  load_xslt();
+  start_async_searches();
+
+  my $nremaining  = $s;
+  while($nremaining>0) {
+    my $k=loop_conn_events(); #returns finished connection number
+    handle_conn_results(\@breeding_loop, \@errconn, $k) unless $k<0;
+    --$nremaining;
+  }
+  $_->destroy() for @oConnection;
+
+  return (\@breeding_loop, \@errconn );
+}
+
+#-------------------------------------------------------------------------------
+# Some internal subroutines
+
+sub init_vars {
+  @oConnection=();
+  @oResult=();
+  @hServer=();
+  ($zquery,$squery,$xsltconv,$flavour)=('','',undef,'');
+}
+
+sub build_query {
+  my $nterms=0;
+  my $title         = $input->param('title')||'';
+  my $author        = $input->param('author')||'';
+  my $isbn          = $input->param('isbn')||'';
+  my $lccall        = $input->param('lccall')||'';
+  my $subject       = $input->param('subject')||'';
+  my $dewey         = $input->param('dewey')||'';
+  my $controlnumber = $input->param('controlnumber')||'';
+  my $stdid         = $input->param('stdid')||'';
+  my $srchany       = $input->param('srchany')||'';
+
+  if ($isbn) {
+        $zquery = "\@or \@attr 1=8 \"$isbn\" \@attr 1=7 \"$isbn\" ";
+	$squery = "([isbn]=\"$isbn\" or [issn]=\"$isbn\") and ";
+        $nterms++;
+  }
+  if ($title) {
+        utf8::decode($title);
+        $zquery .= "\@attr 1=4 \"$title\" ";
+	$squery .= "[title]=\"$title\" and ";
+        $nterms++;
+  }
+  if ($author) {
+        utf8::decode($author);
+        $zquery .= "\@attr 1=1003 \"$author\" ";
+	$squery .= "[author]=\"$author\" and ";
+        $nterms++;
+  }
+  if ($dewey) {
+        $zquery .= "\@attr 1=16 \"$dewey\" ";
+	$squery .= "[dewey]=\"$dewey\" and ";
+        $nterms++;
+  }
+  if ($subject) {
+        utf8::decode($subject);
+        $zquery .= "\@attr 1=21 \"$subject\" ";
+	$squery .= "[subject]=\"$subject\" and ";
+        $nterms++;
+  }
+  if ($lccall) {
+        $zquery .= "\@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
+	$squery .= "[lccn]=\"$lccall\" and ";
+        $nterms++;
+  }
+  if ($controlnumber) {
+        $zquery .= "\@attr 1=12 \"$controlnumber\" ";
+	$squery .= "[controlnumber]=\"$controlnumber\" and ";
+        $nterms++;
+  }
+  if ($stdid) {
+        $zquery .= "\@attr 1=1007 \"$stdid\" ";
+	$squery .= "[stdid]=\"$stdid\" and ";
+        $nterms++;
+  }
+  if ($srchany) {
+        $zquery .= "\@attr 1=1016 \"$srchany\" ";
+	$squery .= "[any]=\"$srchany\" and ";
+        $nterms++;
+  }
+  for(1..$nterms-1) {
+      $zquery = "\@and " . $zquery;
+  }
+  $squery=~s/\sand\s$//; #remove last and in sru query
+  warn "zquery ".$zquery  if $DEBUG;
+  warn "squery ".$squery  if $DEBUG;
+}
+
+sub create_connections {
+  my $s=0;
+  my $dbh= C4::Context->dbh;
+
+  my @id= $input->param('id');
+  foreach my $servid (@id) {
+        my $sth = $dbh->prepare("select * from z3950servers where id=?");
+        $sth->execute($servid);
+        my $server = $sth->fetchrow_hashref;
+	next unless $server;
+        warn "serverinfo ".join(':',my @a=map($_||'',%$server)) if $DEBUG;
+
+        $server->{sru}= $server->{host}=~/^sru=/ ? 1: 0;
+	change_sru_host($server) if $server->{sru};
+
+	#set connection options
+        my $option1      = new ZOOM::Options();
+        $option1->option('async' => 1);
+        $option1->option('elementSetName', 'F');
+        $option1->option('databaseName', $server->{db}) unless $server->{sru};
+        $option1->option('user', $server->{userid}) if $server->{userid};
+        $option1->option('password',$server->{password}) if $server->{password};
+        $option1->option('preferredRecordSyntax', $server->{syntax});
+        $option1->option('maximumRecords', MAX_RESULTS) if $server->{sru};
+	  #MR: doubt if maximum makes difference when going through ZOOM
+	pass_sru_options($server,$option1) if $server->{sru};
+
+	#create connection object
+	my $conn;
+        $oConnection[$s]= create ZOOM::Connection($option1);
+
+	#now connect
+	if($server->{sru}) {
+          $oConnection[$s]->connect( 'http://'.$server->{host});
+        }
+        else {
+          $oConnection[$s]->connect( $server->{host}, $server->{port} );
+	}
+
+        $hServer[$s]= $server;
+        $s++;
+  }
+  return $s;
+}
+
+sub change_sru_host { #merge port and database into hostname
+  my $server= shift;
+  if($server->{port} ne '80') {
+    if($server->{host}=~/^([^\/]+)\/(.*)$/ ) {
+      $server->{host}= $1.':'.$server->{port}.'/'.$2;
+    }
+    else {
+      $server->{host}.= ':'.$server->{port};
+    }
+  }
+  #prevent double slash between host and db when concatenating
+  $server->{host}=~ s/\/$//g;
+  $server->{db}=~ s/^\///g;
+  $server->{host}.= '/'.$server->{db};
+}
+
+sub pass_sru_options {
+  my ($server, $option1)=@_;
+  my @parts= split /,/,$server->{host};
+  foreach(my $i=0; $i<@parts; $i++) {
+    if($i==@parts-1) {
+      $server->{host}=$parts[$i];
+    }
+    else {
+      if($parts[$i]=~/^([^=]+)=(.*)/) {
+        $option1->option( $1 => $2);
+      }
+    }
+  }
+}
+
+sub load_xslt { #load stylesheet for marc conversion IF needed
+  $flavour= C4::Context->preference('marcflavour');
+  my $loaded=0;
+  foreach (@hServer) { #load stylesheet once, set key for each server
+    $_->{marc_conv}=0;
+    if($flavour eq 'MARC21' && $_->{syntax}=~/UNIMARC/) {
+      $_->{marc_conv}=1;
+      _load_xslt_stylesheet(TO_MARC21_XSLT) unless $loaded;
+      $loaded=1;
+    }
+    elsif($flavour eq 'UNIMARC' && $_->{syntax}!~/UNIMARC/) {
+      $_->{marc_conv}=1;
+      _load_xslt_stylesheet(TO_UNIMARC_XSLT) unless $loaded;
+      $loaded=1;
+    }
+  }
+}
+
+sub _load_xslt_stylesheet {
+  my ($name)= @_;
+  my $f=full_xslt_path($name);
+  if($f) {
+    my $parser = XML::LibXML->new();
+    my $xslt = XML::LibXSLT->new();
+    my $style_doc = $parser->parse_file($f);
+    $xsltconv = $xslt->parse_stylesheet($style_doc);
+  }
+  else {
+    warn "z3950_search: XSLT problem with $name";
+  }
+}
+
+sub full_xslt_path {
+  my $name=shift;
+  #absolute path?
+  if(substr($name,0,1) eq '/') {
+    return -e $name?$name:undef;
+  }
+  #a relative path: look in xslt subfolder of staff templates
+  my $dir= C4::Context->config('intrahtdocs').'/'.
+	C4::Context->preference('template');
+  #try language folder first, otherwise english
+  my $lang=$input->cookie('KohaOpacLanguage')||'en'; #null->english
+  my $ff= $dir.'/'.$lang.'/xslt/'.$name;
+  return $ff if -e $ff;
+  $ff=$dir.'/en/xslt/'.$name;
+  return -e $ff? $ff: undef;
+}
+
+sub start_async_searches {
+  my $k=0;
+  foreach my $conn (@oConnection) {
+    warn 'Doing search '.($k+1) if $DEBUG;
+    if($hServer[$k]->{sru}) {
+      $oResult[$k] = $conn->search(new ZOOM::Query::CQL(tran_query($k)));
+    }
+    else {
+      $oResult[$k]=$conn->search_pqf($zquery);
+    }
+    $k++;
+  }
+}
+
+sub loop_conn_events {
+  my ($event, $k);
+  while ( ( $k = ZOOM::event( \@oConnection ) ) != 0 ) {
+        $event = $oConnection[ $k - 1 ]->last_event();
+        warn( "connection ", $k - 1, ": event $event (",
+            ZOOM::event_str($event), ")\n" )
+          if $DEBUG;
+        last if $event == ZOOM::Event::ZEND;
+  }
+  return $k-1;
+}
+
+sub handle_conn_results {
+  my ($breedingref, $errorref, $conn)= @_;
+
+  warn 'Handling results for '.$hServer[$conn]->{name} if $DEBUG;
+  my ($error, $errmsg, $addinfo, $diagset)= $oConnection[$conn]->error_x();
+  if ($error) {
+    if ($error =~ m/^(10000|10007)$/ ) {
+      push(@$errorref, {'server' => $hServer[$conn]->{host} });
+    }
+    warn "$conn ".$hServer[$conn]->{host}.
+	" error $zquery: $errmsg ($error) $addinfo\n";
+    return;
+  }
+
+  my $numresults = $oResult[$conn]->size();
+  warn "Number of hits: $numresults" if $DEBUG;
+  $numresults= MAX_RESULTS if $numresults>MAX_RESULTS;
+  for(my $i=0; $i<$numresults; $i++) {
+    my $rec = $oResult[$conn]->record($i);
+    if($rec) {
+      handle_one_result($rec, $breedingref, $conn);
+    }
+    else {
+      push(@$breedingref, {
+	'server' => $hServer[$conn]->{name},
+	'title' => join(': ',$oConnection[$conn]->error_x()),
+	'breedingid' => -1,
+	'biblionumber' => -1
+      });
+    }
+  }
+  $oResult[$conn]->destroy();
+}
+
+sub handle_one_result {
+  my ($rec, $breedingref, $conn)= @_;
+  my $marcrecord;
+
+  if($hServer[$conn]->{sru}) { #SRU
+    $marcrecord= MARC::Record->new_from_xml($rec->raw(),'UTF-8',
+	$hServer[$conn]->{syntax});
+  }
+  else { #z3950
+    ($marcrecord)= MarcToUTF8Record($rec->raw(),
+	marcflavour_from_syntax($conn), $hServer[$conn]->{encoding});
+  }
+  $marcrecord->encoding('UTF-8'); #force UTF-8
+  #convert to system marc flavour and/or additional xslt proc.
+  $marcrecord= do_xslt_processing($conn, $marcrecord);
+
+  #call to ImportBreeding replaced by next two calls for optimization
+  my $batch_id = GetZ3950BatchId($hServer[$conn]->{name});
+  my $random= $input->param('random') || rand(1000000000);
+  my $breedingid = AddBiblioToBatch($batch_id, 0, $marcrecord, 'UTF-8',$random);
+  #call to TransformMarcToKoha replaced by next call; we only need 6 fields
+  #save results
+  add_breeding($breedingref, $conn, $marcrecord, $breedingid);
+}
+
+sub marcflavour_from_syntax {
+#passing USMARC to MarcToUTF8Record doesn't work; only knows MARC21/UNIMARC
+  my $conn= shift;
+  return 'UNIMARC' if $hServer[$conn]->{syntax}=~/UNIMARC/;
+  return 'MARC21'; #otherwise
+}
+
+sub do_xslt_processing {
+#convert marc21<->unimarc and/or additional xslt; return MARC record
+  my ($conn, $marcrecord)= @_;
+  my ($res, $newmarcrec, $parser, $style_doc, $stylesheet);
+
+  if($hServer[$conn]->{marc_conv} && defined $xsltconv) {
+    $parser = XML::LibXML->new();
+    $res= $parser->parse_string($marcrecord->as_xml());
+    $res= $xsltconv->transform($res);
+    $res= $xsltconv->output_string($res);
+    $newmarcrec= MARC::Record->new_from_xml($res, 'UTF-8');
+  }
+
+  if($hServer[$conn]->{add_xslt}) { #server specific xslt proc
+    $res= $newmarcrec? $newmarcrec->as_xml(): $marcrecord->as_xml();
+    $parser = XML::LibXML->new() unless $parser;
+    $res= $parser->parse_string($res);
+    my $f= full_xslt_path($hServer[$conn]->{add_xslt});
+    $style_doc = $parser->parse_file($f) if $f;
+    my $xslt = XML::LibXSLT->new();
+    $stylesheet = $xslt->parse_stylesheet($style_doc) if $style_doc;
+    if($stylesheet) {
+      $res= $stylesheet->transform($res);
+      $res= $stylesheet->output_string($res);
+      $newmarcrec= MARC::Record->new_from_xml($res, 'UTF-8');
+    }
+    else {
+      warn "z3950_search: XSLT problem with ".$hServer[$conn]->{add_xslt};
+    }
+  }
+  return $newmarcrec // $marcrecord;
+}
+
+sub add_breeding {
+  my ($breedingref, $conn, $marcrecord, $breedingid)=@_;
+  my %row_data=();
+  $row_data{server}       = $hServer[$conn]->{name};
+  $row_data{breedingid}   = $breedingid;
+  $row_data{biblionumber} = $input->param('biblionumber')||0;
+  if($flavour ne 'UNIMARC') { #MARC21 system (not target!)
+    $row_data{isbn} = isbn_cleanup($marcrecord->subfield('020','a')||'');
+    $row_data{title}= $marcrecord->subfield('245','a')||'';
+    $row_data{author}= $marcrecord->subfield('100','a')||'';
+    $row_data{date}= $marcrecord->subfield('260','c')||'';
+    $row_data{edition}= $marcrecord->subfield('250','a')||'';
+    $row_data{lccn}= $marcrecord->subfield('050','a')||'';
+  }
+  else { #UNIMARC system (not target!)
+    $row_data{isbn}= isbn_cleanup($marcrecord->subfield('010','a')||'');
+    $row_data{title}= $marcrecord->subfield('200','a')||'';
+    $row_data{author}= $marcrecord->subfield('200','f')||'';
+    $row_data{date}= $marcrecord->subfield('210','d')||'';
+    $row_data{edition}= $marcrecord->subfield('205','a')||'';
+    $row_data{lccn}= '';
+  }
+  push( @$breedingref, \%row_data );
+}
+
+sub isbn_cleanup {
+  my $isbn= shift;
+  $isbn=~ s/ |-|\.//g;
+  $isbn=~ s/\|/ \| /g;
+  $isbn=~ s/\(/ \(/g;
+  return $isbn;
+}
+
+sub tran_query { #translate to specific sru fields per server
+  my ($s)= @_;
+  #srufields is in format title=field,isbn=field,...
+  #if a field doesn't exist, try anywhere or remove [field]=
+  my @parts= split(',', $hServer[$s]->{srufields});
+  my %trans= map { if(/=/){($`,$')}else{()} } @parts;
+
+  my $q=$squery; my $any= $trans{any}?$trans{any}.'=':'';
+  foreach my $key (keys %trans) {
+    my $f=$trans{$key};
+    if($f) {$q=~s/\[$key\]/$f/g; } else {$q=~s/\[$key\]=/$any/g; }
+  }
+  $q=~s/\[\w+\]=/$any/g; # remove remaining fields (not found in field list)
+  warn $hServer[$s]->{name}." sru query: $q" if $DEBUG;
+  return $q;
+}
+
 1;
+
 __END__
 
diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 47dbe52..39b7ffd 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
 # Copyright 2000-2002 Katipo Communications
 # Copyright 2010 Catalyst IT
 #
@@ -21,19 +20,19 @@
 
 use warnings;
 use strict;
+
 use CGI;
 
 use C4::Auth;
+use C4::Koha;
 use C4::Output;
-use C4::Biblio;
 use C4::Context;
 use C4::Breeding;
-use C4::Koha;
-use C4::Charset;
 use C4::Bookseller qw/ GetBookSellerFromId /;
-use ZOOM;
 
-my $input        = new CGI;
+#-------------------------------------------------------------------------------
+
+my $input= new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "acqui/z3950_search.tmpl",
@@ -44,278 +43,77 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
+my $frameworkcode = $input->param('frameworkcode')||'';
+my $vendor = GetBookSellerFromId($input->param('booksellerid')||0);
+$template->param(
+	frameworkcode => $frameworkcode,
+	frameworkcodeloop => get_framework_list(),
+	booksellerid => $input->param('booksellerid')||0,
+	basketno => $input->param('basketno'),
+	name => $vendor? $vendor->{'name'}: '',
+);
 
-
-my $dbh          = C4::Context->dbh;
-my $error        = $input->param('error');
-my $biblionumber = $input->param('biblionumber');
-$biblionumber = 0 unless $biblionumber;
-my $frameworkcode = $input->param('frameworkcode');
-my $title         = $input->param('title');
-my $author        = $input->param('author');
-my $isbn          = $input->param('isbn');
-my $issn          = $input->param('issn');
-my $lccn          = $input->param('lccn');
-my $lccall          = $input->param('lccall');
-my $subject= $input->param('subject');
-my $dewey = $input->param('dewey');
-my $controlnumber	= $input->param('controlnumber');
-my $op            = $input->param('op');
-my $booksellerid = $input->param('booksellerid');
-my $basketno = $input->param('basketno');
-my $noconnection;
-my $numberpending;
-my $attr = '';
-my $term;
-my $host;
-my $server;
-my $database;
-my $port;
-my $marcdata;
-my @encoding;
-my @results;
-my $count;
-my $toggle;
-my $record;
-my $oldbiblio;
-my $errmsg;
-my @serverhost;
-my @servername;
-my @breeding_loop = ();
-my $random        = $input->param('random');
-unless ($random)
-{    # this var is not useful anymore just kept to keep rel2_2 compatibility
-    $random = rand(1000000000);
+my $op= $input->param('op')||'';
+if($op ne "do_search") {
+    show_search_form();
+}
+else {
+    run_search();
 }
+output_html_with_http_headers $input, $cookie, $template->output;
 
-my $DEBUG = 0;    # if set to 1, many debug message are send on syslog.
+#-------------------------------------------------------------------------------
 
-# get framework list
-my $frameworks = getframeworks;
-my @frameworkcodeloop;
-foreach my $thisframeworkcode ( keys %$frameworks ) {
+sub get_framework_list {
+  my $frameworks = getframeworks();
+  my @frameworkcodeloop;
+  foreach my $thisframeworkcode ( keys %$frameworks ) {
     my %row = (
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
     );
-    if ( $row{'value'} eq $frameworkcode){
+    if ($row{'value'} eq $frameworkcode) {
         $row{'active'} = 'true';
     }
     push @frameworkcodeloop, \%row;
+  }
+  return \@frameworkcodeloop;
 }
 
-my $vendor = GetBookSellerFromId($booksellerid);
-$template->param( frameworkcode => $frameworkcode, 
-                                    frameworkcodeloop => \@frameworkcodeloop,
-                                    booksellerid => $booksellerid,
-                                    basketno => $basketno,
-                                    name => $vendor->{'name'}
-                                    );
-                                    
+#-------------------------------------------------------------------------------
 
-
-if ( $op ne "do_search" ) {
-    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers  order by host");
-    $sth->execute();
-    my $serverloop = $sth->fetchall_arrayref( {} );
-    $template->param(
-        isbn         => $isbn,
-        issn         => $issn,
-        lccn         => $lccn,
-        lccall       => $lccall,
-        title        => $title,
-        author       => $author,
-        controlnumber=> $controlnumber,
+sub show_search_form {
+  my $dbh= C4::Context->dbh;
+  my $sth = $dbh->prepare("select id,host,name,checked from z3950servers order by host");
+  $sth->execute();
+  my $serverloop = $sth->fetchall_arrayref( {} );
+  $template->param(
+        biblionumber => $input->param('biblionumber') || 0,
         serverloop   => $serverloop,
         opsearch     => "search",
-        biblionumber => $biblionumber,
-    );
-    output_html_with_http_headers $input, $cookie, $template->output;
-}
-else {
-    my @id = $input->param('id');
-    my @oConnection;
-    my @oResult;
-    my $s = 0;
-    my $query;
-    my $nterms;
-    if ($isbn || $issn) {
-        $term=$isbn if ($isbn);
-        $term=$issn if ($issn);
-        $query .= " \@or \@attr 1=8 \"$term\" \@attr 1=7 \"$term\" ";
-        $nterms++;
-    }
-    if ($title) {
-        utf8::decode($title);
-        $query .= " \@attr 1=4 \"$title\" ";
-        $nterms++;
-    }
-    if ($author) {
-        utf8::decode($author);
-        $query .= " \@attr 1=1003 \"$author\" ";
-        $nterms++;
-    }
-    if ($dewey) {
-        $query .= " \@attr 1=16 \"$dewey\" ";
-        $nterms++;
-    }
-    if ($subject) {
-        utf8::decode($subject);
-        $query .= " \@attr 1=21 \"$subject\" ";
-        $nterms++;
-    }
-	if ($lccn) {	
-        $query .= " \@attr 1=9 $lccn ";
-        $nterms++;
-    }
-    if ($lccall) {
-        $query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
-        $nterms++;
-    }
-    if ($controlnumber) {
-        $query .= " \@attr 1=12 \"$controlnumber\" ";
-        $nterms++;
-    }
-for my $i (1..$nterms-1) {
-    $query = "\@and " . $query;
+        title        => $input->param('title')||'',
+        isbn         => $input->param('isbn')||'',
+        lccall       => $input->param('lccall')||'',
+        controlnumber=> $input->param('controlnumber')||'',
+        #srchany      => $input->param('srchany')||'',
+        author       => $input->param('author')||'',
+        subject      => $input->param('subject')||'',
+        dewey        => $input->param('dewey')||'',
+        #stdid        => $input->param('stdid')||'',
+  );
+  #acqui z3950 doesn't support srchany and stdid but cataloguing does
 }
-warn "query ".$query  if $DEBUG;
-
-    foreach my $servid (@id) {
-        my $sth = $dbh->prepare("select * from z3950servers where id=?");
-        $sth->execute($servid);
-        while ( $server = $sth->fetchrow_hashref ) {
-            warn "serverinfo ".join(':',%$server) if $DEBUG;
-            my $noconnection = 0;
-            my $option1      = new ZOOM::Options();
-            $option1->option( 'async' => 1 );
-            $option1->option( 'elementSetName', 'F' );
-            $option1->option( 'databaseName',   $server->{db} );
-            $option1->option( 'user', $server->{userid} ) if $server->{userid};
-            $option1->option( 'password', $server->{password} )
-              if $server->{password};
-            $option1->option( 'preferredRecordSyntax', $server->{syntax} );
-            $oConnection[$s] = create ZOOM::Connection($option1)
-              || $DEBUG
-              && warn( "" . $oConnection[$s]->errmsg() );
-            warn( "server data", $server->{name}, $server->{port} ) if $DEBUG;
-            $oConnection[$s]->connect( $server->{host}, $server->{port} )
-              || $DEBUG
-              && warn( "" . $oConnection[$s]->errmsg() );
-            $serverhost[$s] = $server->{host};
-            $servername[$s] = $server->{name};
-            $encoding[$s]   = ($server->{encoding}?$server->{encoding}:"iso-5426");
-            $s++;
-        }    ## while fetch
-    }    # foreach
-    my $nremaining  = $s;
-    my $firstresult = 1;
-
-    for ( my $z = 0 ; $z < $s ; $z++ ) {
-        warn "doing the search" if $DEBUG;
-        $oResult[$z] = $oConnection[$z]->search_pqf($query)
-          || $DEBUG
-          && warn( "somthing went wrong: " . $oConnection[$s]->errmsg() );
-
-        # $oResult[$z] = $oConnection[$z]->search_pqf($query);
-    }
 
-sub displayresults {
-    my $k;
-    my $event;
-    while ( ( $k = ZOOM::event( \@oConnection ) ) != 0 ) {
-        $event = $oConnection[ $k - 1 ]->last_event();
-        warn( "connection ", $k - 1, ": event $event (",
-            ZOOM::event_str($event), ")\n" )
-          if $DEBUG;
-        last if $event == ZOOM::Event::ZEND;
-    }
-
-    if ( $k != 0 ) {
-        $k--;
-        warn $serverhost[$k] if $DEBUG;
-        my ( $error, $errmsg, $addinfo, $diagset ) =
-          $oConnection[$k]->error_x();
-        if ($error) {
-            warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n"
-              if $DEBUG;
-
-        }
-        else {
-            my $numresults = $oResult[$k]->size();
-            my $i;
-            my $result = '';
-            if ( $numresults > 0 ) {
-                for (
-                    $i = 0 ;
-                    $i < ( ( $numresults < 20 ) ? ($numresults) : (20) ) ;
-                    $i++
-                  )
-                {
-                    my $rec = $oResult[$k]->record($i);
-                    if ($rec) {
-                        my $marcrecord;
-                        $marcdata   = $rec->raw();
-
-                        my ($charset_result, $charset_errors);
-                        ($marcrecord, $charset_result, $charset_errors) = 
-                          MarcToUTF8Record($marcdata, C4::Context->preference('marcflavour'), $encoding[$k]);
-####WARNING records coming from Z3950 clients are in various character sets MARC8,UTF8,UNIMARC etc
-## In HEAD i change everything to UTF-8
-# In rel2_2 i am not sure what encoding is so no character conversion is done here
-##Add necessary encoding changes to here -TG
-                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
-                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
-                        # pad | and ( with spaces to allow line breaks in the HTML
-                        $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
-                        $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+#-------------------------------------------------------------------------------
 
-                        $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
-                        # pad | and ( with spaces to allow line breaks in the HTML
-                        $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
-                        $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
-                          my (
-                            $notmarcrecord, $alreadyindb, $alreadyinfarm,
-                            $imported,      $breedingid
-                          )
-                          = ImportBreeding( $marcdata, 2, $serverhost[$k], $encoding[$k], $random, 'z3950' );
-                        my %row_data;
-                        if ( $i % 2 ) {
-                            $toggle = 1;
-                        }
-                        else {
-                            $toggle = 0;
-                        }
-                        $row_data{toggle}       = $toggle;
-                        $row_data{server}       = $servername[$k];
-                        $row_data{isbn}         = $oldbiblio->{isbn};
-                        $row_data{lccn}         = $oldbiblio->{lccn};
-                        $row_data{title}        = $oldbiblio->{title};
-                        $row_data{author}       = $oldbiblio->{author};
-                        $row_data{breedingid}   = $breedingid;
-                        $row_data{biblionumber} = $biblionumber;
-                        push( @breeding_loop, \%row_data );
-		            
-                    } else {
-                        push(@breeding_loop,{'toggle'=>($i % 2)?1:0,'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
-                    } # $rec
-                }    # upto 5 results
-            }    #$numresults
-        }
-    }    # if $k !=0
-    $numberpending = $nremaining - 1;
-    $template->param(
-        breeding_loop => \@breeding_loop,
-        server        => $servername[$k],
-        numberpending => $numberpending,
-    );
-    output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
-
-    #  	print  $template->output  if $firstresult !=1;
-    $firstresult++;
+sub run_search {
+  my ($breedingref)= C4::Breeding::z3950_search($input);
+    #Code for Z3950 searching moved to C4 module -MR 06/27/11
+    #second return value is ignored here (not in cataloguing)
+  $template->param(
+        breeding_loop => $breedingref,
+        biblionumber  => $input->param('biblionumber') || 0,
+  );
 }
-displayresults();
-while ( --$nremaining > 0 ) {
-        displayresults();
-    }
-}    ## if op=search
+
+#-------------------------------------------------------------------------------
diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 44b3967..6b5e2c9 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -32,7 +32,7 @@ sub StringSearch  {
 	$searchstring=~ s/\'/\\\'/g;
 	my @data=split(' ',$searchstring);
 	my $count=@data;
-	my $sth=$dbh->prepare("Select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name like ?) order by rank,name");
+	my $sth=$dbh->prepare("Select host,port,db,userid,password,name,id,checked,rank,syntax,encoding,srufields,add_xslt from z3950servers where (name like ?) order by rank,name");
 	$sth->execute("$data[0]\%");
 	my @results;
 	while (my $data=$sth->fetchrow_hashref) {
@@ -74,15 +74,15 @@ if ($op eq 'add_form') {
 	my $data;
 	if ($searchfield) {
 		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name = ?) order by rank,name");
+		my $sth=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding,srufields,add_xslt from z3950servers where (name = ?) order by rank,name");
 		$sth->execute($searchfield);
 		$data=$sth->fetchrow_hashref;
 		$sth->finish;
 	}
     $template->param( $_ => $data->{$_} ) 
-        for ( qw( host port db userid password checked rank ) );
+        for ( qw( host port db userid password checked rank srufields add_xslt) );
     $template->param( $_ . $data->{$_} => 1)
-        for ( qw( syntax encoding ) );
+        for ( qw( syntax encoding) );
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
@@ -92,7 +92,7 @@ if ($op eq 'add_form') {
 	my $sth=$dbh->prepare("select * from z3950servers where name=?");
 	$sth->execute($input->param('searchfield'));
 	if ($sth->rows) {
-		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=? where name=?");
+		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=?,srufields=?,add_xslt=? where name=?");
 		$sth->execute($input->param('host'),
 		      $input->param('port'),
 		      $input->param('db'),
@@ -101,27 +101,32 @@ if ($op eq 'add_form') {
 		      $input->param('searchfield'),
 		      $input->param('checked'),
 		      $input->param('rank'),
-			  $input->param('syntax'),
-              $input->param('encoding'),
+		      $input->param('syntax'),
+		      $input->param('encoding'),
+		      $input->param('srufields'),
+		      $input->param('add_xslt'),
 		      $input->param('searchfield'),
 		      );
 	} 
 	else {
 		$sth=$dbh->prepare(
 		  "INSERT INTO z3950servers " .
-		  "(host,port,db,userid,password,name,checked,rank,syntax,encoding) " .
-		  "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" );
-        $sth->execute(
-            $input->param( 'host' ),
-            $input->param( 'port' ),
-            $input->param( 'db' ),
-            $input->param( 'userid' ),
-            $input->param( 'password' ),
-            $input->param( 'searchfield' ),
-            $input->param( 'checked' ),
-            $input->param( 'rank' ),
-            $input->param( 'syntax' ),
-            $input->param( 'encoding' ) );
+		  "(host,port,db,userid,password,name,checked,rank,syntax,encoding,srufields,add_xslt) " .
+		  "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" );
+		$sth->execute(
+		  $input->param( 'host' ),
+		  $input->param( 'port' ),
+		  $input->param( 'db' ),
+		  $input->param( 'userid' ),
+		  $input->param( 'password' ),
+		  $input->param( 'searchfield' ),
+		  $input->param( 'checked' ),
+		  $input->param( 'rank' ),
+		  $input->param( 'syntax' ),
+		  $input->param( 'encoding' ),
+		  $input->param( 'srufields'),
+		  $input->param( 'add_xslt'),
+		);
 	}
 	$sth->finish;
 													# END $OP eq ADD_VALIDATE
@@ -131,7 +136,7 @@ if ($op eq 'add_form') {
 	$template->param(delete_confirm => 1);
 	my $dbh = C4::Context->dbh;
 
-	my $sth2=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name = ?) order by rank,name");
+	my $sth2=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding,srufields,add_xslt from z3950servers where (name = ?) order by rank,name");
 	$sth2->execute($searchfield);
 	my $data=$sth2->fetchrow_hashref;
 	$sth2->finish;
@@ -144,7 +149,10 @@ if ($op eq 'add_form') {
                          checked => $data->{'checked'},
                          rank => $data->{'rank'},
                          syntax => $data->{'syntax'},
-                         encoding => $data->{'encoding'}            );
+                         encoding => $data->{'encoding'},
+			 srufields => $data->{srufields},
+			 add_xslt => $data->{add_xslt},
+	);
 
 													# END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
@@ -174,7 +182,10 @@ if ($op eq 'add_form') {
 			checked => $results->[$i]{'checked'},
 			rank => $results->[$i]{'rank'},
 			syntax => $results->[$i]{'syntax'},
-      encoding => $results->[$i]{'encoding'});
+			encoding => $results->[$i]{'encoding'},
+			srufields => $results->[$i]{srufields},
+			add_xslt => $results->[$i]{add_xslt},
+		);
 		push @loop, \%row;
 
 	}
diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index b12a9c9..256cb05 100755
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -19,58 +18,19 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+
 use CGI;
 
 use C4::Auth;
 use C4::Output;
-use C4::Biblio;
 use C4::Context;
 use C4::Breeding;
-use C4::Koha;
-use C4::Charset;
-use ZOOM;
-
-my $input        = new CGI;
-my $dbh          = C4::Context->dbh;
-my $error         = $input->param('error');
-my $biblionumber  = $input->param('biblionumber') || 0;
-my $frameworkcode = $input->param('frameworkcode');
-my $title         = $input->param('title');
-my $author        = $input->param('author');
-my $isbn          = $input->param('isbn');
-my $issn          = $input->param('issn');
-my $lccn          = $input->param('lccn');
-my $lccall        = $input->param('lccall');
-my $subject       = $input->param('subject');
-my $dewey         = $input->param('dewey');
-my $controlnumber	= $input->param('controlnumber');
-my $stdid			= $input->param('stdid');
-my $srchany			= $input->param('srchany');
-my $random        = $input->param('random') || rand(1000000000); # this var is not useful anymore just kept for rel2_2 compatibility
-my $op            = $input->param('op');
-my $numberpending;
-my $attr = '';
-my $term;
-my $host;
-my $server;
-my $database;
-my $port;
-my $marcdata;
-my @encoding;
-my @results;
-my $count;
-my $record;
-my $oldbiblio;
-my $errmsg;
-my @serverloop = ();
-my @serverhost;
-my @servername;
-my @breeding_loop = ();
 
-my $DEBUG = 0;    # if set to 1, many debug message are send on syslog.
+#-------------------------------------------------------------------------------
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+my $input= new CGI;
+my ($template, $loggedinuser, $cookie ) = get_template_and_user({
         template_name   => "cataloguing/z3950_search.tmpl",
         query           => $input,
         type            => "intranet",
@@ -78,222 +38,49 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
 });
+$template->param( frameworkcode => $input->param('frameworkcode')||'' );
 
-$template->param( frameworkcode => $frameworkcode, );
-
-if ( $op ne "do_search" ) {
-    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers  order by host");
-    $sth->execute();
-    my $serverloop = $sth->fetchall_arrayref( {} );
-    $template->param(
-        isbn         => $isbn,
-        issn         => $issn,
-        lccn         => $lccn,
-        lccall       => $lccall,
-        title        => $title,
-        author       => $author,
-        controlnumber=> $controlnumber,
-        stdid			=> $stdid,
-        srchany		=> $srchany,
-        serverloop   => $serverloop,
-        opsearch     => "search",
-        biblionumber => $biblionumber,
-    );
-    output_html_with_http_headers $input, $cookie, $template->output;
+my $op= $input->param('op')||'';
+if($op ne "do_search") {
+    show_search_form();
 }
 else {
-    my @id = $input->param('id');
-
-    if ( not defined @id ) {
-        # empty server list -> report and exit
-        $template->param( emptyserverlist => 1 );
-        output_html_with_http_headers $input, $cookie, $template->output;
-        exit;
-    }
-
-    my @oConnection;
-    my @oResult;
-    my @errconn;
-    my $s = 0;
-    my $query;
-    my $nterms;
-    if ($isbn || $issn) {
-        $term=$isbn if ($isbn);
-        $term=$issn if ($issn);
-        $query .= " \@or \@attr 1=8 \"$term\" \@attr 1=7 \"$term\" ";
-        $nterms++;
-    }
-    if ($title) {
-        utf8::decode($title);
-        $query .= " \@attr 1=4 \"$title\" ";
-        $nterms++;
-    }
-    if ($author) {
-        utf8::decode($author);
-        $query .= " \@attr 1=1003 \"$author\" ";
-        $nterms++;
-    }
-    if ($dewey) {
-        $query .= " \@attr 1=16 \"$dewey\" ";
-        $nterms++;
-    }
-    if ($subject) {
-        utf8::decode($subject);
-        $query .= " \@attr 1=21 \"$subject\" ";
-        $nterms++;
-    }
-	if ($lccn) {	
-        $query .= " \@attr 1=9 $lccn ";
-        $nterms++;
-    }
-    if ($lccall) {
-        $query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
-        $nterms++;
-    }
-    if ($controlnumber) {
-        $query .= " \@attr 1=12 \"$controlnumber\" ";
-        $nterms++;
-    }
-    if ($stdid) {
-        $query .= " \@attr 1=1007 \"$stdid\" ";
-        $nterms++;
-    }
-    if ($srchany) {
-        $query .= " \@attr 1=1016 \"$srchany\" ";
-        $nterms++;
-    }
-for my $i (1..$nterms-1) {
-    $query = "\@and " . $query;
+    run_search();
 }
-warn "query ".$query  if $DEBUG;
-
-    foreach my $servid (@id) {
-        my $sth = $dbh->prepare("select * from z3950servers where id=?");
-        $sth->execute($servid);
-        while ( $server = $sth->fetchrow_hashref ) {
-            warn "serverinfo ".join(':',%$server) if $DEBUG;
-            my $option1      = new ZOOM::Options();
-            $option1->option('async' => 1);
-            $option1->option('elementSetName', 'F');
-            $option1->option('databaseName', $server->{db});
-            $option1->option('user',         $server->{userid}  ) if $server->{userid};
-            $option1->option('password',     $server->{password}) if $server->{password};
-            $option1->option('preferredRecordSyntax', $server->{syntax});
-            $oConnection[$s] = create ZOOM::Connection($option1)
-              || $DEBUG
-              && warn( "" . $oConnection[$s]->errmsg() );
-            warn( "server data", $server->{name}, $server->{port} ) if $DEBUG;
-            $oConnection[$s]->connect( $server->{host}, $server->{port} )
-              || $DEBUG
-              && warn( "" . $oConnection[$s]->errmsg() );
-            $serverhost[$s] = $server->{host};
-            $servername[$s] = $server->{name};
-            $encoding[$s]   = ($server->{encoding}?$server->{encoding}:"iso-5426");
-            $s++;
-        }    ## while fetch
-    }    # foreach
-    my $nremaining  = $s;
-    my $firstresult = 1;
+output_html_with_http_headers $input, $cookie, $template->output;
 
-    for ( my $z = 0 ; $z < $s ; $z++ ) {
-        warn "doing the search" if $DEBUG;
-        $oResult[$z] = $oConnection[$z]->search_pqf($query)
-          || $DEBUG
-          && warn( "somthing went wrong: " . $oConnection[$s]->errmsg() );
+#-------------------------------------------------------------------------------
 
-        # $oResult[$z] = $oConnection[$z]->search_pqf($query);
-    }
-
-  AGAIN:
-    my $k;
-    my $event;
-    while ( ( $k = ZOOM::event( \@oConnection ) ) != 0 ) {
-        $event = $oConnection[ $k - 1 ]->last_event();
-        warn( "connection ", $k - 1, ": event $event (",
-            ZOOM::event_str($event), ")\n" )
-          if $DEBUG;
-        last if $event == ZOOM::Event::ZEND;
-    }
-
-    if ( $k != 0 ) {
-        $k--;
-        warn $serverhost[$k] if $DEBUG;
-        my ( $error, $errmsg, $addinfo, $diagset ) =
-          $oConnection[$k]->error_x();
-        if ($error) {
-            if ($error =~ m/^(10000|10007)$/ ) {
-                push(@errconn, {'server' => $serverhost[$k]});
-            }
-            $DEBUG and warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n";
-        }
-        else {
-            my $numresults = $oResult[$k]->size();
-            my $i;
-            my $result = '';
-            if ( $numresults > 0 ) {
-                for ($i = 0; $i < (($numresults < 20) ? $numresults : 20); $i++) {
-                    my $rec = $oResult[$k]->record($i);
-                    if ($rec) {
-                        my $marcrecord;
-                        $marcdata   = $rec->raw();
-
-                        my ($charset_result, $charset_errors);
-                        ($marcrecord, $charset_result, $charset_errors) = 
-                          MarcToUTF8Record($marcdata, C4::Context->preference('marcflavour'), $encoding[$k]);
-####WARNING records coming from Z3950 clients are in various character sets MARC8,UTF8,UNIMARC etc
-## In HEAD i change everything to UTF-8
-# In rel2_2 i am not sure what encoding is so no character conversion is done here
-##Add necessary encoding changes to here -TG
-                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
-                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
-                        # pad | and ( with spaces to allow line breaks in the HTML
-                        $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
-                        $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+sub show_search_form {
+  my $dbh= C4::Context->dbh;
+  my $sth= $dbh->prepare("select id,host,name,checked from z3950servers order by host");
+  $sth->execute();
+  my $serverloop = $sth->fetchall_arrayref( {} );
+  $template->param(
+        biblionumber => $input->param('biblionumber') || 0,
+        serverloop   => $serverloop,
+        opsearch     => "search",
+        title        => $input->param('title')||'',
+        isbn         => $input->param('isbn')||'',
+        lccall       => $input->param('lccall')||'',
+        controlnumber=> $input->param('controlnumber')||'',
+        srchany      => $input->param('srchany')||'',
+        author       => $input->param('author')||'',
+        subject      => $input->param('subject')||'',
+        dewey        => $input->param('dewey')||'',
+        stdid        => $input->param('stdid')||'',
+  );
+}
 
-                        $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
-                        # pad | and ( with spaces to allow line breaks in the HTML
-                        $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
-                        $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
-                          my (
-                            $notmarcrecord, $alreadyindb, $alreadyinfarm,
-                            $imported,      $breedingid
-                          )
-                          = ImportBreeding( $marcdata, 2, $serverhost[$k], $encoding[$k], $random, 'z3950' );
-                        my %row_data;
-                        $row_data{server}       = $servername[$k];
-                        $row_data{isbn}         = $oldbiblio->{isbn};
-                        $row_data{lccn}         = $oldbiblio->{lccn};
-                        $row_data{title}        = $oldbiblio->{title};
-                        $row_data{author}       = $oldbiblio->{author};
-                        $row_data{date}         = $oldbiblio->{copyrightdate};
-                        $row_data{edition}      = $oldbiblio->{editionstatement};
-                        $row_data{breedingid}   = $breedingid;
-                        $row_data{biblionumber} = $biblionumber;
-                        push( @breeding_loop, \%row_data );
-		            
-                    } else {
-                        push(@breeding_loop,{'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
-                    } # $rec
-                }
-            }    #$numresults
-        }
-    }    # if $k !=0
-    $numberpending = $nremaining - 1;
-    $template->param(
-        breeding_loop => \@breeding_loop,
-        server        => $servername[$k],
-        numberpending => $numberpending,
-        biblionumber  => $biblionumber,
-        errconn       => \@errconn
-    );
-    
-    output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
+#-------------------------------------------------------------------------------
 
-    #  	print  $template->output  if $firstresult !=1;
-    $firstresult++;
+sub run_search {
+  my ($breedingref, $error_ref)= C4::Breeding::z3950_search($input);
+  $template->param(
+        breeding_loop => $breedingref,
+        biblionumber  => $input->param('biblionumber') || 0,
+        errconn       => $error_ref,
+  );
+}
 
-  MAYBE_AGAIN:
-    if ( --$nremaining > 0 ) {
-        goto AGAIN;
-    }
-}    ## if op=search
+#-------------------------------------------------------------------------------
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index e565acf..c215115 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -226,6 +226,8 @@
 [% END %]
 </select>
 </li>
+	<li><label for="srufields">SRU Fields: </label><input type="text" size="80" name="srufields" id="srufields" value="[% srufields %]"/></li>
+	<li><label for="add_xslt">Additional XSLT: </label><input type="text" size="40" name="add_xslt" id="add_xslt" value="[% add_xslt %]"/></li>
 </ol>
         </fieldset>
 		
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21toUNIMARC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21toUNIMARC.xsl
new file mode 100644
index 0000000..a5d4faa
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21toUNIMARC.xsl
@@ -0,0 +1,1187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2011 BibLibre.
+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.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
+<xsl:stylesheet xmlns:marc="http://www.loc.gov/MARC21/slim" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+	<xsl:template match="/">
+		<collection>
+            <xsl:for-each select="marc: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">
+				<xsl:variable name="leader" select="leader" />
+				<leader>
+					<!-- A calculer, mais comment ? -->
+					<xsl:variable name="len">00000</xsl:variable>
+					<xsl:variable name="stat">
+						<xsl:choose>
+							<xsl:when test="substring(leader,6,1) = 'a'">p</xsl:when>
+							<xsl:otherwise><xsl:value-of select="substring(leader,6,1)" /></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="type">
+						<xsl:choose>
+							<xsl:when test="substring(leader,7,1) = 'o'">m</xsl:when>
+							<xsl:when test="substring(leader,7,1) = 'r'">n</xsl:when>
+							<xsl:otherwise><xsl:value-of select="substring(leader,7,1)" /></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="biblvl">
+						<xsl:choose>
+							<xsl:when test="substring(leader,8,1) = 'b'">m</xsl:when>
+							<xsl:when test="substring(leader,8,1) = 'd'">m</xsl:when>
+							<xsl:otherwise><xsl:value-of select="substring(leader,8,1)" /></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<!-- A calculer, mais comment ? -->
+					<xsl:variable name="baod">00000</xsl:variable>
+					<xsl:variable name="enclvl">
+						<xsl:choose>
+							<xsl:when test="substring(leader,18,1) = '8'">2</xsl:when>
+							<xsl:when test="substring(leader,17,1) = '5'">3</xsl:when>
+							<xsl:when test="substring(leader,18,1) = '7'">3</xsl:when>
+							<xsl:otherwise><xsl:value-of select="substring(leader,18,1)" /></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="dcf">
+						<xsl:choose>
+							<xsl:when test="substring(leader,19,1) = ' '">n</xsl:when>
+							<xsl:otherwise><xsl:value-of select="' '" /></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:value-of select="concat($len,$stat,$type,$biblvl,'  22',$baod,$enclvl,$dcf,' 45  ')" />
+				</leader>
+				<xsl:for-each select="marc:controlfield[@tag='001']">
+					<controlfield tag="001"><xsl:value-of select="text()" /></controlfield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:controlfield[@tag='005']">
+					<controlfield tag="005"><xsl:value-of select="text()" /></controlfield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:controlfield[@tag='008']">
+					<!-- FIXME: Dummy indicators -->
+					<datafield tag="100">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<subfield code="a">
+						<xsl:variable name="deof">
+							<xsl:choose>
+								<xsl:when test="substring(text(),1,2) &lt; 70">
+									<xsl:value-of select="concat('20',substring(text(),1,6))" />
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="concat('19',substring(text(),1,6))" />
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="topd" select="substring(text(),7,1)" />
+						<xsl:variable name="d1" select="substring(text(),8,4)" />
+						<xsl:variable name="d2" select="substring(text(),12,4)" />
+						<xsl:variable name="il">
+							<xsl:choose>
+								<xsl:when test="substring(text(),23,1) = 'a'">b||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'b'">c||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'j'">a||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'c'">d||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'd'">e||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'e'">k||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = 'g'">m||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = '|'">|||</xsl:when>
+								<xsl:when test="substring(text(),23,1) = ' '">u||</xsl:when>
+								<xsl:otherwise>u||</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="gpc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),29,1) = 'f'">a</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 's'">b</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'l'">d</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'c'">e</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'i'">f</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'z'">g</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'o'">h</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'u'">u</xsl:when>
+								<xsl:when test="substring(text(),29,1) = ' '">y</xsl:when>
+								<xsl:when test="substring(text(),29,1) = 'z'">z</xsl:when>
+								<xsl:when test="substring(text(),29,1) = '|'">|</xsl:when>
+								<xsl:otherwise>y</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="mrc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),39,1) = ' '">0</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="loc">
+							<xsl:choose>
+								<xsl:when test="datafield[@tag='040']/subfield[@code='b']"><xsl:value-of select="marc:datafield[@tag='040']/subfield[@code='b']" /></xsl:when>
+								<xsl:otherwise><xsl:value-of select="'   '" /></xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="tc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),39,1) = 'o'">b</xsl:when>
+								<xsl:otherwise>y</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<!-- Demander ? nicomo pour les 2 variables suivantes -->
+						<xsl:variable name="cs"><xsl:value-of select="'    '" /></xsl:variable>
+						<xsl:variable name="acs"><xsl:value-of select="'    '" /></xsl:variable>
+						<xsl:variable name="aot" select="substring(text(),34,1)" />
+						<xsl:value-of select="concat($deof,$topd,$d1,$d2,$il,$gpc,$mrc,$loc,$tc,$cs,$acs,$aot)" />
+						</subfield>
+					</datafield>
+					<datafield tag="105">
+						<!-- Difficile de faire un bel algo pour les deux variables suivantes -->
+						<subfield code="a">
+						<xsl:variable name="ic"><xsl:value-of select="'    '" /></xsl:variable>
+						<xsl:variable name="focc"><xsl:value-of select="'    '" /></xsl:variable>
+						<xsl:variable name="cc"><xsl:value-of select="substring(text(),30,1)" /></xsl:variable>
+						<xsl:variable name="fi"><xsl:value-of select="substring(text(),31,1)" /></xsl:variable>
+						<xsl:variable name="ii"><xsl:value-of select="substring(text(),32,1)" /></xsl:variable>
+						<xsl:variable name="lc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),34,1) = '1'">a</xsl:when>
+								<xsl:otherwise>|</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="bc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),35,1) = ' '">y</xsl:when>
+								<xsl:otherwise><xsl:value-of select="substring(text(),35,1)" /></xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:value-of select="concat($ic,$focc,$cc,$fi,$ii,$lc,$bc)" />
+						</subfield>
+					</datafield>
+					<datafield tag="106">
+					    <subfield code="a">
+						<xsl:choose>
+							<xsl:when test="substring(text(),24,1) = ' '">y</xsl:when>
+							<xsl:otherwise><xsl:value-of select="substring(text(),24,1)" /></xsl:otherwise>
+						</xsl:choose>
+					    </subfield>
+					</datafield>
+					<datafield tag="110">
+					    <subfield code="a">
+						<xsl:variable name="tos">
+							<xsl:choose>
+								<xsl:when test="substring(text(),22,1) = 'p'">a</xsl:when>
+								<xsl:when test="substring(text(),22,1) = 'm'">b</xsl:when>
+								<xsl:when test="substring(text(),22,1) = 'n'">c</xsl:when>
+								<xsl:when test="substring(text(),22,1) = ' '">z</xsl:when>
+								<xsl:when test="substring(text(),22,1) = '|'">|</xsl:when>
+								<xsl:otherwise>z</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="foi">
+							<xsl:choose>
+								<xsl:when test="substring(text(),19,1) = 'd'">a</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'c'">b</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'w'">c</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'e'">d</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 's'">e</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'm'">f</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'b'">g</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'q'">h</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 't'">i</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'f'">j</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'a'">k</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'g'">l</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'h'">m</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'i'">n</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'j'">o</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'u'">u</xsl:when>
+								<xsl:when test="substring(text(),19,1) = ' '">y</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'z'">z</xsl:when>
+								<xsl:when test="substring(text(),19,1) = '|'">|</xsl:when>
+								<xsl:when test="substring(text(),19,1) = 'n'">|</xsl:when>
+								<xsl:otherwise>y</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="r">
+							<xsl:choose>
+								<xsl:when test="substring(text(),20,1) = 'r'">a</xsl:when>
+								<xsl:when test="substring(text(),20,1) = 'n'">b</xsl:when>
+								<xsl:when test="substring(text(),20,1) = 'u'">u</xsl:when>
+								<xsl:when test="substring(text(),20,1) = 'x'">y</xsl:when>
+								<xsl:when test="substring(text(),20,1) = '|'">|</xsl:when>
+								<xsl:when test="substring(text(),20,1) = ' '">|</xsl:when>
+								<xsl:otherwise>u</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="tomc">
+							<xsl:choose>
+								<xsl:when test="substring(text(),25,1) = 'b'">a</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'c'">b</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'i'">c</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'a'">d</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'd'">e</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'e'">f</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'r'">g</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'y'">h</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 's'">i</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'p'">j</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'o'">k</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'l'">l</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'w'">m</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'g'">n</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'v'">o</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'h'">p</xsl:when>
+								<xsl:when test="substring(text(),25,1) = 'n'">r</xsl:when>
+								<xsl:when test="substring(text(),25,1) = ' '">z</xsl:when>
+								<xsl:when test="substring(text(),25,1) = '|'">|</xsl:when>
+								<xsl:otherwise>z</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:variable name="nocc"><xsl:value-of select="substring(text(),26,3)" /></xsl:variable>
+						<xsl:variable name="ci"><xsl:value-of select="substring(text(),30,1)" /></xsl:variable>
+						<xsl:variable name="tpa">|</xsl:variable>
+						<xsl:variable name="iac">|</xsl:variable>
+						<xsl:variable name="cia">|</xsl:variable>
+						<xsl:value-of select="concat($tos,$foi,$r,$tomc,$nocc,$ci,$tpa,$iac,$cia)" />
+					    </subfield>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='020']">
+					<datafield tag="010">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='022']">
+					<datafield tag="011">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='z']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					</datafield>
+				</xsl:for-each>
+			<!--<xsl:for-each select="marc:datafield[@tag='024']">
+					<datafield tag="012">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>-->
+				<xsl:for-each select="marc:datafield[@tag='015']">
+					<datafield tag="020">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="b"><xsl:value-of select="text()" /></subfield>
+							<subfield code="z"><xsl:value-of select="text()" /></subfield>
+						</xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='017']">
+					<datafield tag="021">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='086']">
+					<datafield tag="22">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='030']">
+					<datafield tag="040">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='028']">
+					<datafield tag="071">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2">
+							<xsl:choose>
+								<xsl:when test="@ind2 = 0">0</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='041']">
+					<datafield tag="101">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='h']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='044']">
+					<datafield tag="102">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='b']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='245']">
+					<datafield tag="200">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="text()" /></subfield>
+							<xsl:if test="contains(text(),' = ')">
+								<subfield code="d"><xsl:value-of select="concat('=',substring-after(text(),' =' ))" /></subfield>
+							</xsl:if>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']">
+							<xsl:choose>
+								<xsl:when test="contains(text(),' / ')">
+									<subfield code="f"><xsl:value-of select="substring-before(text(),' / ')" /></subfield>
+									<subfield code="g"><xsl:value-of select="substring-after(text(),' / ')" /></subfield>
+								</xsl:when>
+								<xsl:otherwise>
+									<subfield code="f"><xsl:value-of select="text()" /></subfield>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+					<!-- FIXME -->
+					<!--
+					<datafield tag="204">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='h']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+					-->
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='250']">
+					<datafield tag="205">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='254']">
+					<datafield tag="208">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='260']">
+					<datafield tag="210">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="g"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='263']">
+					<datafield tag="211">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='300']">
+					<datafield tag="215">
+						<xsl:choose>
+							<xsl:when test="@ind = 1"><xsl:attribute name="ind1">0</xsl:attribute></xsl:when>
+							<xsl:otherwise><xsl:attribute name="ind1">1</xsl:attribute></xsl:otherwise>
+						</xsl:choose>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='490']">
+					<datafield tag="225">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='v']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='256']">
+					<datafield tag="230">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='500']">
+					<datafield tag="300">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='525']">
+					<datafield tag="300">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='555']">
+					<datafield tag="300">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='504']">
+					<datafield tag="320">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='505']">
+					<datafield tag="327">
+					    <!-- FIXME: Dummy indicators -->
+						<!--<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>-->
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<!--<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>-->
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<subfield code="a">bla</subfield>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='502']">
+					<datafield tag="328">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='520']">
+					<datafield tag="330">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='524']">
+					<datafield tag="332">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='521']">
+					<datafield tag="333">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='500']">
+					<datafield tag="336">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='538']">
+					<datafield tag="337">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='037']">
+					<datafield tag="345">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='760']">
+					<datafield tag="410">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='762']">
+					<datafield tag="411">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='770']">
+					<datafield tag="421">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='772']">
+					<datafield tag="422">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='777']">
+					<datafield tag="423">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='780']">
+					<datafield tag="430">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='785']">
+					<datafield tag="440">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='775']">
+					<datafield tag="451">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='776']">
+					<datafield tag="452">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='767']">
+					<datafield tag="453">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='765']">
+					<datafield tag="454">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='787']">
+					<datafield>
+						<xsl:choose>
+							<xsl:when test="contains(subfield[@code='i'],'Reproduction of:')"><xsl:attribute name="tag" select="455" /></xsl:when>
+							<xsl:when test="contains(subfield[@code='i'],'Reproduced as:')"><xsl:attribute name="tag" select="456" /></xsl:when>
+							<xsl:when test="contains(subfield[@code='i'],'Item reviewed:')"><xsl:attribute name="tag" select="470" /></xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="tag" select="488" />
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='774']">
+					<datafield>
+						<xsl:choose>
+							<xsl:when test="subfield[@code='i']">
+								<xsl:attribute name="tag" select="462" />
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="tag" select="461" />
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='773']">
+					<datafield tag="463">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='774']">
+					<datafield tag="464">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='w']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='730']">
+					<datafield tag="500">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="n"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="k"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="n"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="j"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='l']"><subfield code="m"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='m']"><subfield code="r"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='o']"><subfield code="w"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='r']"><subfield code="u"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='s']"><subfield code="q"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='243']">
+					<datafield tag="501">
+						<xsl:attribute name="ind1">1</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="k"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='l']"><subfield code="m"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='247']">
+					<datafield tag="520">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="n"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="j"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='222']">
+					<datafield tag="530">
+						<xsl:attribute name="ind1">0</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='210']">
+					<datafield tag="531">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='246']">
+					<datafield tag="532">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2">0</xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='242']">
+					<datafield tag="541">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='773']">
+					<datafield tag="545">
+						<xsl:attribute name="ind1">
+							<xsl:choose>
+								<xsl:when test="@ind1 = 0">1</xsl:when>
+								<xsl:otherwise>0</xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='610']">
+					<datafield tag="601">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="text()" /></subfield>
+							<subfield code="c"><xsl:value-of select="substring-before(substring-after(text(),'('),')')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='f']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='g']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="j"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='l']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='m']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='o']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='p']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='r']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='s']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='t']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='u']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='611']">
+					<datafield tag="601">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="text()" /></subfield>
+							<subfield code="c"><xsl:value-of select="substring-before(substring-after(text(),'('),')')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='f']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='g']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="j"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='l']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='p']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					<!--<xsl:for-each select="marc:subfield[@code='s']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='u']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='630']">
+					<datafield tag="605">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='d']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="k"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="n"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="j"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='l']"><subfield code="m"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='m']"><subfield code="r"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='o']"><subfield code="w"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='r']"><subfield code="u"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='s']"><subfield code="q"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='t']"><subfield code="?"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='600']">
+					<datafield tag="600">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2">
+							<xsl:choose>
+								<xsl:when test="@ind1 = 0">0</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="substring-before(text(),', ')" /></subfield>
+							<subfield code="b"><xsl:value-of select="substring-after(text(),', ')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+					<datafield tag="602">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='t']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='630']">
+					<datafield tag="605">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="h"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='p']"><subfield code="i"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='f']"><subfield code="k"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='k']"><subfield code="l"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='l']"><subfield code="m"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='g']"><subfield code="n"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='s']"><subfield code="q"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='r']"><subfield code="r"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="s"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='o']"><subfield code="t"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='r']"><subfield code="u"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='650']">
+					<datafield tag="606">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='651']">
+					<datafield tag="607">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="substring-before(text(),', ')" /></subfield>
+							<subfield code="b"><xsl:value-of select="substring-after(text(),', ')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='x']"><subfield code="x"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='z']"><subfield code="y"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='y']"><subfield code="z"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='653']">
+					<datafield tag="610">
+						<xsl:attribute name="ind1">
+							<xsl:choose>
+								<xsl:when test="@ind1 = ' '">0</xsl:when>
+								<xsl:otherwise><xsl:value-of select="@ind1" /></xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='752']">
+					<datafield tag="620">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield"><subfield code="@code"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='753']">
+					<datafield tag="626">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield"><subfield code="@code"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='043']">
+					<datafield tag="660">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield"><subfield code="@code"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='045']">
+					<datafield tag="661">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='886']">
+					<datafield tag="670">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='080']">
+					<datafield tag="675">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='082']">
+					<datafield tag="676">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="v"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='050']">
+					<datafield tag="680">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='084']">
+					<datafield tag="686">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='2']"><subfield code="2"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='100']">
+					<datafield tag="700">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="substring-before(text(),', ')" /></subfield>
+							<subfield code="b"><xsl:value-of select="substring-after(text(),', ')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='q']"><subfield code="g"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='700']">
+					<datafield tag="701">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']">
+							<subfield code="a"><xsl:value-of select="substring-before(text(),', ')" /></subfield>
+							<subfield code="b"><xsl:value-of select="substring-after(text(),', ')" /></subfield>
+						</xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="c"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='q']"><subfield code="g"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					<!--<xsl:for-each select="marc:subfield[@code='?']"><subfield code="3"><xsl:value-of select="text()" /></subfield></xsl:for-each>-->
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='110']">
+					<datafield tag="710">
+						<xsl:attribute name="ind1">0</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='111']">
+					<datafield tag="710">
+						<xsl:attribute name="ind1">1</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='710']">
+					<datafield tag="711">
+						<xsl:attribute name="ind1">0</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='b']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='711']">
+					<datafield tag="711">
+						<xsl:attribute name="ind1">1</xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='e']"><subfield code="b"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='n']"><subfield code="d"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='c']"><subfield code="e"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='u']"><subfield code="p"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='100']">
+					<datafield tag="720">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='700']">
+					<datafield tag="721">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='d']"><subfield code="f"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+						<xsl:for-each select="marc:subfield[@code='4']"><subfield code="4"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:controlfield[@tag='008']">
+					<datafield tag="802">
+						<xsl:attribute name="ind1"><xsl:value-of select="' '" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="' '" /></xsl:attribute>
+						<subfield code="a">
+							<xsl:choose>
+								<xsl:when test="substring(text(),21,1) = '0'">00</xsl:when>
+								<xsl:when test="substring(text(),21,1) = '1'">01</xsl:when>
+								<xsl:when test="substring(text(),21,1) = '4'">04</xsl:when>
+								<xsl:when test="substring(text(),21,1) = '#'">uu</xsl:when>
+								<xsl:when test="substring(text(),21,1) = 'z'">zz</xsl:when>
+								<xsl:otherwise>zz</xsl:otherwise>
+							</xsl:choose>
+						</subfield>
+					</datafield>
+				</xsl:for-each>
+				<xsl:for-each select="marc:datafield[@tag='590']">
+					<datafield tag="900">
+						<xsl:attribute name="ind1"><xsl:value-of select="@ind1" /></xsl:attribute>
+						<xsl:attribute name="ind2"><xsl:value-of select="@ind2" /></xsl:attribute>
+						<xsl:for-each select="marc:subfield[@code='a']"><subfield code="a"><xsl:value-of select="text()" /></subfield></xsl:for-each>
+					</datafield>
+				</xsl:for-each>
+			</record>
+		</xsl:for-each>
+		</collection>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCtoMARC21.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCtoMARC21.xsl
new file mode 100644
index 0000000..8fcd420
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCtoMARC21.xsl
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2011 Rijksmuseum.
+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.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
+<!--
+NOTE: This stylesheet converts UNIMARC to MARC21.
+IMPORTANT: Please note that MARC21 and UNIMARC are different in restrictions
+for tags and subfields to be repeatable. In this stylesheet this difference
+implies the careful use of if and value-of on one side and for-each and copy-of
+on the other side!!
+FIXME: Currently, it only converts the most important MARC fields. Add more!
+-->
+<xsl:stylesheet xmlns:marc="http://www.loc.gov/MARC21/slim" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+  <xsl:template match="/">
+    <collection>
+    <xsl:apply-templates/>
+    </collection>
+  </xsl:template>
+
+  <xsl:template match="marc:record">
+   <record>
+    <xsl:call-template name="leader"/>
+    <xsl:call-template name="copy_control">
+      <xsl:with-param name="tagno">001</xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="control005"/>
+    <xsl:call-template name="control008"/>
+
+    <xsl:call-template name="isbn_issn"/>
+    <xsl:call-template name="author"/>
+    <xsl:call-template name="author_corp"/>
+    <xsl:call-template name="title"/>
+    <xsl:call-template name="edition"/>
+    <xsl:call-template name="publication"/>
+    <xsl:call-template name="physicaldesc"/>
+    <xsl:call-template name="note_general"/>
+    <xsl:call-template name="subject_person"/>
+    <xsl:call-template name="subject_topic"/>
+    <xsl:call-template name="subject_geo"/>
+    <xsl:call-template name="subject_uncontrolled"/>
+    <xsl:call-template name="pers_name"/>
+    <xsl:call-template name="corp_name"/>
+   </record>
+  </xsl:template>
+
+  <!-- Named templates -->
+
+  <xsl:template name="leader">
+    <xsl:variable name="leader" select="marc:leader"/>
+    <leader>
+    <xsl:text>00000na</xsl:text>
+    <xsl:choose>
+      <xsl:when test="contains('cms',substring($leader,8,1))">
+        <xsl:value-of select="substring($leader,8,1)"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:text>m</xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> a2200000u</xsl:text>
+    <xsl:choose>
+      <xsl:when test="contains('i ',substring($leader,19,1))">
+        <xsl:text>i</xsl:text>
+      </xsl:when>
+      <xsl:when test="substring($leader,19,1)='n'">
+        <xsl:text> </xsl:text>
+      </xsl:when>
+      <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> 4500</xsl:text>
+    </leader>
+  </xsl:template>
+
+  <xsl:template name="control005">
+    <xsl:choose>
+      <xsl:when test="marc:controlfield[@tag='005']">
+        <xsl:copy-of select="marc:controlfield[@tag='005']"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:if test="marc:datafield[@tag='801']/marc:subfield[@code='c']">
+        <controlfield tag="005">
+          <xsl:value-of select="marc:datafield[@tag='801']/marc:subfield[@code='c']"/>
+        </controlfield>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="control008">
+    <!-- FIXME:  Some conversions here are simplified:
+	Processing of pubdate type
+	Material dependent pos 18-34
+    -->
+    <controlfield tag="008">
+      <xsl:value-of select="substring(marc:datafield[@tag='100']/marc:subfield[@code='a'],3,6)"/>
+      <xsl:choose>
+        <xsl:when test="substring(marc:leader,8,1)='s'">
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>s</xsl:text>
+          <xsl:value-of select="substring(marc:datafield[@tag='100']/marc:subfield[@code='a'],10,4)"/>
+          <xsl:text>    </xsl:text>
+        </xsl:otherwise>
+	  <xsl:value-of select="translate(substring(marc:datafield[@tag='100']/marc:subfield[@code='a'],9,1),'abc','cdu')"/>
+          <xsl:value-of select="substring(marc:datafield[@tag='100']/marc:subfield[@code='a'],10,8)"/>
+      </xsl:choose>
+      <!-- pos 15-17 place publication; 102a is two char code -->
+      <xsl:choose>
+      <xsl:when test="marc:datafield[@tag='102']/marc:subfield[@code='a']">
+        <xsl:value-of select="substring(concat(marc:datafield[@tag='102']/marc:subfield[@code='a'],'   '),1,3)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>xx </xsl:text>
+      </xsl:otherwise>
+      </xsl:choose>
+      <!-- FIXME: pos 18-34 depending on material type -->
+      <xsl:text>|||||||||||||||||</xsl:text>
+      <!-- pos 35-37 language -->
+      <xsl:value-of select="substring(concat(marc:datafield[@tag='101']/marc:subfield[@code='a'],'   '),1,3)"/>
+      <!-- pos 38,39 modified, cataloging source -->
+      <xsl:text> d</xsl:text>
+    </controlfield>
+  </xsl:template>
+
+  <xsl:template name="isbn_issn">
+    <xsl:if test="marc:datafield[@tag='010']">
+      <datafield tag="020" ind1=" " ind2=" ">
+        <subfield code="a">
+	  <xsl:value-of select="marc:datafield[@tag='010']/marc:subfield[@code='a']"/>
+	</subfield>
+        <xsl:if test="marc:datafield[@tag='010']/marc:subfield[@code='b']">
+          <subfield code="b">
+	  <xsl:value-of select="marc:datafield[@tag='010']/marc:subfield[@code='b']"/>
+	  </subfield>
+	</xsl:if>
+        <xsl:if test="marc:datafield[@tag='010']/marc:subfield[@code='d']">
+          <subfield code="c">
+	  <xsl:value-of select="marc:datafield[@tag='010']/marc:subfield[@code='d']"/>
+	  </subfield>
+	</xsl:if>
+        <xsl:copy-of select="marc:datafield[@tag='010']/marc:subfield[@code='z']"/>
+      </datafield>
+    </xsl:if>
+    <xsl:if test="marc:datafield[@tag='011']">
+      <datafield tag="022" ind1=" " ind2=" ">
+        <subfield code="a">
+	  <xsl:value-of select="marc:datafield[@tag='011']/marc:subfield[@code='a']"/>
+	</subfield>
+        <xsl:copy-of select="marc:datafield[@tag='011']/marc:subfield[@code='z']"/>
+      </datafield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="author">
+    <xsl:if test="marc:datafield[@tag='700']">
+    <datafield tag="100">
+      <!-- 100c only is R -->
+      <xsl:call-template name="copy_indicators"><xsl:with-param name="tagno">700</xsl:with-param></xsl:call-template>
+      <subfield code="a">
+	<xsl:value-of select="marc:datafield[@tag='700']/marc:subfield[@code='a']"/>
+	<xsl:if test="marc:datafield[@tag='700']/marc:subfield[@code='b']">
+	  <xsl:text>, </xsl:text>
+	  <xsl:value-of select="marc:datafield[@tag='700']/marc:subfield[@code='b']"/>
+	</xsl:if>
+      </subfield>
+      <xsl:if test="marc:datafield[@tag='700']/marc:subfield[@code='d']">
+          <subfield code='b'>
+          <xsl:value-of select="marc:datafield[@tag='700']/marc:subfield[@code='d']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:copy-of select="marc:datafield[@tag='700']/marc:subfield[@code='c']"/>
+      <xsl:if test="marc:datafield[@tag='700']/marc:subfield[@code='f']">
+          <subfield code='d'>
+          <xsl:value-of select="marc:datafield[@tag='700']/marc:subfield[@code='f']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:datafield[@tag='700']/marc:subfield[@code='g']">
+          <subfield code='q'>
+          <xsl:value-of select="marc:datafield[@tag='700']/marc:subfield[@code='g']"/>
+          </subfield>
+      </xsl:if>
+    </datafield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="author_corp">
+    <xsl:if test="marc:datafield[@tag='710']">
+      <datafield>
+      <xsl:variable name="type" select="marc:datafield[@tag='710']/@ind1"/>
+      <xsl:choose>
+	<xsl:when test="$type=1">
+	  <xsl:attribute name="tag">111</xsl:attribute>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:attribute name="tag">110</xsl:attribute>
+	</xsl:otherwise>
+      </xsl:choose>
+      <xsl:attribute name="ind1">
+        <xsl:value-of select="marc:datafield[@tag='710']/@ind2"/>
+      </xsl:attribute>
+      <xsl:attribute name="ind2"><xsl:text> </xsl:text></xsl:attribute>
+
+      <subfield code="a">
+	<xsl:value-of select="marc:datafield[@tag='710']/marc:subfield[@code='a']"/>
+	<xsl:for-each select="marc:datafield[@tag='710']/marc:subfield[@code='c']">
+	  <xsl:text>, </xsl:text>
+	  <xsl:value-of select="."/>
+	</xsl:for-each>
+      </subfield>
+      <xsl:copy-of select="marc:datafield[@tag='710']/marc:subfield[@code='b']"/>
+      <xsl:if test="marc:datafield[@tag='710']/marc:subfield[@code='e']">
+          <subfield code='c'>
+          <xsl:value-of select="marc:datafield[@tag='710']/marc:subfield[@code='e']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:datafield[@tag='710']/marc:subfield[@code='f']">
+          <subfield code='d'>
+          <xsl:value-of select="marc:datafield[@tag='710']/marc:subfield[@code='f']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:datafield[@tag='710']/marc:subfield[@code='d']">
+          <subfield code='n'>
+          <xsl:value-of select="marc:datafield[@tag='710']/marc:subfield[@code='d']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:datafield[@tag='710']/marc:subfield[@code='p']">
+          <subfield code='u'>
+          <xsl:value-of select="marc:datafield[@tag='710']/marc:subfield[@code='p']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:copy-of select="marc:datafield[@tag='710']/marc:subfield[@code='4']"/>
+      </datafield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="title">
+    <datafield tag="245">
+      <!-- 245abc are NR, 245np are R -->
+      <xsl:call-template name="copy_indicators"><xsl:with-param name="tagno">200</xsl:with-param></xsl:call-template>
+      <subfield code="a">
+	<xsl:value-of select="marc:datafield[@tag='200']/marc:subfield[@code='a']"/>
+      </subfield>
+
+      <xsl:variable name="tagd" select="marc:datafield[@tag='200']/marc:subfield[@code='d']"/>
+      <xsl:variable name="tage" select="marc:datafield[@tag='200']/marc:subfield[@code='e']"/>
+      <xsl:if test="$tagd!='' or $tage!=''">
+        <subfield code="b">
+	<xsl:value-of select="$tagd"/>
+	<xsl:for-each select="marc:datafield[@tag='200']/marc:subfield[@code='e']">
+	  <xsl:text> : </xsl:text>
+	  <xsl:value-of select="."/>
+	</xsl:for-each>
+        </subfield>
+      </xsl:if>
+
+      <xsl:variable name="tagf" select="marc:datafield[@tag='200']/marc:subfield[@code='f']"/>
+      <xsl:variable name="tagg" select="marc:datafield[@tag='200']/marc:subfield[@code='g']"/>
+      <xsl:if test="$tagf!='' or $tagg!=''">
+        <subfield code="c">
+	<xsl:value-of select="$tagf"/>
+	<xsl:for-each select="marc:datafield[@tag='200']/marc:subfield[@code='g']">
+	  <xsl:text> ; </xsl:text>
+	  <xsl:value-of select="."/>
+	</xsl:for-each>
+        </subfield>
+      </xsl:if>
+
+      <xsl:for-each select="marc:datafield[@tag='200']/marc:subfield[@code='h']">
+        <subfield code="n"><xsl:value-of select="."/></subfield>
+      </xsl:for-each>
+      <xsl:for-each select="marc:datafield[@tag='200']/marc:subfield[@code='i']">
+        <subfield code="p"><xsl:value-of select="."/></subfield>
+      </xsl:for-each>
+    </datafield>
+  </xsl:template>
+
+  <xsl:template name="edition">
+    <xsl:if test="marc:datafield[@tag='205']">
+      <datafield tag="250" ind1=" " ind2=" ">
+        <!-- 250 a is NR -->
+        <xsl:copy-of select="marc:datafield[@tag='205'][1]/marc:subfield[@code='a'][1]"/>
+        <xsl:if test="marc:datafield[@tag='205']/marc:subfield[@code='f']">
+          <subfield code='b'>
+          <xsl:value-of select="marc:datafield[@tag='205']/marc:subfield[@code='f']"/>
+          </subfield>
+        </xsl:if>
+      </datafield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="publication">
+    <xsl:if test="marc:datafield[@tag='210']">
+      <datafield tag="260" ind1=" " ind2=" ">
+	<!-- 260 abc are repeatable: use for loops -->
+        <xsl:copy-of select="marc:datafield[@tag='210']/marc:subfield[@code='a']"/>
+        <xsl:for-each select="marc:datafield[@tag='210']/marc:subfield[@code='c']">
+          <subfield code='b'>
+          <xsl:value-of select="."/>
+          </subfield>
+        </xsl:for-each>
+        <xsl:for-each select="marc:datafield[@tag='210']/marc:subfield[@code='d']">
+          <subfield code='c'>
+          <xsl:value-of select="."/>
+          </subfield>
+        </xsl:for-each>
+
+        <!-- 260 efg are not-repeatable: take the first element only -->
+        <xsl:copy-of select="marc:datafield[@tag='210']/marc:subfield[@code='e'][1]"/>
+        <xsl:if test="marc:datafield[@tag='210']/marc:subfield[@code='g']">
+          <subfield code='f'>
+          <xsl:value-of select="marc:datafield[@tag='210']/marc:subfield[@code='g']"/>
+          </subfield>
+        </xsl:if>
+        <xsl:if test="marc:datafield[@tag='210']/marc:subfield[@code='h']">
+          <subfield code='g'>
+          <xsl:value-of select="marc:datafield[@tag='210']/marc:subfield[@code='h']"/>
+          </subfield>
+        </xsl:if>
+      </datafield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="physicaldesc">
+    <xsl:for-each select="marc:datafield[@tag='215']">
+      <!-- 300ac are R, 300be are NR -->
+      <datafield tag="300" ind1=" " ind2=" ">
+        <xsl:copy-of select="marc:subfield[@code='a']"/>
+        <xsl:if test="marc:subfield[@code='c']">
+          <subfield code='b'>
+          <xsl:value-of select="marc:subfield[@code='c']"/>
+          </subfield>
+        </xsl:if>
+        <xsl:for-each select="marc:subfield[@code='d']">
+          <subfield code='c'>
+          <xsl:value-of select="."/>
+          </subfield>
+        </xsl:for-each>
+        <xsl:copy-of select="marc:subfield[@code='e'][1]"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="note_general">
+    <xsl:for-each select="marc:datafield[@tag='300']">
+      <!-- 500a is R -->
+      <datafield tag="500" ind1=" " ind2=" ">
+        <xsl:copy-of select="marc:subfield[@code='a']"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="subject_person">
+    <xsl:for-each select="marc:datafield[@tag='600']">
+      <!-- only MARC21 600c is R -->
+      <datafield tag="600">
+      <xsl:attribute name="ind1"><xsl:value-of select="@ind1"/></xsl:attribute>
+      <xsl:attribute name="ind2"><xsl:value-of select="@ind2"/></xsl:attribute>
+        <xsl:copy-of select="marc:subfield[@code='a'][1]"/>
+        <xsl:if test="marc:subfield[@code='d']">
+          <subfield code='b'>
+          <xsl:value-of select="marc:subfield[@code='d']"/>
+          </subfield>
+        </xsl:if>
+        <xsl:copy-of select="marc:subfield[@code='c']"/>
+        <xsl:if test="marc:subfield[@code='f']">
+          <subfield code='d'>
+          <xsl:value-of select="marc:subfield[@code='f']"/>
+          </subfield>
+        </xsl:if>
+        <xsl:if test="marc:subfield[@code='b']">
+          <subfield code='q'>
+          <xsl:value-of select="marc:subfield[@code='b']"/>
+          </subfield>
+        </xsl:if>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="subject_topic">
+    <xsl:for-each select="marc:datafield[@tag='606']">
+      <!-- 650a is NR -->
+      <datafield tag="650" ind1=" " ind2="4">
+        <xsl:copy-of select="marc:subfield[@code='a'][1]"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="subject_geo">
+    <xsl:for-each select="marc:datafield[@tag='607']">
+      <!-- 651a is NR -->
+      <datafield tag="651" ind1=" " ind2="4">
+        <xsl:copy-of select="marc:subfield[@code='a'][1]"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="subject_uncontrolled">
+    <xsl:for-each select="marc:datafield[@tag='610']">
+      <!-- 653a is R -->
+      <datafield tag="653">
+        <xsl:attribute name="ind1"><xsl:value-of select="@ind1"/></xsl:attribute>
+        <xsl:attribute name="ind2"><xsl:value-of select="@ind2"/></xsl:attribute>
+        <xsl:copy-of select="marc:subfield[@code='a']"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="pers_name">
+    <xsl:for-each select="marc:datafield[@tag='701' or @tag='702']">
+    <datafield tag="700">
+      <!-- 700c only is R -->
+        <xsl:attribute name="ind1"><xsl:value-of select="@ind1"/></xsl:attribute>
+        <xsl:attribute name="ind2"><xsl:value-of select="@ind2"/></xsl:attribute>
+      <subfield code="a">
+	<xsl:value-of select="marc:subfield[@code='a']"/>
+	<xsl:if test="marc:subfield[@code='b']">
+	  <xsl:text>, </xsl:text>
+	  <xsl:value-of select="marc:subfield[@code='b']"/>
+	</xsl:if>
+      </subfield>
+      <xsl:if test="marc:subfield[@code='d']">
+          <subfield code='b'>
+          <xsl:value-of select="marc:subfield[@code='d']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:copy-of select="marc:subfield[@code='c']"/>
+      <xsl:if test="marc:subfield[@code='f']">
+          <subfield code='d'>
+          <xsl:value-of select="marc:subfield[@code='f']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='g']">
+          <subfield code='q'>
+          <xsl:value-of select="marc:subfield[@code='g']"/>
+          </subfield>
+      </xsl:if>
+    </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="corp_name">
+    <xsl:for-each select="marc:datafield[@tag='711' or @tag='712']">
+      <datafield>
+      <xsl:variable name="type" select="@ind1"/>
+      <xsl:choose>
+	<xsl:when test="$type=1">
+	  <xsl:attribute name="tag">711</xsl:attribute>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:attribute name="tag">710</xsl:attribute>
+	</xsl:otherwise>
+      </xsl:choose>
+      <xsl:attribute name="ind1">
+        <xsl:value-of select="@ind2"/>
+      </xsl:attribute>
+      <xsl:attribute name="ind2"><xsl:text> </xsl:text></xsl:attribute>
+
+      <subfield code="a">
+	<xsl:value-of select="marc:subfield[@code='a']"/>
+	<xsl:for-each select="marc:subfield[@code='c']">
+	  <xsl:text>, </xsl:text>
+	  <xsl:value-of select="."/>
+	</xsl:for-each>
+      </subfield>
+      <xsl:copy-of select="marc:subfield[@code='b']"/>
+      <xsl:if test="marc:subfield[@code='e']">
+          <subfield code='c'>
+          <xsl:value-of select="marc:subfield[@code='e']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='f']">
+          <subfield code='d'>
+          <xsl:value-of select="marc:subfield[@code='f']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='d']">
+          <subfield code='n'>
+          <xsl:value-of select="marc:subfield[@code='d']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='p']">
+          <subfield code='u'>
+          <xsl:value-of select="marc:subfield[@code='p']"/>
+          </subfield>
+      </xsl:if>
+      <xsl:copy-of select="marc:subfield[@code='4']"/>
+      </datafield>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- And some utility functions -->
+
+  <xsl:template name="copy_control">
+    <xsl:param name="tagno"/>
+    <xsl:if test="marc:controlfield[@tag=$tagno]">
+      <controlfield>
+       <xsl:attribute name="tag"><xsl:value-of select="$tagno"/></xsl:attribute>
+       <xsl:value-of select="marc:controlfield[@tag=$tagno]" />
+      </controlfield>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="copy_indicators">
+    <xsl:param name="tagno"/>
+        <xsl:attribute name="ind1">
+          <xsl:value-of select="marc:datafield[@tag=$tagno]/@ind1"/>
+        </xsl:attribute>
+        <xsl:attribute name="ind2">
+          <xsl:value-of select="marc:datafield[@tag=$tagno]/@ind2"/>
+        </xsl:attribute>
+  </xsl:template>
+
+</xsl:stylesheet>
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Jun 30 15:01:12 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 30 Jun 2011 13:01:12 +0000
Subject: [Koha-patches] [PATCH] 6536: Z3950 Enhancements (DB Revision)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA312E9C3C@S-MAIL-1B.rijksmuseum.intra>

This patch contains db revision for Z3950 enhancements: SRU search targets, MARC conversion and additional XSLT processing.
It also contains a few additional lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
---
 installer/data/mysql/kohastructure.sql |   10 ++++++----
 installer/data/mysql/updatedatabase.pl |   20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index e3c6f42..1b0be0e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1985,21 +1985,23 @@ CREATE TABLE `virtualshelfcontents` (
 
 DROP TABLE IF EXISTS `z3950servers`;
 CREATE TABLE `z3950servers` (
-  `host` varchar(255) default NULL,
+  `host` varchar(255) NOT NULL,
   `port` int(11) default NULL,
   `db` varchar(255) default NULL,
   `userid` varchar(255) default NULL,
   `password` varchar(255) default NULL,
-  `name` mediumtext,
+  `name` mediumtext NOT NULL,
   `id` int(11) NOT NULL auto_increment,
   `checked` smallint(6) default NULL,
   `rank` int(11) default NULL,
-  `syntax` varchar(80) default NULL,
+  `syntax` varchar(80) NOT NULL,
   `icon` text,
   `position` enum('primary','secondary','') NOT NULL default 'primary',
   `type` enum('zed','opensearch') NOT NULL default 'zed',
-  `encoding` text default NULL,
+  `encoding` text NOT NULL,
   `description` text NOT NULL,
+  `srufields` text,
+  `add_xslt` varchar(255),
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3c7d043..bbd8140 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4354,6 +4354,18 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") lt TransformToNum($DBversion)) {
+  $dbh->do("ALTER TABLE z3950servers MODIFY COLUMN `host` varchar(255) NOT NULL;");
+  $dbh->do("ALTER TABLE z3950servers MODIFY COLUMN `name` mediumtext NOT NULL;");
+  $dbh->do("ALTER TABLE z3950servers MODIFY COLUMN `syntax` varchar(80) NOT NULL;");
+  $dbh->do("ALTER TABLE z3950servers MODIFY COLUMN `encoding` text NOT NULL;");
+  $dbh->do("ALTER TABLE z3950servers ADD COLUMN `srufields` text;");
+  $dbh->do("ALTER TABLE z3950servers ADD COLUMN `add_xslt` varchar(255);");
+  print "Upgrade to $DBversion done (Bug 6536: Z3950 enhancements)\n";
+  SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
@@ -4396,6 +4408,10 @@ sub TransformToNum {
     my $version = shift;
     # remove the 3 last . to have a Perl number
     $version =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
+    # three X's at the end indicate that you are testing patch with dbrev
+    # change it into 999
+    # prevents error on a < comparison between strings (should be: lt)
+    $version =~ s/XXX$/999/;
     return $version;
 }
 
@@ -4406,7 +4422,9 @@ set the DBversion in the systempreferences
 =cut
 
 sub SetVersion {
-    my $kohaversion = TransformToNum(shift);
+    return if $_[0]=~ /XXX$/;
+      #you are testing a patch with a db revision; do not change version
+    my $kohaversion = TransformToNum($_[0]);
     if (C4::Context->preference('Version')) {
       my $finish=$dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='Version'");
       $finish->execute($kohaversion);
-- 
1.6.0.6


From peter at oslo.ie  Thu Jun 30 16:38:47 2011
From: peter at oslo.ie (Peter Lorimer)
Date: Thu, 30 Jun 2011 15:38:47 +0100
Subject: [Koha-patches] [PATCH] When searching the catalogue,
 if I get no results then hit the Z39.50 search the title field in
 the pop up window is populated with what I searched for.
In-Reply-To: <1309365861-25399-1-git-send-email-peter@oslo.ie>
References: <1309365861-25399-1-git-send-email-peter@oslo.ie>
Message-ID: <BANLkTi=ONgb+R=db8SGF8r+xZnB0fjHDHw@mail.gmail.com>

Bug # 6539

On Wed, Jun 29, 2011 at 5:44 PM, Peter Lorimer <peter at oslo.ie> wrote:

> If I search for a valid ISBN number and hit the Z39.50 search, the title
> field
> is populated with the ISBN number I searched for. This number should
> populate
> the ISBN field and not the title field.
> ---
>  C4/Search.pm |   34 +++++++++++++++++++++++++++++-----
>  1 files changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/C4/Search.pm b/C4/Search.pm
> index c3cff65..5648faa 100644
> --- a/C4/Search.pm
> +++ b/C4/Search.pm
> @@ -33,6 +33,7 @@ use C4::Debug;
>  use C4::Items;
>  use YAML;
>  use URI::Escape;
> +use Business::ISBN;
>
>  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
>
> @@ -1423,7 +1424,15 @@ sub searchResults {
>     #find branchname
>     #get branch information.....
>     my %branches;
> -    my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches");
> # FIXME : use C4::Branch::GetBranches
> +    my $bsth;
> +              if ( C4::Context->preference("searchMyLibraryOnly")  )
> +           {
> +            $bsth =$dbh->prepare("SELECT branchcode,branchname FROM
> branches WHERE branchcode = '". C4::Branch::mybranch() ."' "); # FIXME : use
> C4::Branch::GetBranches
> +            }
> +            else
> +            {
> +             $bsth =$dbh->prepare("SELECT branchcode,branchname FROM
> branches ");
> +            }
>     $bsth->execute();
>     while ( my $bdata = $bsth->fetchrow_hashref ) {
>         $branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
> @@ -1671,7 +1680,7 @@ sub searchResults {
>                    ($reservestatus, $reserveitem) =
> C4::Reserves::CheckReserves($item->{itemnumber});
>                 }
>
> -                # item is withdrawn, lost, damaged, not for loan, reserved
> or in transit
> +                # item is withdrawn, lost or damaged
>                 if (   $item->{wthdrawn}
>                     || $item->{itemlost}
>                     || $item->{damaged}
> @@ -1686,8 +1695,8 @@ sub searchResults {
>                     $item_in_transit_count++ if $transfertwhen ne '';
>                    $item_onhold_count++     if $reservestatus eq 'Waiting';
>                     $item->{status} = $item->{wthdrawn} . "-" .
> $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
> -
> -                    # can place hold on item ?
> +
> + # can place hold on item ?
>                     if ((!$item->{damaged} ||
> C4::Context->preference('AllowHoldsOnDamagedItems'))
>                       && !$item->{itemlost}
>                       && !$item->{withdrawn}
> @@ -1695,6 +1704,7 @@ sub searchResults {
>                         $can_place_holds = 1;
>                     }
>
> +
>                     $other_count++;
>
>                     my $key = $prefix . $item->{status};
> @@ -2599,9 +2609,20 @@ $template->param ( MYLOOP =>
> C4::Search::z3950_search_args($searchscalar) )
>
>  =cut
>
> +
> +
> +
>  sub z3950_search_args {
>     my $bibrec = shift;
> -    $bibrec = { title => $bibrec } if !ref $bibrec;
> +    my $isbn = Business::ISBN->new($bibrec);
> +
> +    if (defined $isbn && $isbn->is_valid)
> +    {
> +    $bibrec = { isbn => $bibrec } if !ref $bibrec;
> +}
> +else {
> +     $bibrec = { title => $bibrec } if !ref $bibrec;
> +}
>     my $array = [];
>     for my $field (qw/ lccn isbn issn title author dewey subject /)
>     {
> @@ -2641,6 +2662,9 @@ OR adds a new authority record
>  =cut
>
>
> +
> +
> +
>  sub BiblioAddAuthorities{
>   my ( $record, $frameworkcode ) = @_;
>   my $dbh=C4::Context->dbh;
> --
> 1.7.4.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110630/fec98edf/attachment.htm>

From gmcharlt at gmail.com  Thu Jun 30 21:05:57 2011
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 30 Jun 2011 15:05:57 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6450 - No check in/check
	out messages in message_queue
Message-ID: <1309460757-16776-1-git-send-email-gmcharlt@gmail.com>

From: Magnus Enger <magnus at enger.priv.no>

Huge thanks to Katrin Fischer for spotting what was the trouble here!

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
---
 C4/Circulation.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 5efd090..179fe70 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2614,8 +2614,8 @@ sub SendCirculationAlert {
     my ($type, $item, $borrower, $branch) =
         ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch});
     my %message_name = (
-        CHECKIN  => 'Item Check-in',
-        CHECKOUT => 'Item Checkout',
+        CHECKIN  => 'Item_Check_in',
+        CHECKOUT => 'Item_Checkout',
     );
     my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
         borrowernumber => $borrower->{borrowernumber},
-- 
1.7.2.3


From tdavis at uttyler.edu  Thu Jun 30 23:46:10 2011
From: tdavis at uttyler.edu (Elliott Davis)
Date: Thu, 30 Jun 2011 16:46:10 -0500
Subject: [Koha-patches] Patch to bug 5079
Message-ID: <8754F6E19960C249BB9C8FFECA62774001400095EF@dogbert>

Patch to bug 5079

Added system preference to display shelving location of an item on opac reults.  The system preference is called OpacItemLocation.  I also moved the call number to a new line called Location along with the shelving location if it is enabled.  To Test: run database update script to add syspref. Enable OpacItemLocation to show locations on the opac-search page.  If it is working you should see the shelving location of the item before the call number.

Items that are "unavailable" should also now have their call numbers listed in red.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110630/4a8fdcb0/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-bug-5079.patch
Type: application/octet-stream
Size: 13832 bytes
Desc: 0002-bug-5079.patch
URL: </pipermail/koha-patches/attachments/20110630/4a8fdcb0/attachment-0001.obj>

From nengard at bywatersolutions.com  Thu Jun 30 22:00:08 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 30 Jun 2011 16:00:08 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 6543 - Column
	hiding on batch item edit/delete not working
Message-ID: <1309464008-6857-1-git-send-email-nengard@bywatersolutions.com>

From: Owen Leonard <oleonard at myacpl.org>

T:T variable name problem.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/tools/batchMod-del.tt          |    3 ++-
 .../prog/en/modules/tools/batchMod-edit.tt         |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 5aed1ba..af2a239 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -12,6 +12,7 @@
 // Prepare array of all column headers, incrementing each index by
 // two to accomodate control and title columns
 var allColumns = new Array([% FOREACH item_header_loo IN item_header_loop %]'[% loop.count %]'[% UNLESS ( loop.last ) %],[% END %][% END %]);
+console.log(allColumns);
 for( x=0; x<allColumns.length; x++ ){
   allColumns[x] = Number(allColumns[x]) + 2;
 }
@@ -76,7 +77,7 @@ for( x=0; x<allColumns.length; x++ ){
 
 	<p id="selections"><strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
 		[% FOREACH item_header_loo IN item_header_loop %]
-		<span class="selected"><input id="checkheader[% item_header_loo.__counter %]" type="checkbox" checked="checked" /> <label for="checkheader[% loop.count %]">[% item_header_loo.header_value %]</label> </span>
+		<span class="selected"><input id="checkheader[% loop.count %]" type="checkbox" checked="checked" /> <label for="checkheader[% loop.count %]">[% item_header_loo.header_value %]</label> </span>
 		[% END %]
 	</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 05fa978..67cd6e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -12,6 +12,7 @@
 // Prepare array of all column headers, incrementing each index by
 // two to accomodate control and title columns
 var allColumns = new Array([% FOREACH item_header_loo IN item_header_loop %]'[% loop.count %]'[% UNLESS ( loop.last ) %],[% END %][% END %]);
+console.log(allColumns);
 for( x=0; x<allColumns.length; x++ ){
   allColumns[x] = Number(allColumns[x]) + 2;
 }
@@ -71,7 +72,7 @@ for( x=0; x<allColumns.length; x++ ){
 
 <p id="selections"><strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span> 
         [% FOREACH item_header_loo IN item_header_loop %]
-        <span class="selected"><input id="checkheader[% item_header_loo.__counter %]" type="checkbox" checked="checked" /> <label for="checkheader[% loop.count %]">[% item_header_loo.header_value %]</label> </span>
+        <span class="selected"><input id="checkheader[% loop.count %]" type="checkbox" checked="checked" /> <label for="checkheader[% loop.count %]">[% item_header_loo.header_value %]</label> </span>
         [% END %]
 </p>
         <table id="itemst">
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Jun 30 22:41:04 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 30 Jun 2011 16:41:04 -0400
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] Bug 5079 - Show location on
	opac results
Message-ID: <1309466464-7277-1-git-send-email-nengard@bywatersolutions.com>

From: Elliott Davis <tdavis at uttyler.edu>

Added system preference to display shelving location of an item on opac results. The system preference is called OpacItemLocation. I also moved the call number to a new line called Location along with the shelving location if it is enabled. To Test: run database update script to add syspref. Enable OpacItemLocation to show locations on the opac-search page. If it is working you should see the shelving location of the item before the call number. Multiple home branch shelving locations are seperated by a |.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 C4/XSLT.pm                                         |   16 ++++--
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++
 .../prog/en/modules/admin/preferences/opac.pref    |    6 ++
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   57 +++++++++++++-------
 5 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 28a70fc..37dea46 100755
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -183,8 +183,10 @@ sub XSLTParse4Display {
 sub buildKohaItemsNamespace {
     my ($biblionumber) = @_;
     my @items = C4::Items::GetItemsInfo($biblionumber);
+    my $shelflocations =GetKohaAuthorisedValues('items.location',GetFrameworkCode($biblionumber), 'opac');
     my $branches = GetBranches();
     my $itemtypes = GetItemTypes();
+    my $location = "";
     my $xml = '';
     for my $item (@items) {
         my $status;
@@ -223,12 +225,16 @@ sub buildKohaItemsNamespace {
             $status = "available";
         }
         my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'});
-	    my $itemcallnumber = xml_escape($item->{itemcallnumber});
+	if(C4::Context->preference("OpacItemLocation") && defined $item->{'location'}) {
+	    $location = xml_escape($shelflocations->{$item->{location}});
+	}
+	my $itemcallnumber = xml_escape($item->{itemcallnumber});
         $xml.= "<item><homebranch>$homebranch</homebranch>".
-		"<status>$status</status>".
-		"<itemcallnumber>".$itemcallnumber."</itemcallnumber>"
-        . "</item>";
-
+	    "<location>$location</location>".
+	    "<status>$status</status>".
+	    "<itemcallnumber>".$itemcallnumber."</itemcallnumber>"
+	    . "</item>";
+	
     }
     $xml = "<items xmlns=\"http://www.koha-community.org/items\">".$xml."</items>";
     return $xml;
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index f98b053..7419908 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -92,6 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3c7d043..c8bca2b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4354,6 +4354,13 @@ 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('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');");
+    print "Upgrade to $DBversion done (Add OpacItemLocation 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
index 71c9426..88aa7ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -192,6 +192,12 @@ OPAC:
                   no: "Don't allow"
             - patrons to log in to their accounts on the OPAC.
         -
+            - pref: OpacItemLocation
+              choices:
+                  yes: Show
+                  no: "Don't Show"
+            - Show the shelving location of items in opac results.
+        -
             - pref: OpacPasswordChange
               choices:
                   yes: Allow
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 97d83e2..5805aea 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -979,22 +979,21 @@
                             </xsl:for-each>
                             (<xsl:value-of select="$AlternateHoldingsCount"/>)
                             </xsl:when>
-                            <xsl:otherwise>No copies available</xsl:otherwise>
+                            <xsl:otherwise>No copies available </xsl:otherwise>
                         </xsl:choose>
 				   </xsl:when>
                    <xsl:when test="count(key('item-by-status', 'available'))>0">
-                   <span class="available">
-                       <b><xsl:text>Copies available for loan: </xsl:text></b>
-                       <xsl:variable name="available_items"
-                           select="key('item-by-status', 'available')"/>
-                       <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-                           <xsl:value-of select="items:homebranch"/>
-						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
-                           <xsl:text> (</xsl:text>
-                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
-                           <xsl:text>)</xsl:text>
-<xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
+                   <span class="available">	
+		     <b>
+		       <xsl:value-of select="count(key('item-by-status', 'available'))"/>
+		       <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> Copy available for loan at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for loan at </xsl:text></xsl:otherwise></xsl:choose>
+		     </b>
+		     <xsl:variable name="available_items"
+				   select="key('item-by-status', 'available')"/>
+		     <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+		       <xsl:value-of select="items:homebranch"/>
+		       <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+		     </xsl:for-each>
                    </span>
                    </xsl:when>
 				   </xsl:choose>
@@ -1002,15 +1001,14 @@
                    <xsl:choose>
                    <xsl:when test="count(key('item-by-status', 'reference'))>0">
                    <span class="available">
-                       <b><xsl:text>Copies available for reference: </xsl:text></b>
-                       <xsl:variable name="reference_items"
+                       <b>
+		       <xsl:value-of select="count(key('item-by-status', 'reference'))"/>
+		       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> Copy available for reference at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for reference at </xsl:text></xsl:otherwise></xsl:choose>
+		     </b>
+		     <xsl:variable name="reference_items"
                            select="key('item-by-status', 'reference')"/>
                        <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
                            <xsl:value-of select="items:homebranch"/>
-						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
-                           <xsl:text> (</xsl:text>
-                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
-                           <xsl:text>)</xsl:text>
                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
                        </xsl:for-each>
                    </span>
@@ -1061,6 +1059,27 @@
                        <xsl:text>). </xsl:text>                   </span>
                    </xsl:if>
                </span>
+	       <span class="results_summary" id="location"> 
+		 <span class="label">Location(s): </span>
+		 <xsl:variable name="available_items"
+			       select="key('item-by-status', 'available')"/>
+		 <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+		   <xsl:value-of select="concat(items:location,' ')"/>
+		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+		   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+		 </xsl:for-each>
+		 <xsl:choose><xsl:when test="count(key('item-by-status', 'available'))>0 and count(key('item-by-status', 'reference'))>0"><xsl:text> | </xsl:text></xsl:when></xsl:choose>		 
+		 <xsl:variable name="reference_items"
+			       select="key('item-by-status', 'reference')"/>
+		 <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+		   <xsl:value-of select="concat(items:location,' ')"/>
+		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+                       </xsl:for-each>
+
+	       </span>
+
+
     </xsl:template>
 
     <xsl:template name="nameABCDQ">
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Jun 30 22:41:22 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 30 Jun 2011 16:41:22 -0400
Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] BUG: 5079
Message-ID: <1309466482-7311-1-git-send-email-nengard@bywatersolutions.com>

From: Elliott Davis <tdavis at uttyler.edu>


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 +-
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        | 2167 ++++++++++----------
 3 files changed, 1130 insertions(+), 1041 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 7419908..e027fc5 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -92,7 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',0,'Show the shelving location of items in the opac',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo');
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
index 88aa7ca..c14fa7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -196,7 +196,7 @@ OPAC:
               choices:
                   yes: Show
                   no: "Don't Show"
-            - Show the shelving location of items in opac results.
+            - the shelving location of items in opac results.
         -
             - pref: OpacPasswordChange
               choices:
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 5805aea..5b3706f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -2,23 +2,24 @@
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
 <xsl:stylesheet version="1.0"
-  xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha-community.org/items"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="marc items">
-    <xsl:import href="MARC21slimUtils.xsl"/>
-    <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
-    <xsl:key name="item-by-status" match="items:item" use="items:status"/>
-    <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
-
-    <xsl:template match="/">
-            <xsl:apply-templates/>
-    </xsl:template>
-    <xsl:template match="marc:record">
-
-        <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
-        <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
-
+		xmlns:marc="http://www.loc.gov/MARC21/slim"
+		xmlns:items="http://www.koha-community.org/items"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		exclude-result-prefixes="marc items">
+  <xsl:import href="MARC21slimUtils.xsl"/>
+  <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
+  <xsl:key name="item-by-status" match="items:item" use="items:status"/>
+  <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
+  <xsl:key name="item-by-status-and-location" match="items:item" use="concat(items:status, ' ', items:location)"/>
+  
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="marc:record">
+    
+    <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
+    <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
+    
     <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
     <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
     <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
@@ -27,840 +28,840 @@
     <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
     <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
     <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
-        <xsl:variable name="leader" select="marc:leader"/>
-        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
-        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
-        <xsl:variable name="leader19" select="substring($leader,20,1)"/>
-        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
-        <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
-        <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
-        <xsl:variable name="typeOf008">
-            <xsl:choose>
-                <xsl:when test="$leader19='a'">ST</xsl:when>
-                <xsl:when test="$leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
-                        <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">CR</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$leader6='t'">BK</xsl:when>
-                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
-                <xsl:when test="$leader6='m'">CF</xsl:when>
-                <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
-                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
-                <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
-        <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
-        <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
-        <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
-        <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
-        <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
-        <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
-        <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
-        <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
-
-        <xsl:variable name="physicalDescription">
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
-                reformatted digital
-            </xsl:if>
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
-                digitized microfilm
-            </xsl:if>
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
-                digitized other analog
-            </xsl:if>
-
-            <xsl:variable name="check008-23">
-                <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='CR' or $typeOf008='MX'">
-                    <xsl:value-of select="true()"></xsl:value-of>
-                </xsl:if>
-            </xsl:variable>
-            <xsl:variable name="check008-29">
-                <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
-                    <xsl:value-of select="true()"></xsl:value-of>
-                </xsl:if>
-            </xsl:variable>
-            <xsl:choose>
-                <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
-                    braille
-                </xsl:when>
-                <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='CR') and ($controlField008-23=' ' or $controlField008='r'))">
-                    print
-                </xsl:when>
-                <xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
-                    electronic
-                </xsl:when>
-                <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
-                    microfiche
-                </xsl:when>
-                <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
-                    microfilm
-                </xsl:when>
-            </xsl:choose>
-<!--
-            <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
-                    <xsl:value-of select="."></xsl:value-of>
-            </xsl:for-each>
-            <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
-                <xsl:choose>
-                    <xsl:when test="substring(text(),14,1)='a'">
-                        access
-                    </xsl:when>
-                    <xsl:when test="substring(text(),14,1)='p'">
-                        preservation
-                    </xsl:when>
-                    <xsl:when test="substring(text(),14,1)='r'">
-                        replacement
-                    </xsl:when>
-                </xsl:choose>
-            </xsl:for-each>
--->
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
-                chip cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="computer optical disc cartridge" title="computer optical disc cartridge" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
-                magnetic disc
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
-                magneto-optical disc
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="optical disc" title="optical disc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
-		available online
-                <img src="/opac-tmpl/prog/famfamfam/silk/drive_web.png" alt="remote" title="remote" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
-                tape cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
-                tape cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
-                tape reel
-            </xsl:if>
+    <xsl:variable name="leader" select="marc:leader"/>
+    <xsl:variable name="leader6" select="substring($leader,7,1)"/>
+    <xsl:variable name="leader7" select="substring($leader,8,1)"/>
+    <xsl:variable name="leader19" select="substring($leader,20,1)"/>
+    <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
+    <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
+    <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
+    <xsl:variable name="typeOf008">
+      <xsl:choose>
+	<xsl:when test="$leader19='a'">ST</xsl:when>
+	<xsl:when test="$leader6='a'">
+	  <xsl:choose>
+	    <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
+	    <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">CR</xsl:when>
+	  </xsl:choose>
+	</xsl:when>
+	<xsl:when test="$leader6='t'">BK</xsl:when>
+	<xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
+	<xsl:when test="$leader6='m'">CF</xsl:when>
+	<xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
+	<xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
+	<xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
+	<xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
+    <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
+    <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
+    <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
+    <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
+    <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
+    <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
+    <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
+    <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
+    
+    <xsl:variable name="physicalDescription">
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
+	reformatted digital
+      </xsl:if>
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
+	digitized microfilm
+      </xsl:if>
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
+	digitized other analog
+      </xsl:if>
+      
+      <xsl:variable name="check008-23">
+	<xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='CR' or $typeOf008='MX'">
+	  <xsl:value-of select="true()"></xsl:value-of>
+	</xsl:if>
+      </xsl:variable>
+      <xsl:variable name="check008-29">
+	<xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
+	  <xsl:value-of select="true()"></xsl:value-of>
+	</xsl:if>
+      </xsl:variable>
+      <xsl:choose>
+	<xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
+	  braille
+	</xsl:when>
+	<xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='CR') and ($controlField008-23=' ' or $controlField008='r'))">
+	  print
+	</xsl:when>
+	<xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
+	  electronic
+	</xsl:when>
+	<xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
+	  microfiche
+	</xsl:when>
+	<xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
+	  microfilm
+	</xsl:when>
+      </xsl:choose>
+      <!--
+	  <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
+	  <xsl:value-of select="."></xsl:value-of>
+	  </xsl:for-each>
+	  <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
+	  <xsl:choose>
+	  <xsl:when test="substring(text(),14,1)='a'">
+	  access
+	  </xsl:when>
+	  <xsl:when test="substring(text(),14,1)='p'">
+	  preservation
+	  </xsl:when>
+	  <xsl:when test="substring(text(),14,1)='r'">
+	  replacement
+	  </xsl:when>
+	  </xsl:choose>
+	  </xsl:for-each>
+      -->
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
+	chip cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="computer optical disc cartridge" title="computer optical disc cartridge" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
+	magnetic disc
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
+	magneto-optical disc
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="optical disc" title="optical disc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
+	available online
+	<img src="/opac-tmpl/prog/famfamfam/silk/drive_web.png" alt="remote" title="remote" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
+	tape cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
+	tape cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
+	tape reel
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="celestial globe" title="celestial globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="earth moon globe" title="earth moon globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="planetary or lunar globe" title="planetary or lunar globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="terrestrial globe" title="terrestrial globe" class="format"/>
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
+	kit
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
+	atlas
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
+	diagram
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
+	map
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
+	model
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
+	profile
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
+	remote-sensing image
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
+	section
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
+	view
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
+	aperture card
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
+	microfiche
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
+	microfiche cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
+	microfilm cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
+	microfilm cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
+	microfilm reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
+	microopaque
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
+	film cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
+	film cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
+	film reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/chart_curve.png" alt="chart" title="chart" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
+	collage
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/pencil.png" alt="drawing" title="drawing" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/note.png" alt="flash card" title="flash card" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/paintbrush.png" alt="painting" title="painting" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
+	photomechanical print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
+	photonegative
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
+	photoprint
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/picture.png" alt="picture" title="picture" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
+	print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
+	technical drawing
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/script.png" alt="notated music" title="notated music" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
+	filmslip
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
+	filmstrip cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
+	filmstrip roll
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
+	other filmstrip type
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/pictures.png" alt="slide" title="slide" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
+	transparency
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
+	remote-sensing image
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
+	cylinder
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
+	roll
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
+	sound cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
+	sound cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="sound disc" title="sound disc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
+	sound-tape reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
+	sound-track film
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
+	wire recording
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
+	braille
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
+	combination
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
+	moon
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
+	tactile, with no writing system
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
+	braille
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/magnifier.png" alt="large print" title="large print" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
+	regular print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
+	text in looseleaf binder
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
+	videocartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
+	videocassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/dvd.png" alt="videodisc" title="videodisc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
+	videoreel
+      </xsl:if>
+      <!--
+	  <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
+	  <xsl:value-of select="."></xsl:value-of>
+	  </xsl:for-each>
+	  <xsl:for-each select="marc:datafield[@tag=300]">
+	  <xsl:call-template name="subfieldSelect">
+	  <xsl:with-param name="codes">abce</xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:for-each>
+      -->
+    </xsl:variable>
 
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="celestial globe" title="celestial globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="earth moon globe" title="earth moon globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="planetary or lunar globe" title="planetary or lunar globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="terrestrial globe" title="terrestrial globe" class="format"/>
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
-                kit
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                atlas
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
-                diagram
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                map
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                model
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
-                profile
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                remote-sensing image
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
-                section
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
-                view
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
-                aperture card
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
-                microfiche
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
-                microfiche cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
-                microfilm cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
-                microfilm cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
-                microfilm reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
-                microopaque
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
-                film cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
-                film cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
-                film reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/chart_curve.png" alt="chart" title="chart" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
-                collage
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
-                 <img src="/opac-tmpl/prog/famfamfam/silk/pencil.png" alt="drawing" title="drawing" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/note.png" alt="flash card" title="flash card" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/paintbrush.png" alt="painting" title="painting" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
-                photomechanical print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
-                photonegative
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
-                photoprint
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/picture.png" alt="picture" title="picture" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
-                print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
-                technical drawing
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/script.png" alt="notated music" title="notated music" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
-                filmslip
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
-                filmstrip cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
-                filmstrip roll
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
-                other filmstrip type
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/pictures.png" alt="slide" title="slide" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
-                transparency
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
-                remote-sensing image
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
-                cylinder
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
-                roll
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
-                sound cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
-                sound cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="sound disc" title="sound disc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
-                sound-tape reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
-                sound-track film
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
-                wire recording
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
-                braille
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
-                combination
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
-                moon
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
-                tactile, with no writing system
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
-                braille
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/magnifier.png" alt="large print" title="large print" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
-                regular print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
-                text in looseleaf binder
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
-                videocartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
-                videocassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/dvd.png" alt="videodisc" title="videodisc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
-                videoreel
-            </xsl:if>
-<!--
-            <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
-                    <xsl:value-of select="."></xsl:value-of>
-            </xsl:for-each>
-            <xsl:for-each select="marc:datafield[@tag=300]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abce</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
--->
-        </xsl:variable>
-
-        <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
-        <xsl:if test="$display880">
-           <xsl:call-template name="m880Select">
-              <xsl:with-param name="basetags">245</xsl:with-param>
-              <xsl:with-param name="codes">abhfgknps</xsl:with-param>
-              <xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
-           </xsl:call-template>
-        </xsl:if>
+    <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
+    <xsl:if test="$display880">
+      <xsl:call-template name="m880Select">
+	<xsl:with-param name="basetags">245</xsl:with-param>
+	<xsl:with-param name="codes">abhfgknps</xsl:with-param>
+	<xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
 
-        <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
+    <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
 
-        <xsl:if test="marc:datafield[@tag=245]">
-        <xsl:for-each select="marc:datafield[@tag=245]">
-            <xsl:variable name="title">
-                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:if test="marc:subfield[@code='b']">
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">b</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:if>
-                    <xsl:if test="marc:subfield[@code='h']">
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">h</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:if>
-                <xsl:text> </xsl:text>
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">fgknps</xsl:with-param>
-                     </xsl:call-template>
-            </xsl:variable>
-            <xsl:variable name="titleChop">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString">
-                        <xsl:value-of select="$title"/>
-                    </xsl:with-param>
-                </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$titleChop"/>
-        </xsl:for-each>
-        </xsl:if>
+    <xsl:if test="marc:datafield[@tag=245]">
+      <xsl:for-each select="marc:datafield[@tag=245]">
+	<xsl:variable name="title">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">a</xsl:with-param>
+	  </xsl:call-template>
+	  <xsl:if test="marc:subfield[@code='b']">
+	    <xsl:text> </xsl:text>
+	    <xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">b</xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:subfield[@code='h']">
+	    <xsl:text> </xsl:text>
+	    <xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">h</xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:if>
+	  <xsl:text> </xsl:text>
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">fgknps</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:variable>
+	<xsl:variable name="titleChop">
+	  <xsl:call-template name="chopPunctuation">
+	    <xsl:with-param name="chopString">
+	      <xsl:value-of select="$title"/>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</xsl:variable>
+	<xsl:value-of select="$titleChop"/>
+      </xsl:for-each>
+    </xsl:if>
     </a>
     <p>
 
-    <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
-    <xsl:if test="$display880">
-      <xsl:call-template name="m880Select">
-      <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
-      <xsl:with-param name="codes">abc</xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
+      <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
+      <xsl:if test="$display880">
+	<xsl:call-template name="m880Select">
+	  <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
+	  <xsl:with-param name="codes">abc</xsl:with-param>
+	</xsl:call-template>
+      </xsl:if>
 
-    <xsl:choose>
-    <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
+      <xsl:choose>
+	<xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
 
-    by <span class="author">
-        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
+	  by <span class="author">
+	  <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameABCDQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameABCDQ"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
+	  </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
+	  <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
             <xsl:choose>
-            <xsl:when test="position()=1">
+	      <xsl:when test="position()=1">
 		<xsl:text> -- </xsl:text>
-            </xsl:when>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameABCDN"/> 
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameABCDN"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
+	  </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
+	  <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
             <xsl:choose>
-            <xsl:when test="position()=1">
+	      <xsl:when test="position()=1">
 		<xsl:text> -- </xsl:text>
-            </xsl:when>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="marc:subfield[@code='n']">
-               <xsl:text> </xsl:text>
-               <xsl:call-template name="subfieldSelect">
+	      <xsl:when test="marc:subfield[@code='n']">
+		<xsl:text> </xsl:text>
+		<xsl:call-template name="subfieldSelect">
                   <xsl:with-param name="codes">n</xsl:with-param> 
-               </xsl:call-template>
-               <xsl:text> </xsl:text>
-            </xsl:when>
+		</xsl:call-template>
+		<xsl:text> </xsl:text>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameACDEQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameACDEQ"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
-    </span>
-    </xsl:when>
-    </xsl:choose>
+	  </xsl:for-each>
+	</span>
+	</xsl:when>
+      </xsl:choose>
     </p>
 
     <xsl:if test="marc:datafield[@tag=250]">
-	<span class="results_summary">
-    <span class="label">Edition: </span>
-            <xsl:for-each select="marc:datafield[@tag=250]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">ab</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Edition: </span>
+	<xsl:for-each select="marc:datafield[@tag=250]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">ab</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:for-each>
+      </span>
     </xsl:if>
 
-<xsl:if test="$DisplayOPACiconsXSLT!='0'">
-    <span class="results_summary">
-    <xsl:if test="$typeOf008!=''">
-        <span class="label">Type: </span>
-            <xsl:choose>
-                <xsl:when test="$leader19='a'"><img src="/opac-tmpl/prog/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
-                <xsl:when test="$leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
-                        <xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/prog/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-				<xsl:when test="$leader6='o'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
-				<xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
-                <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
-                <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/prog/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
-                <xsl:when test="$leader6='i'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
-                <xsl:when test="$leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
-            </xsl:choose>
-    </xsl:if>
-    <xsl:if test="string-length(normalize-space($physicalDescription))">
-        <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
-    </xsl:if>
+    <xsl:if test="$DisplayOPACiconsXSLT!='0'">
+      <span class="results_summary">
+	<xsl:if test="$typeOf008!=''">
+	  <span class="label">Type: </span>
+	  <xsl:choose>
+	    <xsl:when test="$leader19='a'"><img src="/opac-tmpl/prog/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
+	    <xsl:when test="$leader6='a'">
+	      <xsl:choose>
+		<xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
+		<xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
+		<xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/prog/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
+	      </xsl:choose>
+	    </xsl:when>
+	    <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
+	    <xsl:when test="$leader6='o'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
+	    <xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
+	    <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
+	    <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
+	    <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
+	    <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/prog/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
+	    <xsl:when test="$leader6='i'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
+	    <xsl:when test="$leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
+	  </xsl:choose>
+	</xsl:if>
+	<xsl:if test="string-length(normalize-space($physicalDescription))">
+	  <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
+	</xsl:if>
 
         <xsl:if test="$controlField008-21 or $controlField008-22 or $controlField008-24 or $controlField008-26 or $controlField008-29 or $controlField008-34 or $controlField008-33 or $controlField008-30-31 or $controlField008-33">
 
-        <xsl:if test="$typeOf008='CR'">
-        <xsl:if test="$controlField008-21 and $controlField008-21 !='|' and $controlField008-21 !=' '">
-        <span class="label">; Type of continuing resource: </span>
-        </xsl:if>
+	  <xsl:if test="$typeOf008='CR'">
+	    <xsl:if test="$controlField008-21 and $controlField008-21 !='|' and $controlField008-21 !=' '">
+	      <span class="label">; Type of continuing resource: </span>
+	    </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-21='d'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
-                </xsl:when>
-                <xsl:when test="$controlField008-21='l'">
-                    loose-leaf
-                </xsl:when>
-                <xsl:when test="$controlField008-21='m'">
-                    series
-                </xsl:when>
-                <xsl:when test="$controlField008-21='n'">
-                    newspaper
-                </xsl:when>
-                <xsl:when test="$controlField008-21='p'">
-                    periodical
-                </xsl:when>
-                <xsl:when test="$controlField008-21='w'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/world_link.png" alt="web site" title="web site" class="format"/>
-                </xsl:when>
+	      <xsl:when test="$controlField008-21='d'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='l'">
+		loose-leaf
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='m'">
+		series
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='n'">
+		newspaper
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='p'">
+		periodical
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='w'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/world_link.png" alt="web site" title="web site" class="format"/>
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='BK' or $typeOf008='CR'">
-        <xsl:if test="contains($controlField008-24,'abcdefghijklmnopqrstvwxyz')">
-        <span class="label">; Nature of contents: </span>
-        </xsl:if>
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='BK' or $typeOf008='CR'">
+	    <xsl:if test="contains($controlField008-24,'abcdefghijklmnopqrstvwxyz')">
+	      <span class="label">; Nature of contents: </span>
+	    </xsl:if>
             <xsl:choose>
-                <xsl:when test="contains($controlField008-24,'a')">
-                    abstract or summary
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'b')">
-			bibliography
-                     <img src="/opac-tmpl/prog/famfamfam/silk/text_list_bullets.png" alt="bibliography" title="bibliography" class="natureofcontents"/>
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'c')">
-                    catalog
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'d')">
-                    dictionary
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'e')">
-                    encyclopedia
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'f')">
-                    handbook
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'g')">
-                    legal article
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'i')">
-                    index
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'k')">
-                    discography
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'l')">
-                    legislation
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'m')">
-                    theses
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'n')">
-                    survey of literature
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'o')">
-                    review
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'p')">
-                    programmed text
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'q')">
-                    filmography
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'r')">
-                    directory
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'s')">
-                    statistics
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'t')">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/report.png" alt="technical report" title="technical report" class="natureofcontents"/>
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'v')">
-                    legal case and case notes
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'w')">
-                    law report or digest
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'z')">
-                    treaty
-                </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'a')">
+		abstract or summary
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'b')">
+		bibliography
+		<img src="/opac-tmpl/prog/famfamfam/silk/text_list_bullets.png" alt="bibliography" title="bibliography" class="natureofcontents"/>
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'c')">
+		catalog
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'d')">
+		dictionary
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'e')">
+		encyclopedia
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'f')">
+		handbook
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'g')">
+		legal article
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'i')">
+		index
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'k')">
+		discography
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'l')">
+		legislation
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'m')">
+		theses
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'n')">
+		survey of literature
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'o')">
+		review
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'p')">
+		programmed text
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'q')">
+		filmography
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'r')">
+		directory
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'s')">
+		statistics
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'t')">
+		<img src="/opac-tmpl/prog/famfamfam/silk/report.png" alt="technical report" title="technical report" class="natureofcontents"/>
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'v')">
+		legal case and case notes
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'w')">
+		law report or digest
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'z')">
+		treaty
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-                <xsl:when test="$controlField008-29='1'">
-                    conference publication
-                </xsl:when>
+	      <xsl:when test="$controlField008-29='1'">
+		conference publication
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='CF'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='CF'">
             <xsl:if test="$controlField008-26='a' or $controlField008-26='e' or $controlField008-26='f' or $controlField008-26='g'">
-            <span class="label">; Type of computer file: </span>
+	      <span class="label">; Type of computer file: </span>
             </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-26='a'">
-                    numeric data
-                </xsl:when>
-                <xsl:when test="$controlField008-26='e'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
-                </xsl:when>
-                <xsl:when test="$controlField008-26='f'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/font.png" alt="font" title="font" class="format"/> 
-                </xsl:when>
-                <xsl:when test="$controlField008-26='g'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/controller.png" alt="game" title="game" class="format"/>
-                </xsl:when>
+	      <xsl:when test="$controlField008-26='a'">
+		numeric data
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='e'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='f'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/font.png" alt="font" title="font" class="format"/> 
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='g'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/controller.png" alt="game" title="game" class="format"/>
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='BK'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='BK'">
             <xsl:if test="(substring($controlField008,25,1)='j') or (substring($controlField008,25,1)='1') or ($controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d')">
-            <span class="label">; Nature of contents: </span>
+	      <span class="label">; Nature of contents: </span>
             </xsl:if>
             <xsl:if test="substring($controlField008,25,1)='j'">
-                patent
+	      patent
             </xsl:if>
             <xsl:if test="substring($controlField008,31,1)='1'">
-                festschrift
+	      festschrift
             </xsl:if>
             <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
-                 <img src="/opac-tmpl/prog/famfamfam/silk/user.png" alt="biography" title="biography" class="natureofcontents"/>
+	      <img src="/opac-tmpl/prog/famfamfam/silk/user.png" alt="biography" title="biography" class="natureofcontents"/>
             </xsl:if>
 
             <xsl:if test="$controlField008-33 and $controlField008-33!='|' and $controlField008-33!='u' and $controlField008-33!=' '">
-            <span class="label">; Literary form: </span>
+	      <span class="label">; Literary form: </span>
             </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-33='0'">
-                    not fiction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='1'">
-                    fiction
-                </xsl:when> 
-                <xsl:when test="$controlField008-33='e'">
-                    essay
-                </xsl:when>
-                <xsl:when test="$controlField008-33='d'">
-                    drama
-                </xsl:when>
-                <xsl:when test="$controlField008-33='c'">
-                    comic strip
-                </xsl:when>
-                <xsl:when test="$controlField008-33='l'">
-                    fiction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='h'">
-                    humor, satire
-                </xsl:when>
-                <xsl:when test="$controlField008-33='i'">
-                    letter
-                </xsl:when>
-                <xsl:when test="$controlField008-33='f'">
-                    novel
-                </xsl:when>
-                <xsl:when test="$controlField008-33='j'">
-                    short story
-                </xsl:when>
-                <xsl:when test="$controlField008-33='s'">
-                    speech
-                </xsl:when>
+	      <xsl:when test="$controlField008-33='0'">
+		not fiction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='1'">
+		fiction
+	      </xsl:when> 
+	      <xsl:when test="$controlField008-33='e'">
+		essay
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='d'">
+		drama
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='c'">
+		comic strip
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='l'">
+		fiction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='h'">
+		humor, satire
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='i'">
+		letter
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='f'">
+		novel
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='j'">
+		short story
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='s'">
+		speech
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if> 
-        <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!='  '">
+	  </xsl:if> 
+	  <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!='  '">
             <span class="label">; Literary form: </span> <!-- Literary text for sound recordings -->
             <xsl:if test="contains($controlField008-30-31,'b')">
-                biography
+	      biography
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'c')">
-                conference publication
+	      conference publication
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'d')">
-                drama
+	      drama
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'e')">
-                essay
+	      essay
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'f')">
-                fiction
+	      fiction
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'o')">
-                folktale
+	      folktale
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'h')">
-                history
+	      history
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'k')">
-                humor, satire
+	      humor, satire
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'m')">
-                memoir
+	      memoir
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'p')">
-                poetry
+	      poetry
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'r')">
-                rehearsal
+	      rehearsal
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'g')">
-                reporting
+	      reporting
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'s')">
-                sound
+	      sound
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'l')">
-                speech
+	      speech
             </xsl:if>
-        </xsl:if>
-        <xsl:if test="$typeOf008='VM'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='VM'">
             <span class="label">; Type of visual material: </span>
             <xsl:choose>
-                <xsl:when test="$controlField008-33='a'">
-                    art original
-                </xsl:when>
-                <xsl:when test="$controlField008-33='b'">
-                    kit
-                </xsl:when>
-                <xsl:when test="$controlField008-33='c'">
-                    art reproduction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='d'">
-                    diorama
-                </xsl:when>
-                <xsl:when test="$controlField008-33='f'">
-                    filmstrip
-                </xsl:when>
-                <xsl:when test="$controlField008-33='g'">
-                    legal article
-                </xsl:when>
-                <xsl:when test="$controlField008-33='i'">
-                    picture
-                </xsl:when>
-                <xsl:when test="$controlField008-33='k'">
-                    graphic
-                </xsl:when>
-                <xsl:when test="$controlField008-33='l'">
-                    technical drawing
-                </xsl:when>
-                <xsl:when test="$controlField008-33='m'">
-                    motion picture
-                </xsl:when>
-                <xsl:when test="$controlField008-33='n'">
-                    chart
-                </xsl:when>
-                <xsl:when test="$controlField008-33='o'">
-                    flash card
-                </xsl:when>
-                <xsl:when test="$controlField008-33='p'">
-                    microscope slide
-                </xsl:when>
-                <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2
-,1)='q']">
-                    model
-                </xsl:when>
-                <xsl:when test="$controlField008-33='r'">
-                    realia
-                </xsl:when>
-                <xsl:when test="$controlField008-33='s'">
-                    slide
-                </xsl:when>
-                <xsl:when test="$controlField008-33='t'">
-                    transparency
-                </xsl:when>
-                <xsl:when test="$controlField008-33='v'">
-                    videorecording
-                </xsl:when>
-                <xsl:when test="$controlField008-33='w'">
-                    toy
-                </xsl:when>
+	      <xsl:when test="$controlField008-33='a'">
+		art original
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='b'">
+		kit
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='c'">
+		art reproduction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='d'">
+		diorama
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='f'">
+		filmstrip
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='g'">
+		legal article
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='i'">
+		picture
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='k'">
+		graphic
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='l'">
+		technical drawing
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='m'">
+		motion picture
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='n'">
+		chart
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='o'">
+		flash card
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='p'">
+		microscope slide
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2
+			      ,1)='q']">
+		model
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='r'">
+		realia
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='s'">
+		slide
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='t'">
+		transparency
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='v'">
+		videorecording
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='w'">
+		toy
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
+	  </xsl:if>
         </xsl:if> 
 
-    <xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')">
-        <span class="label">; Audience: </span>
-        <xsl:choose>
+	<xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')">
+	  <span class="label">; Audience: </span>
+	  <xsl:choose>
             <xsl:when test="$controlField008-22='a'">
-             Preschool;
+	      Preschool;
             </xsl:when>
             <xsl:when test="$controlField008-22='b'">
-             Primary;
+	      Primary;
             </xsl:when>
             <xsl:when test="$controlField008-22='c'">
-             Pre-adolescent;
+	      Pre-adolescent;
             </xsl:when>
             <xsl:when test="$controlField008-22='d'">
-             Adolescent;
+	      Adolescent;
             </xsl:when>
             <xsl:when test="$controlField008-22='e'">
-             Adult;
+	      Adult;
             </xsl:when>
             <xsl:when test="$controlField008-22='g'">
-             General;
+	      General;
             </xsl:when>
             <xsl:when test="$controlField008-22='j'">
-             Juvenile;
+	      Juvenile;
             </xsl:when>
             <xsl:when test="$controlField008-22='f'">
-             Specialized;
+	      Specialized;
             </xsl:when>
-            </xsl:choose>
+	  </xsl:choose>
+	</xsl:if>
+	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
+      </span>
     </xsl:if>
-<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
-	</span>
-</xsl:if>
 
     <!-- Publisher Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
@@ -871,325 +872,413 @@
         <xsl:with-param name="label">Publisher: </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-        
+    
     <xsl:if test="marc:datafield[@tag=260]">
-	<span class="results_summary">
-    <span class="label">Publisher: </span> 
-            <xsl:for-each select="marc:datafield[@tag=260]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Publisher: </span> 
+	<xsl:for-each select="marc:datafield[@tag=260]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">abcg</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:for-each>
+      </span>
     </xsl:if>
 
     <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
-       <xsl:call-template name="m880Select">
-         <xsl:with-param name="basetags">246</xsl:with-param>
-         <xsl:with-param name="codes">ab</xsl:with-param>
-         <xsl:with-param name="class">results_summary</xsl:with-param>
-         <xsl:with-param name="label">Other Title: </xsl:with-param>
-       </xsl:call-template>
+      <xsl:call-template name="m880Select">
+	<xsl:with-param name="basetags">246</xsl:with-param>
+	<xsl:with-param name="codes">ab</xsl:with-param>
+	<xsl:with-param name="class">results_summary</xsl:with-param>
+	<xsl:with-param name="label">Other Title: </xsl:with-param>
+      </xsl:call-template>
     </xsl:if>
-        
+    
     <xsl:if test="marc:datafield[@tag=246]">
-	<span class="results_summary">
-    <span class="label">Other title: </span>
-            <xsl:for-each select="marc:datafield[@tag=246]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">ab</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Other title: </span>
+	<xsl:for-each select="marc:datafield[@tag=246]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">ab</xsl:with-param>
+	  </xsl:call-template>
+	  <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+	</xsl:for-each>
+      </span>
     </xsl:if>
     <xsl:if test="marc:datafield[@tag=856]">
-         <span class="results_summary">
-			   <span class="label">Online Access: </span>
-                            <xsl:for-each select="marc:datafield[@tag=856]">
-                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
-                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
-                                   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                     <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
-                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
-                                    </xsl:when>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">                        
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-					<xsl:choose>
-					<xsl:when test="$URLLinkText!=''">
-						<xsl:value-of select="$URLLinkText"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>Click here to access online</xsl:text>
-					</xsl:otherwise>
-					</xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                            <xsl:if test="$OPACURLOpenInNewWindow='1'">
-                                   <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                    <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
-                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
-                                    </xsl:when>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">                        
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-					<xsl:choose>
-					<xsl:when test="$URLLinkText!=''">
-						<xsl:value-of select="$URLLinkText"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>Click here to access online</xsl:text>
-					</xsl:otherwise>
-					</xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                                    <xsl:choose>
-                                    <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
-                                    <xsl:otherwise> | </xsl:otherwise>
-                                    </xsl:choose>
-                            </xsl:for-each>
-                            </span>
-                        </xsl:if>
-                        <span class="results_summary" id="availability">
-                        <span class="label">Availability: </span>
-                        <xsl:choose>
-				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-                        <xsl:choose>
-                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
-                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
-                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
-                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
-                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
-                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
-                                </xsl:call-template>
-                            </xsl:for-each>
-                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
-                            </xsl:when>
-                            <xsl:otherwise>No copies available </xsl:otherwise>
-                        </xsl:choose>
-				   </xsl:when>
-                   <xsl:when test="count(key('item-by-status', 'available'))>0">
-                   <span class="available">	
-		     <b>
-		       <xsl:value-of select="count(key('item-by-status', 'available'))"/>
-		       <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> Copy available for loan at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for loan at </xsl:text></xsl:otherwise></xsl:choose>
-		     </b>
-		     <xsl:variable name="available_items"
-				   select="key('item-by-status', 'available')"/>
-		     <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		       <xsl:value-of select="items:homebranch"/>
-		       <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-		     </xsl:for-each>
-                   </span>
-                   </xsl:when>
-				   </xsl:choose>
-
-                   <xsl:choose>
-                   <xsl:when test="count(key('item-by-status', 'reference'))>0">
-                   <span class="available">
-                       <b>
-		       <xsl:value-of select="count(key('item-by-status', 'reference'))"/>
-		       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> Copy available for reference at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for reference at </xsl:text></xsl:otherwise></xsl:choose>
-		     </b>
-		     <xsl:variable name="reference_items"
-                           select="key('item-by-status', 'reference')"/>
-                       <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-                           <xsl:value-of select="items:homebranch"/>
-                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-                   </span>
-                   </xsl:when>
-                   </xsl:choose>
-
-                   <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Checked out (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
-                       <xsl:text>). </xsl:text>
-				   </span>
-                   </xsl:if>
-                   <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Withdrawn (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Lost (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Damaged (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'On order'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On order (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'In transit'))>0">
-                   <span class="unavailable">
-                       <xsl:text>In transit (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On hold (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-               </span>
-	       <span class="results_summary" id="location"> 
-		 <span class="label">Location(s): </span>
-		 <xsl:variable name="available_items"
-			       select="key('item-by-status', 'available')"/>
-		 <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		   <xsl:value-of select="concat(items:location,' ')"/>
-		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
-		   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-		 </xsl:for-each>
-		 <xsl:choose><xsl:when test="count(key('item-by-status', 'available'))>0 and count(key('item-by-status', 'reference'))>0"><xsl:text> | </xsl:text></xsl:when></xsl:choose>		 
-		 <xsl:variable name="reference_items"
-			       select="key('item-by-status', 'reference')"/>
-		 <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		   <xsl:value-of select="concat(items:location,' ')"/>
-		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
-                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-
-	       </span>
-
-
-    </xsl:template>
+      <span class="results_summary">
+	<span class="label">Online Access: </span>
+	<xsl:for-each select="marc:datafield[@tag=856]">
+	  <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
+	  <xsl:if test="$OPACURLOpenInNewWindow='0'">
+	    <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+	    <xsl:choose>
+	      <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+		<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+	      </xsl:when>
+	      <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+		<xsl:call-template name="subfieldSelect">                        
+		  <xsl:with-param name="codes">y3z</xsl:with-param>                    
+		</xsl:call-template>
+	      </xsl:when>
+	      <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+		<xsl:choose>
+		  <xsl:when test="$URLLinkText!=''">
+		    <xsl:value-of select="$URLLinkText"/>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:text>Click here to access online</xsl:text>
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </xsl:when>
+	    </xsl:choose>
+	    </a>
+	  </xsl:if>
+	  <xsl:if test="$OPACURLOpenInNewWindow='1'">
+	    <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+	    <xsl:choose>
+	      <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+		<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+	      </xsl:when>
+	      <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+		<xsl:call-template name="subfieldSelect">                        
+		  <xsl:with-param name="codes">y3z</xsl:with-param>                    
+		</xsl:call-template>
+	      </xsl:when>
+	      <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+		<xsl:choose>
+		  <xsl:when test="$URLLinkText!=''">
+		    <xsl:value-of select="$URLLinkText"/>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:text>Click here to access online</xsl:text>
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </xsl:when>
+	    </xsl:choose>
+	    </a>
+	  </xsl:if>
+	  <xsl:choose>
+	    <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
+	    <xsl:otherwise> | </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:for-each>
+      </span>
+    </xsl:if>
+    <span class="results_summary" id="availability">
+      <span class="label">Availability: </span>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
+	  <xsl:choose>
+	    <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
+	      <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
+	      <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
+		<xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
+		  <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
+		  <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
+		</xsl:call-template>
+	      </xsl:for-each>
+	      (<xsl:value-of select="$AlternateHoldingsCount"/>)
+	    </xsl:when>
+	    <xsl:otherwise>No copies available </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:when>
+	<xsl:when test="count(key('item-by-status', 'available'))>0">
+	  <span class="available">	
+	    <b>
+	      <xsl:value-of select="count(key('item-by-status', 'available'))"/>
+	      <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> copy available for loan at </xsl:text></xsl:when>
+	      <xsl:otherwise><xsl:text> copies available for loan at </xsl:text></xsl:otherwise></xsl:choose>
+	    </b>
+	    <xsl:variable name="available_items"
+			  select="key('item-by-status', 'available')"/>
+	    <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <xsl:value-of select="items:homebranch"/>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'reference'))>0">
+	  <span class="available">
+	    <b>
+	      <xsl:value-of select="count(key('item-by-status', 'reference'))"/>
+	      <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> copy available for reference at </xsl:text></xsl:when>
+	      <xsl:otherwise><xsl:text> copies available for reference at </xsl:text></xsl:otherwise></xsl:choose>
+	    </b>
+	    <xsl:variable name="reference_items"
+			  select="key('item-by-status', 'reference')"/>
+	    <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <xsl:value-of select="items:homebranch"/>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      
+      <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
+	<span class="unavailable">
+	  <xsl:text>Checked out (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
+	  <xsl:text>). </xsl:text>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
+	<span class="unavailable">
+	  <xsl:text>Withdrawn (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
+	<span class="unavailable">
+	  <xsl:text>Lost (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
+	<span class="unavailable">
+	  <xsl:text>Damaged (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'On order'))>0">
+	<span class="unavailable">
+	  <xsl:text>On order (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'In transit'))>0">
+	<span class="unavailable">
+	  <xsl:text>In transit (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
+	<span class="unavailable">
+	  <xsl:text>On hold (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+    </span>
+    
+    <span class="results_summary" id="location"> 
+      <span class="label">Location(s): </span>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'available'))>0">
+	  <span class="available">	
+	    <xsl:variable name="available_items"
+			  select="key('item-by-status', 'available')"/>
+	    <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'reference'))>0">
+	  <span class="available">
+	    <xsl:variable name="reference_items"
+			  select="key('item-by-status', 'reference')"/>
+	    <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="checkedout_items"
+			select="key('item-by-status', 'Checked out')"/>
+	  <xsl:for-each select="$checkedout_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="withdrawn_items"
+			select="key('item-by-status', 'Withdrawn')"/>
+	  <xsl:for-each select="$withdrawn_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="lost_items"
+			select="key('item-by-status', 'Lost')"/>
+	  <xsl:for-each select="$lost_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="damaged_items"
+			select="key('item-by-status', 'Damaged')"/>
+	  <xsl:for-each select="$damaged_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'On order'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="onorder_items"
+			select="key('item-by-status', 'On order')"/>
+	  <xsl:for-each select="$onorder_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'In transit'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="intransit_items"
+			select="key('item-by-status', 'In transit')"/>	       
+	  <xsl:for-each select="$intransit_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="waiting_items"
+			select="key('item-by-status', 'Waiting')"/>
+	  <xsl:for-each select="$waiting_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+    </span>
+  </xsl:template>
 
-    <xsl:template name="nameABCDQ">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">aq</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="punctuation">
-                    <xsl:text>:,;/ </xsl:text>
-                </xsl:with-param>
-            </xsl:call-template>
-        <xsl:call-template name="termsOfAddress"/>
-    </xsl:template>
+  <xsl:template name="nameABCDQ">
+    <xsl:call-template name="chopPunctuation">
+      <xsl:with-param name="chopString">
+	<xsl:call-template name="subfieldSelect">
+	  <xsl:with-param name="codes">aq</xsl:with-param>
+	</xsl:call-template>
+      </xsl:with-param>
+      <xsl:with-param name="punctuation">
+	<xsl:text>:,;/ </xsl:text>
+      </xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="termsOfAddress"/>
+  </xsl:template>
 
-    <xsl:template name="nameABCDN">
-        <xsl:for-each select="marc:subfield[@code='a']">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="."/>
-                </xsl:call-template>
-        </xsl:for-each>
-        <xsl:for-each select="marc:subfield[@code='b']">
-                <xsl:value-of select="."/>
-        </xsl:for-each>
-        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
-                <xsl:call-template name="subfieldSelect">
-                    <xsl:with-param name="codes">cdn</xsl:with-param>
-                </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="nameABCDN">
+    <xsl:for-each select="marc:subfield[@code='a']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="."/>
+      </xsl:call-template>
+    </xsl:for-each>
+    <xsl:for-each select="marc:subfield[@code='b']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+    <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
+      <xsl:call-template name="subfieldSelect">
+	<xsl:with-param name="codes">cdn</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="nameACDEQ">
-            <xsl:call-template name="subfieldSelect">
-                <xsl:with-param name="codes">acdeq</xsl:with-param>
-            </xsl:call-template>
-    </xsl:template>
+  <xsl:template name="nameACDEQ">
+    <xsl:call-template name="subfieldSelect">
+      <xsl:with-param name="codes">acdeq</xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 
-    <xsl:template name="termsOfAddress">
-        <xsl:if test="marc:subfield[@code='b' or @code='c']">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">bc</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:with-param>
-            </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="termsOfAddress">
+    <xsl:if test="marc:subfield[@code='b' or @code='c']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">bc</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="nameDate">
-        <xsl:for-each select="marc:subfield[@code='d']">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString" select="."/>
-            </xsl:call-template>
-        </xsl:for-each>
-    </xsl:template>
+  <xsl:template name="nameDate">
+    <xsl:for-each select="marc:subfield[@code='d']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="."/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </xsl:template>
 
-    <xsl:template name="role">
-        <xsl:for-each select="marc:subfield[@code='e']">
-                    <xsl:value-of select="."/>
-        </xsl:for-each>
-        <xsl:for-each select="marc:subfield[@code='4']">
-                    <xsl:value-of select="."/>
-        </xsl:for-each>
-    </xsl:template>
+  <xsl:template name="role">
+    <xsl:for-each select="marc:subfield[@code='e']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+    <xsl:for-each select="marc:subfield[@code='4']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+  </xsl:template>
 
-    <xsl:template name="specialSubfieldSelect">
-        <xsl:param name="anyCodes"/>
-        <xsl:param name="axis"/>
-        <xsl:param name="beforeCodes"/>
-        <xsl:param name="afterCodes"/>
-        <xsl:variable name="str">
-            <xsl:for-each select="marc:subfield">
-                <xsl:if test="contains($anyCodes, @code) or (contains($beforeCodes, at code) and following-sibling::marc:subfield[@code=$axis]) or (contains($afterCodes, at code) and preceding-sibling::marc:subfield[@code=$axis])">
-                    <xsl:value-of select="text()"/>
-                    <xsl:text> </xsl:text>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:variable>
-        <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-    </xsl:template>
+  <xsl:template name="specialSubfieldSelect">
+    <xsl:param name="anyCodes"/>
+    <xsl:param name="axis"/>
+    <xsl:param name="beforeCodes"/>
+    <xsl:param name="afterCodes"/>
+    <xsl:variable name="str">
+      <xsl:for-each select="marc:subfield">
+	<xsl:if test="contains($anyCodes, @code) or (contains($beforeCodes, at code) and following-sibling::marc:subfield[@code=$axis]) or (contains($afterCodes, at code) and preceding-sibling::marc:subfield[@code=$axis])">
+	  <xsl:value-of select="text()"/>
+	  <xsl:text> </xsl:text>
+	</xsl:if>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+  </xsl:template>
 
-    <xsl:template name="subtitle">
-        <xsl:if test="marc:subfield[@code='b']">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString">
-                        <xsl:value-of select="marc:subfield[@code='b']"/>
+  <xsl:template name="subtitle">
+    <xsl:if test="marc:subfield[@code='b']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:subfield[@code='b']"/>
 
-                        <!--<xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">b</xsl:with-param>                                 
-                        </xsl:call-template>-->
-                    </xsl:with-param>
-                </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+	  <!--<xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">b</xsl:with-param>                                 
+	      </xsl:call-template>-->
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="chopBrackets">
-        <xsl:param name="chopString"></xsl:param>
-        <xsl:variable name="string">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="substring($string, 1,1)='['">
-            <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
-        </xsl:if>
-        <xsl:if test="substring($string, 1,1)!='['">
-            <xsl:value-of select="$string"></xsl:value-of>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="chopBrackets">
+    <xsl:param name="chopString"></xsl:param>
+    <xsl:variable name="string">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="substring($string, 1,1)='['">
+      <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
+    </xsl:if>
+    <xsl:if test="substring($string, 1,1)!='['">
+      <xsl:value-of select="$string"></xsl:value-of>
+    </xsl:if>
+  </xsl:template>
 
 </xsl:stylesheet>
-- 
1.7.2.3