[Koha-cvs] koha admin/aqbookfund.pl admin/aqbudget.pl admi...
Antoine Farnault
antoine at koha-fr.org
Tue Jul 4 16:36:53 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: Antoine Farnault <toins> 06/07/04 14:36:52
Modified files:
admin : aqbookfund.pl aqbudget.pl
auth_subfields_structure.pl
auth_tag_structure.pl authorised_values.pl
authtypes.pl biblio_framework.pl branches.pl
categorie.pl categoryitem.pl checkmarc.pl
currency.pl issuingrules.pl itemtypes.pl
koha2marclinks.pl marc_subfields_structure.pl
marctagstructure.pl printers.pl thesaurus.pl
z3950servers.pl
authorities : auth_finder.pl authorities-home.pl
authorities.pl blinddetail-biblio-search.pl
detail-biblio-search.pl detail.pl
barcodes : barcodes.pl printerConfig.pl
bookshelves : addbookbybiblionumber.pl shelves.pl
C4 : Acquisition.pm Auth.pm AuthoritiesMarc.pm
Biblio.pm Bull.pm Context.pm Input.pm
Members.pm Output.pm SearchMarc.pm
Suggestions.pm
circ : branchtransfers.pl reserve.pl returns.pl
selectbranchprinter.pl
export : marc.pl
import : breeding.pl
maint : catmaintain.pl
members : deletemem.pl member-flags.pl member-password.pl
member.pl memberentry.pl members-home.pl
moremember.pl setdebar.pl
misc : Install.pm
opac : opac-MARCdetail.pl
opac-addbookbybiblionumber.pl
opac-dictionary.pl opac-main.pl
opac-moredetail.pl opac-passwd.pl
opac-search.pl opac-searchresults.pl
opac-suggestions.pl
reports : acquisitions_stats.pl bor_issues_top.pl
borrowers_out.pl borrowers_stats.pl
cat_issues_top.pl catalogue_out.pl inventory.pl
issues_avg_stats.pl issues_stats.pl manager.pl
reports-home.pl
search.marc : dictionary.pl search.pl suggest.pl
suggestion : acceptorreject.pl
updater : updatedatabase
value_builder : marc21_leader.pl unimarc_field_4XX.pl
z3950 : processz3950queue search.pl
Log message:
Head & rel_2_2 merged
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/aqbookfund.pl?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/admin/aqbudget.pl?cvsroot=koha&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_tag_structure.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/admin/authorised_values.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/admin/authtypes.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/admin/biblio_framework.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/admin/branches.pl?cvsroot=koha&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/koha/admin/categorie.pl?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/admin/categoryitem.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/admin/checkmarc.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/admin/currency.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/admin/issuingrules.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/admin/itemtypes.pl?cvsroot=koha&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/koha/admin/koha2marclinks.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marc_subfields_structure.pl?cvsroot=koha&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marctagstructure.pl?cvsroot=koha&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/koha/admin/printers.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/admin/thesaurus.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/admin/z3950servers.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/auth_finder.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities-home.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/blinddetail-biblio-search.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail-biblio-search.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/barcodes.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/printerConfig.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/addbookbybiblionumber.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/shelves.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Input.pm?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Output.pm?cvsroot=koha&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/koha/C4/SearchMarc.pm?cvsroot=koha&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Suggestions.pm?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/koha/circ/selectbranchprinter.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/export/marc.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/import/breeding.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/maint/catmaintain.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-flags.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-password.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/member.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/koha/members/members-home.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/koha/members/setdebar.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-addbookbybiblionumber.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-dictionary.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-moredetail.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-passwd.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-searchresults.pl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-suggestions.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/reports/acquisitions_stats.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/reports/bor_issues_top.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_out.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_stats.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/reports/cat_issues_top.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/reports/catalogue_out.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/inventory.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_avg_stats.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_stats.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/reports/manager.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/reports-home.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/dictionary.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/search.pl?cvsroot=koha&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/suggest.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/suggestion/acceptorreject.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/koha/value_builder/marc21_leader.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/value_builder/unimarc_field_4XX.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/processz3950queue?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&r1=1.5&r2=1.6
Patches:
Index: admin/aqbookfund.pl
===================================================================
RCS file: /sources/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- admin/aqbookfund.pl 13 Apr 2006 08:36:42 -0000 1.26
+++ admin/aqbookfund.pl 4 Jul 2006 14:36:51 -0000 1.27
@@ -366,5 +366,8 @@
)
);
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/aqbudget.pl
===================================================================
RCS file: /sources/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- admin/aqbudget.pl 13 Apr 2006 08:36:42 -0000 1.20
+++ admin/aqbudget.pl 4 Jul 2006 14:36:51 -0000 1.21
@@ -425,6 +425,9 @@
)
);
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/auth_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin/auth_subfields_structure.pl 19 May 2006 18:02:09 -0000 1.6
+++ admin/auth_subfields_structure.pl 4 Jul 2006 14:36:51 -0000 1.7
@@ -147,6 +147,7 @@
},
-default=>$data->{'tab'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
@@ -195,6 +196,7 @@
-values=> \@authorised_values,
-default=>$data->{'authorised_value'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder',
@@ -202,6 +204,7 @@
-values=> \@value_builder,
-default=>$data->{'value_builder'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
@@ -242,6 +245,7 @@
},
-default=>"",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
@@ -306,6 +310,7 @@
-id => 'authorised_value',
-values=> \@authorised_values,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{link} = CGI::checkbox( -name => "link",
@@ -321,7 +326,7 @@
$template->param('use-heading-flags-p' => 1);
$template->param('heading-edit-subfields-p' => 1);
$template->param(action => "Edit subfields",
- tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
+ tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />$tagfield",
loop => \@loop_data,
more_subfields => $more_subfields,
more_tag => $tagfield);
Index: admin/auth_tag_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin/auth_tag_structure.pl 19 May 2006 18:02:09 -0000 1.5
+++ admin/auth_tag_structure.pl 4 Jul 2006 14:36:51 -0000 1.6
@@ -118,6 +118,7 @@
my $authorised_value = CGI::scrolling_list(-name=>'authorised_value',
-values=> \@authorised_values,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
-default => $data->{'authorised_value'},
);
@@ -210,13 +211,13 @@
}
my $env;
my ($count,$results)=StringSearch($env,$searchfield,$authtypecode);
- my $toggle="white";
+ my $toggle=1;
my @loop_data = ();
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
- if ($toggle eq 'white'){
- $toggle="#ffffcc";
+ if ($toggle eq 1){
+ $toggle=0;
} else {
- $toggle="white";
+ $toggle=1;
}
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
@@ -227,7 +228,7 @@
$row_data{subfield_link} ="auth_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
$row_data{edit} = "$script_name?op=add_form&searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
- $row_data{bgcolor} = $toggle;
+ $row_data{toggle} = $toggle;
push(@loop_data, \%row_data);
}
$template->param(loop => \@loop_data,
@@ -250,7 +251,12 @@
}
} #---- END $OP eq DEFAULT
-$template->param(loggeninuser => $loggedinuser);
+$template->param(loggeninuser => $loggedinuser,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
+
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/authorised_values.pl
===================================================================
RCS file: /sources/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/authorised_values.pl 24 Feb 2006 11:15:01 -0000 1.16
+++ admin/authorised_values.pl 4 Jul 2006 14:36:51 -0000 1.17
@@ -157,6 +157,7 @@
-values=> \@category_list,
-default=>"",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
if (!$searchfield) {
@@ -202,5 +203,8 @@
);
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/authtypes.pl
===================================================================
RCS file: /sources/koha/koha/admin/authtypes.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/authtypes.pl 24 Feb 2006 11:15:01 -0000 1.4
+++ admin/authtypes.pl 4 Jul 2006 14:36:51 -0000 1.5
@@ -171,6 +171,10 @@
$template->param(next => "$script_name?offset=".$nextpage);
}
} #---- END $OP eq DEFAULT
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
# Local Variables:
Index: admin/biblio_framework.pl
===================================================================
RCS file: /sources/koha/koha/admin/biblio_framework.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/biblio_framework.pl 24 Feb 2006 11:15:01 -0000 1.3
+++ admin/biblio_framework.pl 4 Jul 2006 14:36:51 -0000 1.4
@@ -170,6 +170,10 @@
$template->param(next => "$script_name?offset=".$nextpage);
}
} #---- END $OP eq DEFAULT
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
# Local Variables:
Index: admin/branches.pl
===================================================================
RCS file: /sources/koha/koha/admin/branches.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- admin/branches.pl 12 Jun 2006 09:38:52 -0000 1.33
+++ admin/branches.pl 4 Jul 2006 14:36:51 -0000 1.34
@@ -558,7 +558,10 @@
}
return $message;
}
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
# Local Variables:
Index: admin/categorie.pl
===================================================================
RCS file: /sources/koha/koha/admin/categorie.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- admin/categorie.pl 7 Jun 2006 02:42:51 -0000 1.22
+++ admin/categorie.pl 4 Jul 2006 14:36:51 -0000 1.23
@@ -211,6 +211,9 @@
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/categoryitem.pl
===================================================================
RCS file: /sources/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- admin/categoryitem.pl 24 Feb 2006 11:15:01 -0000 1.10
+++ admin/categoryitem.pl 4 Jul 2006 14:36:51 -0000 1.11
@@ -193,7 +193,10 @@
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/checkmarc.pl
===================================================================
RCS file: /sources/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- admin/checkmarc.pl 24 Feb 2006 11:15:01 -0000 1.8
+++ admin/checkmarc.pl 4 Jul 2006 14:36:51 -0000 1.9
@@ -185,5 +185,9 @@
$total++;
}
-$template->param(total => $total);
+$template->param(total => $total,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/currency.pl
===================================================================
RCS file: /sources/koha/koha/admin/currency.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- admin/currency.pl 24 Feb 2006 11:15:01 -0000 1.12
+++ admin/currency.pl 4 Jul 2006 14:36:51 -0000 1.13
@@ -194,6 +194,9 @@
nextpage => $offset+$pagesize);
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/issuingrules.pl
===================================================================
RCS file: /sources/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- admin/issuingrules.pl 7 Jun 2006 03:00:48 -0000 1.7
+++ admin/issuingrules.pl 4 Jul 2006 14:36:51 -0000 1.8
@@ -186,5 +186,9 @@
$template->param(title => \@title_loop,
row => \@row_loop,
branchloop => \@branchloop,
- branch => $branch);
+ branch => $branch,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/itemtypes.pl
===================================================================
RCS file: /sources/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- admin/itemtypes.pl 7 Apr 2006 11:13:15 -0000 1.23
+++ admin/itemtypes.pl 4 Jul 2006 14:36:51 -0000 1.24
@@ -250,6 +250,10 @@
)
);
} #---- END $OP eq DEFAULT
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
# Local Variables:
Index: admin/koha2marclinks.pl
===================================================================
RCS file: /sources/koha/koha/admin/koha2marclinks.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- admin/koha2marclinks.pl 24 Feb 2006 11:15:01 -0000 1.12
+++ admin/koha2marclinks.pl 4 Jul 2006 14:36:51 -0000 1.13
@@ -74,6 +74,7 @@
-values=> \@marcarray,
-default=>"$defaulttagfield $defaulttagsubfield - $defaultliblibrarian",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$template->param("marclist$i" => $marclist);
@@ -131,9 +132,13 @@
-values=>['biblio','biblioitems','items','bibliosubject','bibliosubtitle','additionalauthors'],
-default=>$tablename,
-size=>1,
+ -tabindex=>'',
-multiple=>0
)
);
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/marc_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- admin/marc_subfields_structure.pl 24 Feb 2006 11:15:01 -0000 1.37
+++ admin/marc_subfields_structure.pl 4 Jul 2006 14:36:51 -0000 1.38
@@ -172,6 +172,7 @@
},
-default=>$data->{'tab'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
@@ -183,6 +184,7 @@
-values=> \@kohafields,
-default=> "$data->{'kohafield'}",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value',
@@ -190,6 +192,7 @@
-values=> \@authorised_values,
-default=>$data->{'authorised_value'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder',
@@ -197,6 +200,7 @@
-values=> \@value_builder,
-default=>$data->{'value_builder'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode',
@@ -204,27 +208,27 @@
-values=> \@authtypes,
-default=>$data->{'authtypecode'},
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-checked => $data->{'repeatable'}?'checked':'',
-value => 1,
+ -tabindex=>'',
-label => '',
-id => "repeatable$i");
$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-checked => $data->{'mandatory'}?'checked':'',
-value => 1,
+ -tabindex=>'',
-label => '',
-id => "mandatory$i");
- $row_data{hidden} = CGI::checkbox( -name=>"hidden$i",
- -id => "hidden$i",
- -checked => $data->{'hidden'}?'checked':'',
- -value => 1,
- -label => '');
+ $row_data{hidden} = CGI::escapeHTML($data->{hidden});
$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-id => "isurl$i",
-checked => $data->{'isurl'}?'checked':'',
-value => 1,
+ -tabindex=>'',
-label => '');
$row_data{row} = $i;
$row_data{toggle} = $toggle;
@@ -245,49 +249,52 @@
},
-default=>"",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
$row_data{seealso} = "";
+ $row_data{hidden} = "";
$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-id => "repeatable$i",
-checked => '',
-value => 1,
+ -tabindex=>'',
-label => '');
$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-id => "mandatory$i",
-checked => '',
-value => 1,
- -label => '');
- $row_data{hidden} = CGI::checkbox( -name => 'hidden',
- -id => "hidden$i",
- -checked=> '',
- -value => 1,
+ -tabindex=>'',
-label => '');
$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-id => "isurl$i",
-checked => '',
-value => 1,
+ -tabindex=>'',
-label => '');
$row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
-id => "kohafield$i",
-values=> \@kohafields,
-default=> "",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value',
-id => 'authorised_value',
-values=> \@authorised_values,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode',
-id => 'authtypecode',
-values=> \@authtypes,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
$row_data{link} = CGI::escapeHTML($data->{'link'});
@@ -317,6 +324,7 @@
my @kohafield = $input->param('kohafield');
my @tab = $input->param('tab');
my @seealso = $input->param('seealso');
+ my @hidden = $input->param('hidden');
my @authorised_values = $input->param('authorised_value');
my @authtypecodes = $input->param('authtypecode');
my @value_builder =$input->param('value_builder');
@@ -335,7 +343,7 @@
my $authorised_value =$authorised_values[$i];
my $authtypecode =$authtypecodes[$i];
my $value_builder=$value_builder[$i];
- my $hidden = $input->param("hidden$i")?1:0;
+ my $hidden = $hidden[$i]; #input->param("hidden$i");
my $isurl = $input->param("isurl$i")?1:0;
my $link = $link[$i];
if ($liblibrarian) {
@@ -444,5 +452,8 @@
$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/marctagstructure.pl
===================================================================
RCS file: /sources/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- admin/marctagstructure.pl 24 Feb 2006 11:15:01 -0000 1.31
+++ admin/marctagstructure.pl 4 Jul 2006 14:36:51 -0000 1.32
@@ -119,6 +119,7 @@
my $authorised_value = CGI::scrolling_list(-name=>'authorised_value',
-values=> \@authorised_values,
-size=>1,
+ -tabindex=>'',
-id=>"authorised_value",
-multiple=>0,
-default => $data->{'authorised_value'},
@@ -138,11 +139,13 @@
repeatable => CGI::checkbox(-name=>'repeatable',
-checked=> $data->{'repeatable'}?'checked':'',
-value=> 1,
+ -tabindex=>'',
-label => '',
-id=> 'repeatable'),
mandatory => CGI::checkbox(-name => 'mandatory',
-checked => $data->{'mandatory'}?'checked':'',
-value => 1,
+ -tabindex=>'',
-label => '',
-id => 'mandatory'),
authorised_value => $authorised_value,
@@ -332,7 +335,11 @@
}
} #---- END $OP eq DEFAULT
-$template->param(loggeninuser => $loggedinuser);
+$template->param(loggeninuser => $loggedinuser,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/printers.pl
===================================================================
RCS file: /sources/koha/koha/admin/printers.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- admin/printers.pl 24 Feb 2006 11:15:01 -0000 1.12
+++ admin/printers.pl 4 Jul 2006 14:36:51 -0000 1.13
@@ -181,6 +181,9 @@
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/thesaurus.pl
===================================================================
RCS file: /sources/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- admin/thesaurus.pl 24 Feb 2006 11:15:01 -0000 1.12
+++ admin/thesaurus.pl 4 Jul 2006 14:36:51 -0000 1.13
@@ -153,6 +153,7 @@
-values=> \@category_list,
-default=>"$search_category",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
if (!$search_category) {
@@ -201,6 +202,7 @@
-values=> \@category_list,
-default=>"$search_category",
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
if (!$search_category) {
@@ -263,5 +265,8 @@
$template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage");
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: admin/z3950servers.pl
===================================================================
RCS file: /sources/koha/koha/admin/z3950servers.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- admin/z3950servers.pl 24 Feb 2006 11:15:01 -0000 1.11
+++ admin/z3950servers.pl 4 Jul 2006 14:36:51 -0000 1.12
@@ -200,5 +200,8 @@
nextpage => $offset+$pagesize);
}
} #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: authorities/auth_finder.pl
===================================================================
RCS file: /sources/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- authorities/auth_finder.pl 4 Aug 2005 12:13:35 -0000 1.9
+++ authorities/auth_finder.pl 4 Jul 2006 14:36:51 -0000 1.10
@@ -37,7 +37,7 @@
my $op = $query->param('op');
my $authtypecode = $query->param('authtypecode');
my $index = $query->param('index');
-# my $category = $query->param('category');
+my $tagid=$query->param('tagid');
my $resultstring = $query->param('result');
my $dbh = C4::Context->dbh;
@@ -133,6 +133,7 @@
startfromnext => $startfrom+1,
startfromprev => $startfrom-1,
index => $index,
+ tagid => $tagid,
searchdata=>\@field_data,
total=>$total,
from=>$from,
@@ -152,12 +153,17 @@
});
$template->param(index=>$query->param('index')."",
+ tagid => $tagid,
resultstring => $resultstring,
);
}
$template->param(authtypesloop => \@authtypesloop,
- authtypecode => $authtypecode);
+ authtypecode => $authtypecode,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
Index: authorities/authorities-home.pl
===================================================================
RCS file: /sources/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- authorities/authorities-home.pl 4 Apr 2006 10:05:48 -0000 1.12
+++ authorities/authorities-home.pl 4 Jul 2006 14:36:51 -0000 1.13
@@ -193,6 +193,7 @@
my $marclist = create_scrolling_list({name=>"marclist",
values=> $marcarray,
size=> 1,
+ -tabindex=>'',
default=>$marcfields[$i],
onChange => "sql_update()"}
);
@@ -226,6 +227,7 @@
my $marclist = create_scrolling_list({name=>"marclist",
values=> $marcarray,
size=>1,
+ -tabindex=>'',
onChange => "sql_update()"});
push @statements, {"marclist" => $marclist };
@@ -245,7 +247,11 @@
}
-$template->param(authtypesloop => \@authtypesloop);
+$template->param(authtypesloop => \@authtypesloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
Index: authorities/authorities.pl
===================================================================
RCS file: /sources/koha/koha/authorities/authorities.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- authorities/authorities.pl 19 May 2006 18:04:17 -0000 1.14
+++ authorities/authorities.pl 4 Jul 2006 14:36:51 -0000 1.15
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: authorities.pl,v 1.14 2006/05/19 18:04:17 tgarip1957 Exp $
+# $Id: authorities.pl,v 1.15 2006/07/04 14:36:51 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -128,6 +128,7 @@
-labels => \%authorised_lib,
-override => 1,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
}
@@ -488,5 +489,9 @@
$template->param(authtypesloop => \@authtypesloop,
authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
- nonav=>$nonav,);
+ hide_marc => C4::Context->preference('hide_marc'),
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: authorities/blinddetail-biblio-search.pl
===================================================================
RCS file: /sources/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- authorities/blinddetail-biblio-search.pl 26 Oct 2005 09:11:50 -0000 1.6
+++ authorities/blinddetail-biblio-search.pl 4 Jul 2006 14:36:51 -0000 1.7
@@ -57,6 +57,7 @@
my $authid = $query->param('authid');
my $index = $query->param('index');
+my $tagid = $query->param('tagid');
my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
@@ -135,6 +136,11 @@
$template->param(authid => $authid?$authid:"",
# authtypesloop => \@authtypesloop,
- index => $index);
+ index => $index,
+ tagid => $tagid,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
Index: authorities/detail-biblio-search.pl
===================================================================
RCS file: /sources/koha/koha/authorities/detail-biblio-search.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- authorities/detail-biblio-search.pl 5 Jul 2004 13:30:33 -0000 1.1
+++ authorities/detail-biblio-search.pl 4 Jul 2006 14:36:51 -0000 1.2
@@ -179,6 +179,10 @@
}
$template->param(authid => $authid,
- authtypesloop => \@authtypesloop, index => $index);
+ authtypesloop => \@authtypesloop, index => $index,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
Index: authorities/detail.pl
===================================================================
RCS file: /sources/koha/koha/authorities/detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- authorities/detail.pl 20 Jun 2005 13:17:56 -0000 1.3
+++ authorities/detail.pl 4 Jul 2006 14:36:51 -0000 1.4
@@ -144,6 +144,10 @@
count => $count,
biblio_fields => $biblio_fields,
authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
- authtypesloop => \@authtypesloop);
+ authtypesloop => \@authtypesloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
Index: barcodes/barcodes.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/barcodes.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- barcodes/barcodes.pl 26 Oct 2005 09:11:50 -0000 1.4
+++ barcodes/barcodes.pl 4 Jul 2006 14:36:51 -0000 1.5
@@ -139,5 +139,9 @@
} else {
$template->param(ERROR => 0);
}
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
# Shows the template with the real values replaced
output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
Index: barcodes/printerConfig.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/printerConfig.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- barcodes/printerConfig.pl 20 Sep 2004 15:03:27 -0000 1.2
+++ barcodes/printerConfig.pl 4 Jul 2006 14:36:51 -0000 1.3
@@ -113,4 +113,8 @@
$template->param(MARGIN_LEFT => $labelConfig{'marginLeft'});
$template->param(SCRIPT_NAME => '/cgi-bin/koha/barcodes/printerConfig.pl');
$template->param("$labelConfig{'pageType'}" => 1);
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
Index: bookshelves/addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- bookshelves/addbookbybiblionumber.pl 15 Dec 2004 17:28:22 -0000 1.3
+++ bookshelves/addbookbybiblionumber.pl 4 Jul 2006 14:36:51 -0000 1.4
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v 1.3 2004/12/15 17:28:22 tipaul Exp $
+# $Header: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v 1.4 2006/07/04 14:36:51 toins Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -70,17 +70,37 @@
-values => \@shelvesloop,
-labels => \%shelvesloop,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
$template->param(biblionumber => $biblionumber,
title => $biblios[0]->{'title'},
author => $biblios[0]->{'author'},
CGIbookshelves => $CGIbookshelves,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: addbookbybiblionumber.pl,v $
+# Revision 1.4 2006/07/04 14:36:51 toins
+# Head & rel_2_2 merged
+#
+# Revision 1.3.2.4 2006/06/20 16:21:42 oleonard
+# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098
+#
+# Revision 1.3.2.3 2006/02/05 21:59:21 kados
+# Adds script support for IntranetNav ... see mail to koha-devel for
+# details
+#
+# Revision 1.3.2.2 2006/02/05 21:45:25 kados
+# Adds support for intranetstylesheet system pref in Koha scripts
+#
+# Revision 1.3.2.1 2006/02/04 21:26:47 kados
+# Adds support for intranetcolorstylesheet
+#
# Revision 1.3 2004/12/15 17:28:22 tipaul
# adding bookshelf features :
# * create bookshelf on the fly
Index: bookshelves/shelves.pl
===================================================================
RCS file: /sources/koha/koha/bookshelves/shelves.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- bookshelves/shelves.pl 4 Aug 2005 13:19:54 -0000 1.8
+++ bookshelves/shelves.pl 4 Jul 2006 14:36:51 -0000 1.9
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/bookshelves/shelves.pl,v 1.8 2005/08/04 13:19:54 tipaul Exp $
+# $Header: /sources/koha/koha/bookshelves/shelves.pl,v 1.9 2006/07/04 14:36:51 toins Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -108,7 +108,11 @@
;
push (@shelvesloop, \%line);
}
-$template->param(shelvesloop => \@shelvesloop);
+$template->param(shelvesloop => \@shelvesloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
@@ -190,8 +194,18 @@
#
# $Log: shelves.pl,v $
-# Revision 1.8 2005/08/04 13:19:54 tipaul
-# synch'ing 2.2 and head
+# Revision 1.9 2006/07/04 14:36:51 toins
+# Head & rel_2_2 merged
+#
+# Revision 1.5.2.5 2006/02/05 21:59:21 kados
+# Adds script support for IntranetNav ... see mail to koha-devel for
+# details
+#
+# Revision 1.5.2.4 2006/02/05 21:45:25 kados
+# Adds support for intranetstylesheet system pref in Koha scripts
+#
+# Revision 1.5.2.3 2006/02/04 21:26:47 kados
+# Adds support for intranetcolorstylesheet
#
# Revision 1.5.2.2 2005/04/27 18:15:27 oleonard
# Left out some instances in the previous update
Index: C4/Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- C4/Acquisition.pm 22 Jun 2006 08:43:07 -0000 1.34
+++ C4/Acquisition.pm 4 Jul 2006 14:36:51 -0000 1.35
@@ -29,7 +29,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.34 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.35 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
# used in reciveorder subroutine
# to provide library specific handling
@@ -670,7 +670,48 @@
return ( scalar(@results), @results );
}
+=item getparcelinformation
+
+ ($count, @results) = &getparcelinformation($booksellerid, $code, $date);
+
+Looks up all of the received items from the supplier with the given
+bookseller ID at the given date, for the given code. Ignores cancelled and completed orders.
+
+C<$count> is the number of elements in C<@results>. C<@results> is an
+array of references-to-hash. The keys of each element are fields from
+the aqorders, biblio, and biblioitems tables of the Koha database.
+
+C<@results> is sorted alphabetically by book title.
+
+=cut
+#'
+sub getparcelinformation {
+ #gets all orders from a certain supplier, orders them alphabetically
+ my ($supplierid,$code, $datereceived)=@_;
+ my $dbh = C4::Context->dbh;
+ my @results = ();
+ $code .='%' if $code; # add % if we search on a given code (otherwise, let him empty)
+ my $strsth ="Select authorisedby,creationdate,aqbasket.basketno,closedate,surname,firstname,aqorders.biblionumber,aqorders.title,aqorders.ordernumber, aqorders.quantity, aqorders.quantityreceived, aqorders.unitprice, aqorders.listprice, aqorders.rrp, aqorders.ecost from aqorders,aqbasket left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber where aqbasket.basketno=aqorders.basketno and aqbasket.booksellerid=? and aqorders.booksellerinvoicenumber like \"$code\" and aqorders.datereceived= \'$datereceived\'";
+ if (C4::Context->preference("IndependantBranches")) {
+ my $userenv = C4::Context->userenv;
+ if (($userenv) &&($userenv->{flags} != 1)){
+ $strsth .= " and (borrowers.branchcode = '".$userenv->{branch}."' or borrowers.branchcode ='')";
+ }
+ }
+ $strsth.=" order by aqbasket.basketno";
+ ### parcelinformation : $strsth
+ my $sth=$dbh->prepare($strsth);
+ $sth->execute($supplierid);
+ while (my $data=$sth->fetchrow_hashref){
+ push(@results,$data);
+ }
+ my $count =scalar(@results);
+ ### countparcelbiblio: $count
+ $sth->finish;
+
+ return(scalar(@results), at results);
+}
=item getsupplierlistwithlateorders
%results = &getsupplierlistwithlateorders;
@@ -1328,25 +1369,17 @@
contemail=?,contnotes=?,active=?,
listprice=?, invoiceprice=?,gstreg=?, listincgst=?,
invoiceincgst=?, specialty=?,discount=?,invoicedisc=?,
- nocalc=?
- where id=?"
- );
- $sth->execute(
- $data->{'name'}, $data->{'address1'},
- $data->{'address2'}, $data->{'address3'},
- $data->{'address4'}, $data->{'postal'},
- $data->{'phone'}, $data->{'fax'},
- $data->{'url'}, $data->{'contact'},
- $data->{'contpos'}, $data->{'contphone'},
- $data->{'contfax'}, $data->{'contaltphone'},
- $data->{'contemail'}, $data->{'contnote'},
- $data->{'active'}, $data->{'listprice'},
- $data->{'invoiceprice'}, $data->{'gstreg'},
- $data->{'listincgst'}, $data->{'invoiceincgst'},
- $data->{'specialty'}, $data->{'discount'},
- $data->{'invoicedisc'}, $data->{'nocalc'},
- $data->{'id'}
- );
+ nocalc=?, notes=?
+ where id=?");
+ $sth->execute($data->{'name'},$data->{'address1'},$data->{'address2'},
+ $data->{'address3'},$data->{'address4'},$data->{'postal'},$data->{'phone'},
+ $data->{'fax'},$data->{'url'},$data->{'contact'},$data->{'contpos'},
+ $data->{'contphone'},$data->{'contfax'},$data->{'contaltphone'},
+ $data->{'contemail'},
+ $data->{'contnotes'},$data->{'active'},$data->{'listprice'},
+ $data->{'invoiceprice'},$data->{'gstreg'},$data->{'listincgst'},
+ $data->{'invoiceincgst'},$data->{'specialty'},$data->{'discount'},
+ $data->{'invoicedisc'},$data->{'nocalc'},$data->{'notes'},$data->{'id'});
$sth->finish;
}
@@ -1420,6 +1453,42 @@
return ( scalar(@results), @results );
}
+=item getparcels
+
+ ($count, $results) = &getparcels($dbh, $bookseller, $order, $limit);
+
+get a lists of parcels
+Returns the count of parcels returned and a pointer on a hash list containing parcel informations as such :
+ Creation date
+ Last operation
+ Number of biblio
+ Number of items
+
+
+=cut
+#'
+sub getparcels {
+ my ($bookseller, $order, $code,$datefrom,$dateto, $limit)=@_;
+ my $dbh = C4::Context->dbh;
+ my $strsth = "SELECT aqorders.booksellerinvoicenumber, datereceived, count(DISTINCT biblionumber) as biblio, sum(quantity) as itemsexpected, sum(quantityreceived) as itemsreceived from aqorders, aqbasket where aqbasket.basketno = aqorders.basketno and aqbasket.booksellerid = $bookseller and datereceived is not null ";
+ $strsth .= "and aqorders.booksellerinvoicenumber like \"$code%\" " if ($code);
+ $strsth .= "and datereceived >=".$dbh->quote($datefrom)." " if ($datefrom);
+ $strsth .= "and datereceived <=".$dbh->quote($dateto)." " if ($dateto);
+ $strsth .= "group by aqorders.booksellerinvoicenumber,datereceived ";
+ $strsth .= "order by $order " if ($order);
+ $strsth .= " LIMIT 0,$limit" if ($limit);
+ my $sth=$dbh->prepare($strsth);
+### getparcels: $strsth
+ $sth->execute;
+ my @results;
+ while (my $data2=$sth->fetchrow_hashref) {
+ push @results, $data2;
+ }
+
+ $sth->finish;
+ return(scalar(@results), @results);
+}
+
END { } # module clean-up code here (global destructor)
1;
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- C4/Auth.pm 9 Jun 2006 12:06:15 -0000 1.52
+++ C4/Auth.pm 4 Jul 2006 14:36:51 -0000 1.53
@@ -226,9 +226,9 @@
);
}
$template->param(
- TemplateEncoding => C4::Context->preference("TemplateEncoding"),
- AmazonContent => C4::Context->preference("AmazonContent"),
- LibraryName => C4::Context->preference("LibraryName"),
+ TemplateEncoding => C4::Context->preference('TemplateEncoding'),
+ AmazonContent => C4::Context->preference('AmazonContent'),
+ LibraryName => C4::Context->preference('LibraryName'),
branchname => C4::Context->userenv->{'branchname'},
);
return ( $template, $borrowernumber, $cookie );
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- C4/AuthoritiesMarc.pm 20 May 2006 14:32:54 -0000 1.26
+++ C4/AuthoritiesMarc.pm 4 Jul 2006 14:36:51 -0000 1.27
@@ -47,9 +47,11 @@
&authoritysearch
- &AUTHhtml2marc
-
- &merge
+ &MARCmodsubfield
+ &AUTHhtml2marc &AUTHhtml2xml
+ &AUTHaddword
+ &MARCaddword &MARCdelword
+ &char_decode
&FindDuplicate
);
@@ -109,7 +111,7 @@
}
##Add how many queries generated
$query= $and.$query.$q2;
-warn $query;
+# warn $query;
$offset=0 unless $offset;
my $counter = $offset;
@@ -141,87 +143,141 @@
my @finalresult = ();
-if ($nbresults>0){
-##fIND tags using authority
-
- my $newsth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
- $newsth->execute($authtypecode);
+ my $oldline;
+# while (($counter <= $#result) && ($counter <= ($offset + $length))) {
+ # retrieve everything
+ for (my $counter=0;$counter <=$#result;$counter++) {
+# warn " HERE : $counter, $#result, $offset, $length";
+ # get MARC::Record of the authority
+ my $record = AUTHgetauthority($dbh,$result[$counter]);
+ # then build the summary
+ #FIXME: all of this should be moved to the template eventually
+ my $authtypecode = AUTHfind_authtypecode($dbh,$result[$counter]);
+ my $authref = getauthtype($authtypecode);
+ my $authtype =$authref->{authtypetext};
+ my $summary = $authref->{summary};
+ # find biblio MARC field using this authtypecode (to jump to biblio)
+ my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
+ $sth->execute($authtypecode);
my $tags_using_authtype;
+ my $newsth;
while (my ($tagfield) = $newsth->fetchrow) {
$tags_using_authtype.= "'".$tagfield."9',";
}
-##Find authid and linkid fields
-my ($authidfield,$authidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authid",$authtypecode);
-my ($linkidfield,$linkidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.linkid",$authtypecode);
-while (($counter < $nbresults) && ($counter < ($offset + $length))) {
-
-##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
-my $rec=$oAResult->record($counter);
-my $marcdata=$rec->raw();
-my $authrecord;
-my $linkid;
-my @linkids;
-my $separator=C4::Context->preference('authoritysep');
-my $linksummary=" ".$separator;
-
- $authrecord = MARC::File::USMARC::decode($marcdata);
-my $authid=$authrecord->field($authidfield)->subfield($authidsubfield); ## we could have these defined in system pref.
- if ($authrecord->field($linkidfield)){
-my @fields=$authrecord->field($linkidfield);
-
- foreach my $field (@fields){
- $linkid=$field->subfield($linkidsubfield) ;
- if ($linkid){ ##There is a linked record add fields to produce summary
-my $linktype=AUTHfind_authtypecode($dbh,$linkid);
- my $linkrecord=AUTHgetauthority($dbh,$linkid);
- $linksummary.=getsummary($dbh,$linkrecord,$linkid,$linktype).$separator;
+ chop $tags_using_authtype;
+ # if the library has a summary defined, use it. Otherwise, build a standard one
+ if ($summary) {
+ my @fields = $record->fields();
+ foreach my $field (@fields) {
+ my $tag = $field->tag();
+ my $tagvalue = $field->as_string();
+ $summary =~ s/\[(.?.?.?.?)$tag\*(.*?)]/$1$tagvalue$2\[$1$tag$2]/g;
+ if ($tag<10) {
+ } else {
+ my @subf = $field->subfields;
+ for my $i (0..$#subf) {
+ my $subfieldcode = $subf[$i][0];
+ my $subfieldvalue = $subf[$i][1];
+ my $tagsubf = $tag.$subfieldcode;
+ $summary =~ s/\[(.?.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue$2\[$1$tagsubf$2]/g;
}
}
- }#
-
-my $summary=getsummary($dbh,$authrecord,$authid,$authtypecode);
-if ($linkid && $linksummary ne " ".$separator){
-$summary="<b>".$summary."</b>".$linksummary;
-}
-## Fix Async search and move Zconn to here
+ }
+ $summary =~ s/\[(.*?)]//g;
+ $summary =~ s/\n/<br>/g;
+ } else {
+ my $heading; # = $authref->{summary};
+ my $altheading;
+ my $seeheading;
+ my $see;
+ my @fields = $record->fields();
+ if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+ # construct UNIMARC summary, that is quite different from MARC21 one
+ # accepted form
+ foreach my $field ($record->field('2..')) {
+ $heading.= $field->as_string();
+ }
+ # rejected form(s)
+ foreach my $field ($record->field('4..')) {
+ $summary.= " <i>".$field->as_string()."</i><br/>";
+ $summary.= " <i>see:</i> ".$heading."<br/>";
+ }
+ # see :
+ foreach my $field ($record->field('5..')) {
+ $summary.= " <i>".$field->as_string()."</i><br/>";
+ $summary.= " <i>see:</i> ".$heading."<br/>";
+ }
+ # // form
+ foreach my $field ($record->field('7..')) {
+ $seeheading.= " <i>see also:</i> ".$field->as_string()."<br />";
+ $altheading.= " ".$field->as_string()."<br />";
+ $altheading.= " <i>see also:</i> ".$heading."<br />";
+ }
+ $summary = "<b>".$heading."</b><br />".$seeheading.$altheading.$summary;
+ } else {
+ # construct MARC21 summary
+ foreach my $field ($record->field('1..')) {
+ if ($record->field('100')) {
+ $heading.= $field->as_string('abcdefghjklmnopqrstvxyz68');
+ } elsif ($record->field('110')) {
+ $heading.= $field->as_string('abcdefghklmnoprstvxyz68');
+ } elsif ($record->field('111')) {
+ $heading.= $field->as_string('acdefghklnpqstvxyz68');
+ } elsif ($record->field('130')) {
+ $heading.= $field->as_string('adfghklmnoprstvxyz68');
+ } elsif ($record->field('148')) {
+ $heading.= $field->as_string('abvxyz68');
+ } elsif ($record->field('150')) {
+ $heading.= $field->as_string('abvxyz68');
+ } elsif ($record->field('151')) {
+ $heading.= $field->as_string('avxyz68');
+ } elsif ($record->field('155')) {
+ $heading.= $field->as_string('abvxyz68');
+ } elsif ($record->field('180')) {
+ $heading.= $field->as_string('vxyz68');
+ } elsif ($record->field('181')) {
+ $heading.= $field->as_string('vxyz68');
+ } elsif ($record->field('182')) {
+ $heading.= $field->as_string('vxyz68');
+ } elsif ($record->field('185')) {
+ $heading.= $field->as_string('vxyz68');
+ } else {
+ $heading.= $field->as_string();
+ }
+ } #See From
+ foreach my $field ($record->field('4..')) {
+ $seeheading.= " ".$field->as_string()."<br />";
+ $seeheading.= " <i>see:</i> ".$seeheading."<br />";
+ } #See Also
+ foreach my $field ($record->field('5..')) {
+ $altheading.= " <i>see also:</i> ".$field->as_string()."<br />";
+ $altheading.= " ".$field->as_string()."<br />";
+ $altheading.= " <i>see also:</i> ".$altheading."<br />";
+ }
+ $summary.=$heading.$seeheading.$altheading;
+ }
+ }
+ # then add a line for the template loop
my %newline;
$newline{summary} = $summary;
- $newline{authid} = $authid;
- $newline{linkid} = $linkid;
-# $newline{used} =$count;
+ $newline{authtype} = $authtype;
+ $newline{authid} = $result[$counter];
+ $newline{used} = &AUTHcount_usage($result[$counter]);
$newline{biblio_fields} = $tags_using_authtype;
$newline{even} = $counter % 2;
- $counter++;
+ $newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
push @finalresult, \%newline;
- }## while counter
-$oAResult->destroy();
-#$oAuth->destroy();
-
-###
-my $oConnection=C4::Context->Zconn("biblioserver");
- if ($oConnection eq "error"){
- warn "Error/CONNECTING \n";
}
-my $oResult;
-for (my $z=0; $z<@finalresult; $z++){
- my $nquery;
-
- $nquery= "\@attr GILS 1=2057 ".$finalresult[$z]{authid};
- $nquery="\@or ".$nquery." \@attr GILS 1=2057 ".$finalresult[$z]{linkid} if $finalresult[$z]{linkid};
-
- eval{
- $oResult = $oConnection->search_pqf($nquery);
- };
- if($@){
- warn " /CODE:", $@->code()," /MSG:",$@->message(),"\n";
+ # sort everything
+ my @finalresult3= sort {$a->{summary} cmp $b->{summary}} @finalresult;
+ # cut from $offset to $offset+$length;
+ my @finalresult2;
+ for (my $i=$offset;$i<=$offset+$length;$i++) {
+ push @finalresult2,$finalresult3[$i] if $finalresult3[$i];
}
- my $count=$oResult->size() if ($oResult);
- $finalresult[$z]{used}=$count;
-}##for Zconn
- $oResult->destroy();
-# $oConnection->destroy();
-}## if nbresult
- return (\@finalresult, $nbresults);
+ my $nbresults = $#result + 1;
+
+ return (\@finalresult2, $nbresults);
}
# Creates the SQL Request
@@ -244,21 +300,62 @@
$sql_tables = "auth_subfield_table as m$nb_table,";
$sql_where1 .= "( m$nb_table.subfieldvalue like '@$value[$i]' ";
if (@$tags[$i]) {
- $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) IN (@$tags[$i])";
+ $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
+ }
+ $sql_where1.=")";
+ } elsif (@$operator[$i] eq "contains") {
+ $sql_tables .= "auth_word as m$nb_table,";
+ $sql_where1 .= "(m1.word like ".$dbh->quote("@$value[$i]%");
+ if (@$tags[$i]) {
+ $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
}
$sql_where1.=")";
} else {
-
-
-
+ $sql_tables .= "auth_subfield_table as m$nb_table,";
+ $sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
+ if (@$tags[$i]) {
+ $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
+ }
+ $sql_where1.=")";
+ }
+ } else {
+ if (@$operator[$i] eq "start") {
+ $nb_table++;
+ $sql_tables .= "auth_subfield_table as m$nb_table,";
+ $sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
+ if (@$tags[$i]) {
+ $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
+ }
+ $sql_where1.=")";
+ $sql_where2 .= "m1.authid=m$nb_table.authid and ";
+ } elsif (@$operator[$i] eq "contains") {
+ if (@$and_or[$i] eq 'and') {
+ $nb_table++;
+ $sql_tables .= "auth_word as m$nb_table,";
+ $sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]%");
+ if (@$tags[$i]) {
+ $sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
+ }
+ $sql_where1.=")";
+ $sql_where2 .= "m1.authid=m$nb_table.authid and ";
+ } else {
+ $sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]%");
+ if (@$tags[$i]) {
+ $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldid) in (@$tags[$i])";
+ }
+ $sql_where1.=")";
+ $sql_where2 .= "m1.authid=m$nb_table.authid and ";
+ }
+ } else {
$nb_table++;
$sql_tables .= "auth_subfield_table as m$nb_table,";
$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like '@$value[$i]' ";
if (@$tags[$i]) {
- $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) IN (@$tags[$i])";
+ $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
}
+ $sql_where2 .= "m1.authid=m$nb_table.authid and ";
$sql_where1.=")";
$sql_where2.="m1.authid=m$nb_table.authid and ";
@@ -399,56 +496,26 @@
sub AUTHaddauthority {
# pass the MARC::Record to this function, and it will create the records in the authority table
my ($dbh,$record,$authid,$authtypecode) = @_;
-
-#my $leadercode=AUTHfind_leader($dbh,$authtypecode);
-my $leader=' a ';##Fixme correct leader as this one just adds utf8 to MARC21
-#substr($leader,8,1)=$leadercode;
-# $record->leader($leader);
-my ($authfield,$authidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authid",$authtypecode);
-my ($authfield2,$authtypesubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authtypecode",$authtypecode);
-my ($linkidfield,$linkidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.linkid",$authtypecode);
-
+ my @fields=$record->fields();
+# adding main table, and retrieving authid
+# if authid is sent, then it's not a true add, it's only a re-add, after a delete (ie, a mod)
+# In fact, it could still be a true add, in the case of a bulkauthimort for instance with previously
+# existing authids in the records. I've adjusted below to account for this instance --JF.
+ if ($authid) {
+ $dbh->do("lock tables auth_header WRITE,auth_subfield_table WRITE, auth_word WRITE, stopwords READ");
+ my $sth=$dbh->prepare("insert into auth_header (authid,datecreated,authtypecode) values (?,now(),?)");
+ $sth->execute($authid,$authtypecode);
+ $sth->finish;
# if authid empty => true add, find a new authid number
- if (!$authid) {
- my $sth=$dbh->prepare("select max(authid) from auth_header");
+ } else {
+ $dbh->do("lock tables auth_header WRITE,auth_subfield_table WRITE, auth_word WRITE, stopwords READ");
+ my $sth=$dbh->prepare("insert into auth_header (datecreated,authtypecode) values (now(),?)");
+ $sth->execute($authtypecode);
+ $sth=$dbh->prepare("select max(authid) from auth_header");
$sth->execute;
($authid)=$sth->fetchrow;
- $authid=$authid+1;
-
-##Insert the recordID in MARC record
-
-##Both authid and authtypecode is expected to be in the same field. Modify if other requirements arise
- $record->add_fields($authfield,'','',$authidsubfield=>$authid,$authtypesubfield=>$authtypecode);
-
- $dbh->do("lock tables auth_header WRITE");
- $sth=$dbh->prepare("insert into auth_header (authid,datecreated,authtypecode,marc) values (?,now(),?,?)");
- $sth->execute($authid,$authtypecode,$record->as_usmarc);
- $sth->finish;
-
- }else{
-##Modified record reinsertid
-$record->delete_field($authfield);
-$record->add_fields($authfield,'','',$authidsubfield=>$authid,$authtypesubfield=>$authtypecode);
-
- $dbh->do("lock tables auth_header WRITE");
- my $sth=$dbh->prepare("update auth_header set marc=? where authid=?");
- $sth->execute($record->as_usmarc,$authid);
$sth->finish;
}
- $dbh->do("unlock tables");
- zebraopauth($dbh,$authid,'specialUpdate');
-
-if ($record->field($linkidfield)){
-my @fields=$record->field($linkidfield);
-
- foreach my $field (@fields){
-my $linkid=$field->subfield($linkidsubfield) ;
- if ($linkid){
- ##Modify the record of linked
- AUTHaddlink($dbh,$linkid,$authid);
- }
- }
-}
return ($authid);
}
@@ -650,6 +717,64 @@
+sub AUTHhtml2xml {
+ my ($tags,$subfields,$values,$indicator,$ind_tag) = @_;
+ use MARC::File::XML;
+ my $xml= MARC::File::XML::header();
+ my $prevvalue;
+ my $prevtag=-1;
+ my $first=1;
+ my $j = -1;
+ for (my $i=0;$i<=@$tags;$i++){
+
+ if ((@$tags[$i] ne $prevtag)){
+ $j++ unless (@$tags[$i] eq "");
+ warn "IND:".substr(@$indicator[$j],0,1).substr(@$indicator[$j],1,1)." ".@$tags[$i];
+
+ if (!$first){
+ $xml.="</datafield>\n";
+ $first=1;
+ }
+ else {
+ if (@$values[$i] ne "") {
+ # leader
+ if (@$tags[$i] eq "000") {
+ $xml.="<leader>@$values[$i]</leader>\n";
+ $first=1;
+ # rest of the fixed fields
+ } elsif (@$tags[$i] < 10) {
+ $xml.="<controlfield tag=\"@$tags[$i]\">@$values[$i]</controlfield>\n";
+ $first=1;
+ }
+ else {
+ my $ind1 = substr(@$indicator[$j],0,1);
+ my $ind2 = substr(@$indicator[$j],1,1);
+ $xml.="<datafield tag=\"@$tags[$i]\" ind1=\"$ind1\" ind2=\"$ind2\">\n";
+ $xml.="<subfield code=\"@$subfields[$i]\">@$values[$i]</subfield>\n";
+ $first=0;
+ }
+ }
+ }
+ } else {
+ if (@$values[$i] eq "") {
+ }
+ else {
+ if ($first){
+ my $ind1 = substr(@$indicator[$j],0,1);
+ my $ind2 = substr(@$indicator[$j],1,1);
+ $xml.="<datafield tag=\"@$tags[$i]\" ind1=\"$ind1\" ind2=\"$ind2\">\n";
+ $first=0;
+ }
+ $xml.="<subfield code=\"@$subfields[$i]\">@$values[$i]</subfield>\n";
+
+ }
+ }
+ $prevtag = @$tags[$i];
+ }
+ $xml.= MARC::File::XML::footer();
+ warn $xml;
+ return $xml
+}
sub AUTHhtml2marc {
my ($dbh,$rtags,$rsubfields,$rvalues,%indicators) = @_;
my $prevtag = -1;
@@ -929,8 +1054,11 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.26 2006/05/20 14:32:54 tgarip1957 Exp $
+# $Id: AuthoritiesMarc.pm,v 1.27 2006/07/04 14:36:51 toins Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.27 2006/07/04 14:36:51 toins
+# Head & rel_2_2 merged
+#
# Revision 1.26 2006/05/20 14:32:54 tgarip1957
# If an authority is modified biblios related to this authority were not updated but a list of modified authorities was written to disk. Now by defult they get modified as well unless a system preference 'dontmerge' is defined. dontmerge=1 will keep the previous behaviour.
#
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- C4/Biblio.pm 6 Jun 2006 23:13:14 -0000 1.172
+++ C4/Biblio.pm 4 Jul 2006 14:36:51 -0000 1.173
@@ -33,7 +33,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.172 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.173 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
@ISA = qw(Exporter);
@@ -1796,6 +1796,7 @@
my $query = "Insert into deleteditems set ";
my @bind = ();
foreach my $temp ( keys %$data ) {
+ next if ($temp =~/itemcallnumber/);
$query .= "$temp = ?,";
push ( @bind, $data->{$temp} );
}
@@ -2949,6 +2950,17 @@
# warn "for title, I add $tag / $subfield".$record->field($tag)->subfield($subfield);
}
}
+ ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubtitle.subtitle","");
+ if ($record->field($tag)) {
+ if ($record->field($tag)->subfields($subfield)) {
+ push @tags, "'".$tag.$subfield."'";
+ push @and_or, "and";
+ push @excluding, "";
+ push @operator, "contains";
+ push @value, $record->field($tag)->subfield($subfield);
+# warn "for title, I add $tag / $subfield".$record->field($tag)->subfield($subfield);
+ }
+ }
# ... and on biblio.author
($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,"biblio.author","");
if ($record->field($tag)) {
@@ -3127,8 +3139,11 @@
=cut
-# $Id: Biblio.pm,v 1.172 2006/06/06 23:13:14 bob_lyon Exp $
+# $Id: Biblio.pm,v 1.173 2006/07/04 14:36:51 toins Exp $
# $Log: Biblio.pm,v $
+# Revision 1.173 2006/07/04 14:36:51 toins
+# Head & rel_2_2 merged
+#
# Revision 1.172 2006/06/06 23:13:14 bob_lyon
# Merging katipo changes...
#
Index: C4/Bull.pm
===================================================================
RCS file: /sources/koha/koha/C4/Bull.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- C4/Bull.pm 6 Jan 2006 16:39:37 -0000 1.18
+++ C4/Bull.pm 4 Jul 2006 14:36:51 -0000 1.19
@@ -22,7 +22,8 @@
use C4::Date;
use Date::Manip;
use C4::Suggestions;
-use C4::Letters;
+use C4::Biblio;
+use C4::Search;
require Exporter;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -48,7 +49,7 @@
@EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription
&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
&get_full_subscription_list_from_biblionumber
- &modsubscriptionhistory &newissue
+ &modsubscriptionhistory &newissue &serialsitemize
&getserials &getlatestserials &serialchangestatus
&Find_Next_Date &Get_Next_Seq
&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
@@ -110,33 +111,33 @@
sub newsubscription {
my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
- $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
- $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
- $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
- $numberingmethod, $status, $notes,$letter) = @_;
+ $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+ $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+ $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+ $numberingmethod, $status, $notes) = @_;
my $dbh = C4::Context->dbh;
#save subscription
my $sth=$dbh->prepare("insert into subscription (librarian,aqbooksellerid,cost,aqbudgetid,biblionumber,
startdate,periodicity,dow,numberlength,weeklength,monthlength,
- add1,every1,whenmorethan1,setto1,lastvalue1,
- add2,every2,whenmorethan2,setto2,lastvalue2,
- add3,every3,whenmorethan3,setto3,lastvalue3,
- numberingmethod, status, notes, letter) values
+ add1,every1,whenmorethan1,setto1,lastvalue1,innerloop1,
+ add2,every2,whenmorethan2,setto2,lastvalue2,innerloop2,
+ add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
+ numberingmethod, status, notes) values
(?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
- ?,?,?,?,?,?,?,?,?,?,?)");
+ ?,?,?,?,?,?,?,?,?,?,?,?,?)");
$sth->execute($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
format_date_in_iso($startdate),$periodicity,$dow,$numberlength,$weeklength,$monthlength,
- $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
- $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
- $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
- $numberingmethod, $status, $notes,$letter);
+ $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+ $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+ $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+ $numberingmethod, $status, $notes);
#then create the 1st waited number
my $subscriptionid = $dbh->{'mysql_insertid'};
$sth = $dbh->prepare("insert into subscriptionhistory (biblionumber, subscriptionid, histstartdate, enddate, missinglist, recievedlist, opacnote, librariannote) values (?,?,?,?,?,?,?,?)");
$sth->execute($biblionumber, $subscriptionid, format_date_in_iso($startdate), 0, "", "", "", $notes);
# reread subscription to get a hash (for calculation of the 1st issue number)
- $sth = $dbh->prepare("select * from subscription where subscriptionid = ? ");
+ $sth = $dbh->prepare("SELECT * from subscription where subscriptionid = ? ");
$sth->execute($subscriptionid);
my $val = $sth->fetchrow_hashref;
@@ -150,7 +151,7 @@
sub getsubscription {
my ($subscriptionid) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
+ my $sth = $dbh->prepare('SELECT subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
from subscription
left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
@@ -165,7 +166,7 @@
sub getsubscriptionfrombiblionumber {
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare('select count(*) from subscription where biblionumber=?');
+ my $sth = $dbh->prepare('SELECT count(*) from subscription where biblionumber=?');
$sth->execute($biblionumber);
my $subscriptionsnumber = $sth->fetchrow;
return $subscriptionsnumber;
@@ -174,7 +175,7 @@
sub get_subscription_list_from_biblionumber {
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
+ my $sth = $dbh->prepare('SELECT subscription.*,subscriptionhistory.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
from subscription
left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
@@ -204,12 +205,18 @@
sub get_full_subscription_list_from_biblionumber {
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, serial.notes, year(serial.planneddate) as year, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
- from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
- left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
- left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
- left join biblio on biblio.biblionumber=subscription.biblionumber
- where subscription.biblionumber = ? order by year,serial.subscriptionid,serial.planneddate');
+ my $sth = $dbh->prepare('
+ SELECT serial.serialseq,serial.planneddate, serial.publisheddate, serial.status, serial.notes,
+ year(serial.publisheddate) as year,
+ aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
+ FROM serial
+ LEFT JOIN subscription ON
+ (serial.subscriptionid=subscription.subscriptionid AND subscription.biblionumber=serial.biblionumber)
+ LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid
+ LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
+ LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber
+ WHERE subscription.biblionumber = ?
+ ORDER BY year,serial.publisheddate,serial.subscriptionid,serial.planneddate');
$sth->execute($biblionumber);
my @res;
my $year;
@@ -220,17 +227,14 @@
my $first;
my $previousnote="";
while (my $subs = $sth->fetchrow_hashref) {
-# my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
-# $sth2->execute($biblionumber,$subs->{'subscriptionid'});
-# while (my $issues = $sth2->fetchrow_hashref){
-# warn "planneddate ".$issues->{'planneddate'};
-# warn "serialseq".$issues->{'serialseq'};
-# }
+### BUG To FIX: When there is no published date, will create many null ids!!!
+
if ($year and ($year==$subs->{year})){
if ($first eq 1){$first=0;}
my $temp=$res[scalar(@res)-1]->{'serials'};
push @$temp,
- {'planneddate' => format_date($subs->{'planneddate'}),
+ {'publisheddate' =>format_date($subs->{'publisheddate'}),
+ 'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
"status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
@@ -243,7 +247,8 @@
$bibliotitle= $subs->{'bibliotitle'};
my @temp;
push @temp,
- {'planneddate' => format_date($subs->{'planneddate'}),
+ {'publisheddate' =>format_date($subs->{'publisheddate'}),
+ 'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
"status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
@@ -302,24 +307,24 @@
my $dbh = C4::Context->dbh;
my $sth;
if ($biblionumber) {
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=? order by title");
+ $sth = $dbh->prepare("SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=? order by title");
$sth->execute($biblionumber);
} else {
if ($ISSN and $title)
{
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? order by title )");
+ $sth = $dbh->prepare("SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? order by title )");
$sth->execute("%$title%",$ISSN);
}
else
{
if ($ISSN)
{
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ? order by title");
+ $sth = $dbh->prepare("SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ? order by title");
$sth->execute($ISSN);
}
else
{
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and
+ $sth = $dbh->prepare("SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and
biblio.biblionumber=subscription.biblionumber and biblio.title like ? order by title");
$sth->execute("%$title%");
}
@@ -346,7 +351,10 @@
sub modsubscriptionhistory {
my ($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote)=@_;
my $dbh=C4::Context->dbh;
- my $sth = $dbh->prepare("update subscriptionhistory set histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? where subscriptionid=?");
+ my $sth = $dbh->prepare("
+ UPDATE subscriptionhistory
+ SET histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=?
+ WHERE subscriptionid=?");
$recievedlist =~ s/^,//g;
$missinglist =~ s/^,//g;
$opacnote =~ s/^,//g;
@@ -372,14 +380,18 @@
}
# status = 2 is "arrived"
- $sth=$dbh->prepare("select serialid,serialseq, status, planneddate,notes from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
+ my $sth=$dbh->prepare("
+ SELECT serialid,serialseq, status, publisheddate, planneddate,notes
+ FROM serial
+ WHERE subscriptionid = ? AND status NOT IN (2,4,5)");
$sth->execute($subscriptionid);
while(my $line = $sth->fetchrow_hashref) {
$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ $line->{"publisheddate"} = format_date($line->{"publisheddate"});
$line->{"planneddate"} = format_date($line->{"planneddate"});
push @serials,$line;
}
- $sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+ $sth=$dbh->prepare("SELECT count(*) FROM serial WHERE subscriptionid=?");
$sth->execute($subscriptionid);
my ($totalissues) = $sth->fetchrow;
return ($totalissues, at serials);
@@ -390,7 +402,7 @@
my ($subscriptionid,$limit) =@_;
my $dbh = C4::Context->dbh;
# status = 2 is "arrived"
- my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ my $strsth="SELECT serialid,serialseq, status, planneddate FROM serial WHERE subscriptionid = ? AND (status =2 or status=4) ORDER BY planneddate DESC LIMIT 0,$limit";
my $sth=$dbh->prepare($strsth);
$sth->execute($subscriptionid);
my @serials;
@@ -399,27 +411,27 @@
$line->{"planneddate"} = format_date($line->{"planneddate"});
push @serials,$line;
}
- $sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+ $sth=$dbh->prepare("SELECT count(*) from serial where subscriptionid=?");
$sth->execute($subscriptionid);
my ($totalissues) = $sth->fetchrow;
return \@serials;
}
sub serialchangestatus {
- my ($serialid,$serialseq,$planneddate,$status,$notes)=@_;
+ my ($serialid,$serialseq, $publisheddate,$planneddate,$status,$notes)=@_;
# warn "($serialid,$serialseq,$planneddate,$status)";
# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
+ my $sth = $dbh->prepare("SELECT subscriptionid,status from serial where serialid=?");
$sth->execute($serialid);
my ($subscriptionid,$oldstatus) = $sth->fetchrow;
# change status & update subscriptionhistory
if ($status eq 6){
delissue($serialseq, $subscriptionid)
}else{
- $sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=?,notes=? where serialid = ?");
- $sth->execute($serialseq,$planneddate,$status,$notes,$serialid);
- $sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ $sth = $dbh->prepare("update serial set serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? where serialid = ?");
+ $sth->execute($serialseq,$publisheddate,$planneddate,$status,$notes,$serialid);
+ $sth = $dbh->prepare("SELECT missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
$sth->execute($subscriptionid);
my ($missinglist,$recievedlist) = $sth->fetchrow;
if ($status eq 2) {
@@ -432,14 +444,14 @@
}
# create new waited entry if needed (ie : was a "waited" and has changed)
if ($oldstatus eq 1 && $status ne 1) {
- $sth = $dbh->prepare("select * from subscription where subscriptionid = ? ");
+ $sth = $dbh->prepare("SELECT * from subscription where subscriptionid = ? ");
$sth->execute($subscriptionid);
my $val = $sth->fetchrow_hashref;
# next issue number
my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
# next date (calculated from actual date & frequency parameters)
- my $nextplanneddate = Get_Next_Date($planneddate,$val);
- newissue($newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextplanneddate);
+ my $nextpublisheddate = Get_Next_Date($publisheddate,$val);
+ newissue($newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextpublisheddate,0);
$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
innerloop1=?,innerloop2=?,innerloop3=?
where subscriptionid = ?");
@@ -448,11 +460,14 @@
}
sub newissue {
- my ($serialseq,$subscriptionid,$biblionumber,$status, $planneddate) = @_;
+ my ($serialseq,$subscriptionid,$biblionumber,$status, $publisheddate, $planneddate) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
- $sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
- $sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ my $sth = $dbh->prepare("
+ INSERT INTO serial
+ (serialseq,subscriptionid,biblionumber,status,publisheddate,planneddate)
+ VALUES (?,?,?,?,?,?)");
+ $sth->execute($serialseq,$subscriptionid,$biblionumber,$status,$publisheddate, $planneddate);
+ $sth = $dbh->prepare("SELECT missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
$sth->execute($subscriptionid);
my ($missinglist,$recievedlist) = $sth->fetchrow;
if ($status eq 2) {
@@ -465,6 +480,117 @@
$sth->execute($recievedlist,$missinglist,$subscriptionid);
}
+=head2 serialsitemize
+
+ serialitemize($serialid, $info);
+ $info is a hashref containing barcode branch, itemcallnumber, status, location
+ $serialid the serialid
+=cut
+sub serialsitemize {
+ my ($serialid, $info) =@_;
+
+ my $dbh= C4::Context->dbh;
+ my $sth=$dbh->prepare("SELECT * from serial WHERE serialid=?");
+ $sth->execute($serialid);
+ my $data=$sth->fetchrow_hashref;
+ my $bibid=MARCfind_MARCbibid_from_oldbiblionumber($dbh,$data->{biblionumber});
+ my $fwk=MARCfind_frameworkcode($dbh,$bibid);
+ if ($info->{barcode}){
+ my @errors;
+ my $exists = itemdata($info->{'barcode'});
+ push @errors,"barcode_not_unique" if($exists);
+ unless ($exists){
+ my $marcrecord = MARC::Record->new();
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.barcode",$fwk);
+# warn "items.barcode : $tag , $subfield";
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{barcode}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ if ($info->{branch}){
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.homebranch",$fwk);
+# warn "items.homebranch : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{branch})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{branch}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.holdingbranch",$fwk);
+# warn "items.holdingbranch : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{branch})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{branch}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ }
+ if ($info->{itemcallnumber}){
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.itemcallnumber",$fwk);
+# warn "items.itemcallnumber : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{itemcallnumber})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{itemcallnumber}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ }
+ if ($info->{notes}){
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.itemnotes",$fwk);
+# warn "items.itemnotes : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{notes})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{notes}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ }
+ if ($info->{location}){
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.location",$fwk);
+# warn "items.location : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{location})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{location}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ }
+ if ($info->{status}){
+ my ($tag,$subfield)=MARCfind_marc_from_kohafield($dbh,"items.notforloan",$fwk);
+# warn "items.notforloan : $tag , $subfield";
+ if ($marcrecord->field($tag)) {
+ $marcrecord->field($tag)->add_subfields("$subfield" => $info->{status})
+ }else {
+ my $newField = MARC::Field->new(
+ "$tag",'','',
+ "$subfield" => $info->{status}
+ );
+ $marcrecord->insert_fields_ordered($newField);
+ }
+ }
+ NEWnewitem($dbh,$marcrecord,$bibid);
+ return 1;
+ }
+ return (0, at errors);
+ }
+}
+
sub delissue {
my ($serialseq,$subscriptionid) = @_;
my $dbh = C4::Context->dbh;
@@ -472,6 +598,7 @@
$sth->execute($serialseq,$subscriptionid);
}
+
sub Get_Next_Date(@) {
my ($planneddate,$subscription) = @_;
my $resultdate;
@@ -561,7 +688,7 @@
my $subscription = getsubscription($subscriptionid);
# we don't do the same test if the subscription is based on X numbers or on X weeks/months
if ($subscription->{numberlength}) {
- my $sth = $dbh->prepare("select count(*) from serial where subscriptionid=? and planneddate>=?");
+ my $sth = $dbh->prepare("SELECT count(*) from serial where subscriptionid=? and planneddate>=?");
$sth->execute($subscriptionid,$subscription->{startdate});
my $res = $sth->fetchrow;
if ($subscription->{numberlength}>=$res) {
@@ -571,7 +698,7 @@
}
} else {
#a little bit more tricky if based on X weeks/months : search if the latest issue waited is not after subscription startdate + duration
- my $sth = $dbh->prepare("select max(planneddate) from serial where subscriptionid=?");
+ my $sth = $dbh->prepare("SELECT max(planneddate) from serial where subscriptionid=?");
$sth->execute($subscriptionid);
my $res = ParseDate(format_date_in_iso($sth->fetchrow));
my $endofsubscriptiondate;
@@ -606,12 +733,12 @@
my ($subscriptionid,$user,$startdate,$numberlength,$weeklength,$monthlength,$note) = @_;
my $dbh = C4::Context->dbh;
my $subscription = getsubscription($subscriptionid);
- my $sth = $dbh->prepare("select * from biblio,biblioitems where biblio.biblionumber=biblioitems.biblionumber and biblio.biblionumber=?");
+ my $sth = $dbh->prepare("SELECT * from biblio,biblioitems where biblio.biblionumber=biblioitems.biblionumber and biblio.biblionumber=?");
$sth->execute($subscription->{biblionumber});
my $biblio = $sth->fetchrow_hashref;
- newsuggestion($user,$subscription->{bibliotitle},$biblio->{author},$biblio->{publishercode},$biblio->{note},,,,,$subscription->{biblionumber});
+ newsuggestion($user,$subscription->{bibliotitle},$biblio->{author},$biblio->{publishercode},$biblio->{note},'','','','','',$subscription->{biblionumber});
# renew subscription
- $sth=$dbh->prepare("update subscription set startdate=?,numberlength=?,weeklength=?,monthlength=?");
- $sth->execute(format_date_in_iso($startdate),$numberlength,$weeklength,$monthlength);
+ $sth=$dbh->prepare("update subscription set startdate=?,numberlength=?,weeklength=?,monthlength=? where subscriptionid=?");
+ $sth->execute(format_date_in_iso($startdate),$numberlength,$weeklength,$monthlength, $subscriptionid);
}
END { } # module clean-up code here (global destructor)
Index: C4/Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- C4/Context.pm 20 May 2006 14:36:09 -0000 1.41
+++ C4/Context.pm 4 Jul 2006 14:36:51 -0000 1.42
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Context.pm,v 1.41 2006/05/20 14:36:09 tgarip1957 Exp $
+# $Id: Context.pm,v 1.42 2006/07/04 14:36:51 toins Exp $
package C4::Context;
use strict;
use DBI;
@@ -25,7 +25,7 @@
qw($context),
qw(@context_stack);
-$VERSION = do { my @v = '$Revision: 1.41 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.42 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -432,7 +432,7 @@
sub new_Zconn {
use ZOOM;
my $server=shift;
-my $tried==0;
+my $tried=0;
my $Zconn;
my ($tcp,$host,$port)=split /:/,$context->{"listen"}->{$server}->{"content"};
@@ -462,7 +462,7 @@
sub new_Zconnauth {
use ZOOM;
my $server=shift;
-my $tried==0;
+my $tried=0;
my $Zconnauth;
my ($tcp,$host,$port)=split /:/,$context->{"listen"}->{$server}->{"content"};
retry:
@@ -826,6 +826,9 @@
=cut
# $Log: Context.pm,v $
+# Revision 1.42 2006/07/04 14:36:51 toins
+# Head & rel_2_2 merged
+#
# Revision 1.41 2006/05/20 14:36:09 tgarip1957
# Typo error. Missing '>'
#
Index: C4/Input.pm
===================================================================
RCS file: /sources/koha/koha/C4/Input.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- C4/Input.pm 4 Aug 2005 13:31:22 -0000 1.18
+++ C4/Input.pm 4 Jul 2006 14:36:51 -0000 1.19
@@ -191,7 +191,7 @@
use strict;
my ($name,$input_name,$data) = @_;
my $dbh=C4::Context->dbh;
- my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ my $query=qq{SELECT * FROM authorised_values WHERE category=? order by lib};
my $sth=$dbh->prepare($query);
$sth->execute($name);
my $CGISort;
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- C4/Members.pm 22 Jun 2006 10:07:49 -0000 1.28
+++ C4/Members.pm 4 Jul 2006 14:36:51 -0000 1.29
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.28 2006/06/22 10:07:49 btoumi Exp $
+# $Id: Members.pm,v 1.29 2006/07/04 14:36:51 toins Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.28 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.29 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -401,7 +401,6 @@
}
-
}
sub newmember {
Index: C4/Output.pm
===================================================================
RCS file: /sources/koha/koha/C4/Output.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- C4/Output.pm 4 Apr 2006 10:05:48 -0000 1.54
+++ C4/Output.pm 4 Jul 2006 14:36:51 -0000 1.55
@@ -1,6 +1,6 @@
package C4::Output;
-# $Id: Output.pm,v 1.54 2006/04/04 10:05:48 plg Exp $
+# $Id: Output.pm,v 1.55 2006/07/04 14:36:51 toins Exp $
#package to deal with marking up output
#You will need to edit parts of this pm
@@ -83,6 +83,7 @@
interface => ($opac ne 'intranet'? '/opac-tmpl': '/intranet-tmpl'),
theme => $theme,
opacstylesheet => $opacstylesheet,
+ opaccolorstylesheet => C4::Context->preference('opaccolorstylesheet'),
opacsmallimage => C4::Context->preference('opacsmallimage'),
lang => $lang);
Index: C4/SearchMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- C4/SearchMarc.pm 28 Mar 2006 21:29:56 -0000 1.66
+++ C4/SearchMarc.pm 4 Jul 2006 14:36:51 -0000 1.67
@@ -327,6 +327,13 @@
# then all other fields in the main array
# search if item is on loan
+ # store this item
+ my %lineCN;
+ $lineCN{holdingbranch} = $item->{holdingbranch};
+ $lineCN{itemcallnumber} = $item->{itemcallnumber};
+ $lineCN{location} = $item->{location};
+ $lineCN{cnt} = $item->{cnt} unless ($item->{cnt}==1);
+ if ($item->{cnt}==1){
my $date_due;
$sth_issue->execute($item->{itemnumber});
while (my $loan = $sth_issue->fetchrow_hashref) {
@@ -334,17 +341,13 @@
$date_due = $loan->{date_due};
}
}
- # store this item
- my %lineCN;
- $lineCN{holdingbranch} = $item->{holdingbranch};
- $lineCN{itemcallnumber} = $item->{itemcallnumber};
- $lineCN{location} = $item->{location};
- $lineCN{date_due} = format_date($date_due);
- $lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
+ $lineCN{date_due} = format_date($date_due) ;
$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
+ }
+ $lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan} and not $lineCN{notforloan}); # setting not forloan if itemtype is not for loan
push @CNresults,\%lineCN;
- $totalitems++;
+ $totalitems+=$item->{cnt};
}
# save the biblio in the final array, with item and item issue status
my %newline;
@@ -476,11 +479,12 @@
my $lasttag;
my ($subfieldvalue,$subfieldcode,$tagorder,$tag);
while (($subfieldvalue,$subfieldcode,$tagorder,$tag)=$sth->fetchrow) {
- $lasttag=$tag if $tag;
+ #warn "IN MARCSUBJECTS $subfieldvalue $subfieldcode $tagorder $tag\n";
if ($activetagorder && $tagorder != $activetagorder) {
+ # warn "ACTIVETAGORDER".$activetagorder;
$subject=~ s/ -- $//;
$marcsubjct = {MARCSUBJCT => $subject,
- link => $tag."9",
+ link => $lasttag."9",
linkvalue => $field9,
};
push @marcsubjcts, $marcsubjct;
@@ -496,6 +500,7 @@
$subject .= $subfieldvalue . " -- ";
}
$activetagorder=$tagorder;
+ $lasttag=$tag if $tag;
}
$subject=~ s/ -- $//;
$marcsubjct = {MARCSUBJCT => $subject,
Index: C4/Suggestions.pm
===================================================================
RCS file: /sources/koha/koha/C4/Suggestions.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- C4/Suggestions.pm 9 Feb 2006 01:52:14 -0000 1.9
+++ C4/Suggestions.pm 4 Jul 2006 14:36:51 -0000 1.10
@@ -1,6 +1,6 @@
package C4::Suggestions;
-# $Id: Suggestions.pm,v 1.9 2006/02/09 01:52:14 rangi Exp $
+# $Id: Suggestions.pm,v 1.10 2006/07/04 14:36:51 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -64,6 +64,7 @@
&delsuggestion
&countsuggestion
&changestatus
+ &connectSuggestionAndBiblio
&findsuggestion_from_biblionumber
);
@@ -112,11 +113,13 @@
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
+ if ($userenv) {
unless ($userenv->{flags} == 1){
push @sql_params,$userenv->{branch};
$query .= " and (U1.branchcode = ? or U1.branchcode ='')";
}
}
+ }
if ($suggestedbyme) {
if ($suggestedbyme eq -1) {
} else {
@@ -252,6 +255,13 @@
return $suggestionid;
}
+# connect a suggestion to an existing biblio
+sub connectSuggestionAndBiblio {
+ my ($suggestionid,$biblionumber) = @_;
+ my $dbh=C4::Context->dbh;
+ my $sth = $dbh->prepare("update suggestions set biblionumber=? where suggestionid=?");
+ $sth->execute($biblionumber,$suggestionid);
+}
=back
=head1 SEE ALSO
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- circ/branchtransfers.pl 7 Jun 2006 03:29:19 -0000 1.22
+++ circ/branchtransfers.pl 4 Jul 2006 14:36:51 -0000 1.23
@@ -309,7 +309,10 @@
wastransferred => $wastransferred,
trsfitemloop => \@trsfitemloop,
branchoptionloop => \@branchoptionloop,
- errmsgloop => \@errmsgloop
+ errmsgloop => \@errmsgloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: circ/reserve.pl
===================================================================
RCS file: /sources/koha/koha/circ/reserve.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/reserve.pl 6 Jan 2006 16:39:37 -0000 1.2
+++ circ/reserve.pl 4 Jul 2006 14:36:51 -0000 1.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: reserve.pl,v 1.2 2006/01/06 16:39:37 tipaul Exp $
+# $Id: reserve.pl,v 1.3 2006/07/04 14:36:51 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -71,7 +71,7 @@
my $dbh = C4::Context->dbh;
my $strsth="select reservedate,reserves.borrowernumber as bornum, concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
-$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumberorder by borrower,reservedate " if ($order eq "borrower");
+$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by borrower,reservedate " if ($order eq "borrower");
$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by biblio.title, priority,reservedate " if ($order eq "biblio");
my $sth=$dbh->prepare($strsth);
warn "".$strsth;
@@ -107,7 +107,11 @@
$sth->finish;
-$template->param( todaysdate => format_date($todaysdate),
- reserveloop => \@reservedata );
+$template->param(todaysdate => format_date($todaysdate),
+ reserveloop => \@reservedata,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
print "Content-Type: text/html\n\n", $template->output;
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- circ/returns.pl 8 Jun 2006 15:36:31 -0000 1.41
+++ circ/returns.pl 4 Jul 2006 14:36:51 -0000 1.42
@@ -134,7 +134,7 @@
$template->param(
itemtitle => $iteminfo->{'title'},
iteminfo => $iteminfo->{'author'},
- branchname => $branchname,
+ tobranchname => $branchname,
name => $name,
bornum => $borrnum,
borcnum => $borcnum,
@@ -267,7 +267,7 @@
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
currentbranch => $branches->{ $branch }->{'branchname'},
- branchname => $branches->{ $res->{'branchcode'} }->{'branchname'},
+ tobranchname => $branches->{ $res->{'branchcode'} }->{'branchname'},
waiting => 1,
itemnumber => $res->{'itemnumber'},
itemtitle => $iteminfo->{'title'},
@@ -506,9 +506,12 @@
$template->param(
genbrname => $branches->{$branch}->{'branchname'},
genprname => $printers->{$printer}->{'printername'},
- branch => $branch,
+ branchname => $branches->{$branch}->{'branchname'},
printer => $printer,
- errmsgloop => \@errmsgloop
+ errmsgloop => \@errmsgloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
# actually print the page!
Index: circ/selectbranchprinter.pl
===================================================================
RCS file: /sources/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- circ/selectbranchprinter.pl 7 Jun 2006 04:43:48 -0000 1.14
+++ circ/selectbranchprinter.pl 4 Jul 2006 14:36:51 -0000 1.15
@@ -129,7 +129,10 @@
printername => $printername,
branchname => $branchname,
printerloop => \@printerloop,
- branchloop => \@branchloop
+ branchloop => \@branchloop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
my $branchcookie=$query->cookie(-name => 'branch', -value => "$branch", -expires => '+1y');
Index: export/marc.pl
===================================================================
RCS file: /sources/koha/koha/export/marc.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- export/marc.pl 6 Jan 2006 16:39:37 -0000 1.6
+++ export/marc.pl 4 Jul 2006 14:36:51 -0000 1.7
@@ -15,7 +15,8 @@
my $dbh=C4::Context->dbh;
if ($op eq "export") {
- print $query->header('Content-Type: text/marc');
+ print $query->header( -type => 'application/octet-stream',
+ -attachment=>'koha.mrc');
my $start_bib = $query->param("start_bib");
my $end_bib = $query->param("end_bib");
my $format = $query->param("format");
@@ -81,6 +82,7 @@
-default => '',
-labels => \%itemtypes,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
$sth->finish;
@@ -103,7 +105,12 @@
flagsrequired => {parameters => 1, management => 1, tools => 1},
debug => 1,
});
- $template->param(branchloop=>\@branchloop,CGIitemtype=>$CGIitemtype);
+ $template->param(branchloop=>\@branchloop,
+ CGIitemtype=>$CGIitemtype,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
}
Index: import/breeding.pl
===================================================================
RCS file: /sources/koha/koha/import/breeding.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- import/breeding.pl 4 May 2005 08:52:13 -0000 1.4
+++ import/breeding.pl 4 Jul 2006 14:36:52 -0000 1.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: breeding.pl,v 1.4 2005/05/04 08:52:13 tipaul Exp $
+# $Id: breeding.pl,v 1.5 2006/07/04 14:36:52 toins Exp $
# Script for handling import of MARC data into Koha db
# and Z39.50 lookups
@@ -30,7 +30,7 @@
use strict;
# standard or CPAN modules used
-use CGI;
+use CGI qw(:standard);
use DBI;
# Koha modules used
@@ -94,7 +94,10 @@
);
}
-
+$template-param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
my $menu;
my $file;
@@ -103,6 +106,9 @@
#---------------
# log cleared, as marcimport is (almost) rewritten from scratch.
# $Log: breeding.pl,v $
+# Revision 1.5 2006/07/04 14:36:52 toins
+# Head & rel_2_2 merged
+#
# Revision 1.4 2005/05/04 08:52:13 tipaul
# synch'ing 2.2 and head
#
@@ -209,7 +215,7 @@
#
#!/usr/bin/perl
-# $Id: breeding.pl,v 1.4 2005/05/04 08:52:13 tipaul Exp $
+# $Id: breeding.pl,v 1.5 2006/07/04 14:36:52 toins Exp $
# Script for handling import of MARC data into Koha db
# and Z39.50 lookups
@@ -312,6 +318,9 @@
#---------------
# log cleared, as marcimport is (almost) rewritten from scratch.
# $Log: breeding.pl,v $
+# Revision 1.5 2006/07/04 14:36:52 toins
+# Head & rel_2_2 merged
+#
# Revision 1.4 2005/05/04 08:52:13 tipaul
# synch'ing 2.2 and head
#
Index: maint/catmaintain.pl
===================================================================
RCS file: /sources/koha/koha/maint/catmaintain.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- maint/catmaintain.pl 7 Mar 2004 05:47:32 -0000 1.6
+++ maint/catmaintain.pl 4 Jul 2006 14:36:52 -0000 1.7
@@ -100,6 +100,10 @@
$template->param(type => 'intranet',
"$type-p" => 1,
- %params);
+ %params,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- members/deletemem.pl 16 Jun 2006 09:45:02 -0000 1.8
+++ members/deletemem.pl 4 Jul 2006 14:36:52 -0000 1.9
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: deletemem.pl,v 1.8 2006/06/16 09:45:02 btoumi Exp $
+# $Id: deletemem.pl,v 1.9 2006/07/04 14:36:52 toins Exp $
#script to delete items
#written 2/5/00
@@ -102,6 +102,10 @@
# print "<TR><TD>Guarantees</td></tr>";
# }
# print "</table>";
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
} else {
Index: members/member-flags.pl
===================================================================
RCS file: /sources/koha/koha/members/member-flags.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- members/member-flags.pl 22 Sep 2005 10:01:46 -0000 1.4
+++ members/member-flags.pl 4 Jul 2006 14:36:52 -0000 1.5
@@ -81,7 +81,11 @@
$template->param(member => $member,
surname => $bor->{'surname'},
firstname => $bor->{'firstname'},
- loop => \@loop);
+ loop => \@loop,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: members/member-password.pl
===================================================================
RCS file: /sources/koha/koha/members/member-password.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- members/member-password.pl 2 Sep 2004 16:27:09 -0000 1.3
+++ members/member-password.pl 4 Jul 2006 14:36:52 -0000 1.4
@@ -80,6 +80,10 @@
}
-$template->param( member => $member );
+$template->param( member => $member,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: members/member.pl
===================================================================
RCS file: /sources/koha/koha/members/member.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- members/member.pl 7 Jun 2006 03:27:51 -0000 1.12
+++ members/member.pl 4 Jul 2006 14:36:52 -0000 1.13
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: member.pl,v 1.12 2006/06/07 03:27:51 rangi Exp $
+# $Id: member.pl,v 1.13 2006/07/04 14:36:52 toins Exp $
#script to do a borrower enquiery/brin up borrower details etc
#written 20/12/99 by chris at katipo.co.nz
@@ -98,6 +98,8 @@
streetaddress => $results->[$i]{'streetaddress'},
city => $results->[$i]{'city'},
branchcode => $results->[$i]{'branchcode'},
+ overdues => $od,
+ issues => $issue,
odissue => "$od/$issue",
fines => sprintf("%.2f",$fines),
borrowernotes => $results->[$i]{'borrowernotes'},
@@ -111,6 +113,10 @@
$template->param(
member => $member,
numresults => $count,
- resultsloop => \@resultsdata );
+ resultsloop => \@resultsdata,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- members/memberentry.pl 27 Jun 2006 09:37:23 -0000 1.36
+++ members/memberentry.pl 4 Jul 2006 14:36:52 -0000 1.37
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.36 2006/06/27 09:37:23 btoumi Exp $
+# $Id: memberentry.pl,v 1.37 2006/07/04 14:36:52 toins Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -265,6 +265,7 @@
if ($ethnicitycategoriescount>=0) {
$ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
-id => 'ethnicity',
+ -tabindex=>'',
-values=>$categories,
-default=>$data{'ethnicity'},
-labels=>$labels);
Index: members/members-home.pl
===================================================================
RCS file: /sources/koha/koha/members/members-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/members-home.pl 13 Jan 2005 21:48:50 -0000 1.2
+++ members/members-home.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -33,5 +33,8 @@
});
}
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- members/moremember.pl 16 Jun 2006 07:20:48 -0000 1.27
+++ members/moremember.pl 4 Jul 2006 14:36:52 -0000 1.28
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.27 2006/06/16 07:20:48 btoumi Exp $
+# $Id: moremember.pl,v 1.28 2006/07/04 14:36:52 toins Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -229,10 +229,15 @@
$template->param($data);
$template->param(
bornum => $bornum,
- totalprice =>$totalprice,
- totaldue =>$total,
+ totalprice =>sprintf("%.2f",$totalprice),
+ totaldue => sprintf("%.2f",$total),
issueloop => \@issuedata,
unvalidlibrarian => $unvalidlibrarian,
- reserveloop => \@reservedata);
+ reserveloop => \@reservedata,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ patronimages => C4::Context->preference("patronimages"),
+ );
output_html_with_http_headers $input, $cookie, $template->output;
Index: members/setdebar.pl
===================================================================
RCS file: /sources/koha/koha/members/setdebar.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/setdebar.pl 9 Feb 2005 21:58:40 -0000 1.2
+++ members/setdebar.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -35,7 +35,6 @@
$flagsrequired->{borrower}=1;
my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
-
my $destination = $input->param("destination");
my $cardnumber = $input->param("cardnumber");
my $borrowernumber=$input->param('borrowernumber');
Index: misc/Install.pm
===================================================================
RCS file: /sources/koha/koha/misc/Install.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- misc/Install.pm 18 Apr 2006 04:53:40 -0000 1.93
+++ misc/Install.pm 4 Jul 2006 14:36:52 -0000 1.94
@@ -890,6 +890,18 @@
push @missing, "Net::Z3950";
}
}
+ unless (eval {require LWP::Simple) {
+ showmessage(getmessage('LWP::Simple'), 'PressEnter', '', 1);
+ if ($#missing>=0) { # see above note
+ push @missing, "LWP::Simple";
+ }
+ }
+ unless (eval {require XML::Simple) {
+ showmessage(getmessage('XML::Simple'), 'PressEnter', '', 1);
+ if ($#missing>=0) { # see above note
+ push @missing, "XML::Simple";
+ }
+ }
#
# Print out a list of any missing modules
Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- opac/opac-MARCdetail.pl 21 May 2006 02:07:44 -0000 1.12
+++ opac/opac-MARCdetail.pl 4 Jul 2006 14:36:52 -0000 1.13
@@ -80,10 +80,6 @@
authnotrequired => 1,
debug => 1,
});
-$template->param(LibraryName => C4::Context->preference("LibraryName"),
- suggestion => C4::Context->preference("suggestion"),
- virtualshelves => C4::Context->preference("virtualshelves"),
-);
# fill arrays
my @loop_data =();
@@ -182,7 +178,13 @@
for my $i (0..$#subf) {
next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10);
$witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
- $this_row{$subf[$i][0]} =$subf[$i][1];
+ if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
+ $this_row{$subf[$i][0]}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ } elsif ($tagslib->{$field->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ $this_row{$subf[$i][0]}=DisplayISBN($subf[$i][1]);
+ } else {
+ $this_row{$subf[$i][0]}=get_authorised_value_desc($field->tag(), $subf[$i][0], $subf[$i][1], '', $dbh);
+ }
}
if (%this_row) {
push(@big_array, \%this_row);
Index: opac/opac-addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- opac/opac-addbookbybiblionumber.pl 21 May 2006 02:10:32 -0000 1.4
+++ opac/opac-addbookbybiblionumber.pl 4 Jul 2006 14:36:52 -0000 1.5
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.4 2006/05/21 02:10:32 kados Exp $
+# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.5 2006/07/04 14:36:52 toins Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -71,6 +71,7 @@
-values => \@shelvesloop,
-labels => \%shelvesloop,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
}
@@ -91,6 +92,9 @@
output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: opac-addbookbybiblionumber.pl,v $
+# Revision 1.5 2006/07/04 14:36:52 toins
+# Head & rel_2_2 merged
+#
# Revision 1.4 2006/05/21 02:10:32 kados
# syncing dev-week and HEAD
#
Index: opac/opac-dictionary.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-dictionary.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/opac-dictionary.pl 20 Jun 2005 14:33:32 -0000 1.2
+++ opac/opac-dictionary.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -205,7 +205,10 @@
} else {
$to = (($startfrom+1)*$resultsperpage);
}
- $template->param(anindex => $input->param('index'));
+ $template->param(anindex => $input->param('index'),
+ opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
+ opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
+ );
$template->param(result => \@results,
catresult=> \@catresults,
search => $search[0],
Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- opac/opac-main.pl 7 Jun 2006 04:56:55 -0000 1.22
+++ opac/opac-main.pl 4 Jul 2006 14:36:52 -0000 1.23
@@ -62,7 +62,6 @@
$counter++;
}
my $languages_count = @options;
-
if($languages_count > 1){
$template->param(languages => \@options);
}
@@ -92,8 +91,7 @@
}
-$template->param(CGIitemtype => $CGIitemtype,
- suggestion => C4::Context->preference("suggestion"),
+$template->param( suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
textmessaging => $borrower->{textmessaging},
opaclargeimage => C4::Context->preference("opaclargeimage"),
Index: opac/opac-moredetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- opac/opac-moredetail.pl 26 Mar 2003 04:42:56 -0000 1.5
+++ opac/opac-moredetail.pl 4 Jul 2006 14:36:52 -0000 1.6
@@ -8,7 +8,7 @@
use C4::Search;
use C4::Koha;
use C4::Output;
-use C4::Acquisitions;
+use C4::Acquisition;
use C4::Biblio;
use C4::Date;
use HTML::Template;
Index: opac/opac-passwd.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-passwd.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/opac-passwd.pl 4 Aug 2005 14:19:50 -0000 1.2
+++ opac/opac-passwd.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -73,6 +73,10 @@
# Called Empty, Ask for data.
$template->param('Ask_data' => '1');
}
+
+$template->param(LibraryName => C4::Context->preference("LibraryName"),
+);
+
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- opac/opac-search.pl 21 May 2006 02:27:24 -0000 1.36
+++ opac/opac-search.pl 4 Jul 2006 14:36:52 -0000 1.37
@@ -89,6 +89,7 @@
$value[$i] =~ s/-//g;
}
}
+ }
if ($itemtypesstring ne ''){
$searchdesc .= 'filtered by itemtypes ';
$searchdesc .= join(" ", at itemtypes)
@@ -425,7 +426,6 @@
# CHRIS : Whats this?
# classlist => $classlist,
- CGIitemtype => $CGIitemtype,
CGIbranch => $CGIbranch,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
Index: opac/opac-searchresults.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- opac/opac-searchresults.pl 22 Sep 2005 10:01:46 -0000 1.18
+++ opac/opac-searchresults.pl 4 Jul 2006 14:36:52 -0000 1.19
@@ -123,9 +123,6 @@
}
$template->param(numbers => $numbers,
- LibraryName => C4::Context->preference("LibraryName"),
- suggestion => C4::Context->preference("suggestion"),
- virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-suggestions.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- opac/opac-suggestions.pl 4 May 2005 09:02:38 -0000 1.4
+++ opac/opac-suggestions.pl 4 Jul 2006 14:36:52 -0000 1.5
@@ -23,14 +23,29 @@
my $op = $input->param('op');
$op = 'else' unless $op;
+my ($template, $borrowernumber, $cookie);
+
my $dbh = C4::Context->dbh;
-my ($template, $borrowernumber, $cookie)
+
+if (C4::Context->preference("AnonSuggestions")) {
+ ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "opac-suggestions.tmpl",
+ query => $input,
type => "opac",
+ authnotrequired => 1,
+ });
+if (!$borrowernumber) {
+ $borrowernumber = C4::Context->preference("AnonSuggestions");
+}
+} else {
+ ($template, $borrowernumber, $cookie)
+ = get_template_and_user({template_name => "opac-suggestions.tmpl",
query => $input,
+ type => "opac",
authnotrequired => 1,
- flagsrequired => {borrow => 1},
});
+}
+
if ($op eq "add_confirm") {
&newsuggestion($borrowernumber,$title,$author,$publishercode,$note,$copyrightdate,$volumedesc,$publicationyear,$place,$isbn,'');
# empty fields, to avoid filter in "searchsuggestion"
@@ -61,7 +76,5 @@
status => $status,
suggestedbyme => $suggestedbyme,
"op_$op" => 1,
- suggestion => C4::Context->preference("suggestion"),
- virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: reports/acquisitions_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- reports/acquisitions_stats.pl 27 Jun 2006 00:37:34 -0000 1.10
+++ reports/acquisitions_stats.pl 4 Jul 2006 14:36:52 -0000 1.11
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: acquisitions_stats.pl,v 1.10 2006/06/27 00:37:34 sushi Exp $
+# $Id: acquisitions_stats.pl,v 1.11 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -59,17 +59,19 @@
my $del = $input->param("sep");
#warn "calcul : ".$calc;
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => $fullreportname,
+my ($template, $borrowernumber, $cookie)
+ = get_template_and_user({template_name => $fullreportname,
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { editcatalogue => 1 },
+ flagsrequired => {editcatalogue => 1},
debug => 1,
- }
-);
-$template->param( do_it => $do_it );
+ });
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
#warn
Index: reports/bor_issues_top.pl
===================================================================
RCS file: /sources/koha/koha/reports/bor_issues_top.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- reports/bor_issues_top.pl 24 May 2006 08:14:48 -0000 1.6
+++ reports/bor_issues_top.pl 4 Jul 2006 14:36:52 -0000 1.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: bor_issues_top.pl,v 1.6 2006/05/24 08:14:48 btoumi Exp $
+# $Id: bor_issues_top.pl,v 1.7 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -62,7 +62,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($limit, $column, \@filters);
Index: reports/borrowers_out.pl
===================================================================
RCS file: /sources/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- reports/borrowers_out.pl 12 May 2006 09:45:51 -0000 1.5
+++ reports/borrowers_out.pl 4 Jul 2006 14:36:52 -0000 1.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: borrowers_out.pl,v 1.5 2006/05/12 09:45:51 btoumi Exp $
+# $Id: borrowers_out.pl,v 1.6 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -61,7 +61,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($limit, $column, \@filters);
Index: reports/borrowers_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/borrowers_stats.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- reports/borrowers_stats.pl 26 Oct 2005 09:13:37 -0000 1.9
+++ reports/borrowers_stats.pl 4 Jul 2006 14:36:52 -0000 1.10
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: borrowers_stats.pl,v 1.9 2005/10/26 09:13:37 tipaul Exp $
+# $Id: borrowers_stats.pl,v 1.10 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -408,4 +408,3 @@
return \@mainloop;
}
-1;
\ No newline at end of file
Index: reports/cat_issues_top.pl
===================================================================
RCS file: /sources/koha/koha/reports/cat_issues_top.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- reports/cat_issues_top.pl 24 May 2006 08:14:48 -0000 1.8
+++ reports/cat_issues_top.pl 4 Jul 2006 14:36:52 -0000 1.9
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: cat_issues_top.pl,v 1.8 2006/05/24 08:14:48 btoumi Exp $
+# $Id: cat_issues_top.pl,v 1.9 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -62,7 +62,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($limit, $column, \@filters);
Index: reports/catalogue_out.pl
===================================================================
RCS file: /sources/koha/koha/reports/catalogue_out.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reports/catalogue_out.pl 6 Jan 2006 16:39:42 -0000 1.3
+++ reports/catalogue_out.pl 4 Jul 2006 14:36:52 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: catalogue_out.pl,v 1.3 2006/01/06 16:39:42 tipaul Exp $
+# $Id: catalogue_out.pl,v 1.4 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -61,7 +61,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($limit, $column, \@filters);
Index: reports/inventory.pl
===================================================================
RCS file: /sources/koha/koha/reports/inventory.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/inventory.pl 12 Feb 2004 09:16:51 -0000 1.1
+++ reports/inventory.pl 4 Jul 2006 14:36:52 -0000 1.2
@@ -24,6 +24,7 @@
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2;
+use C4::Date;
use HTML::Template;
# Fixed variables
@@ -46,6 +47,8 @@
$offset=0 unless $offset;
my $pagesize = $input->param('pagesize');
$pagesize=20 unless $pagesize;
+my $uploadbarcodes = $input->param('uploadbarcodes');
+# warn "uploadbarcodes : ".$uploadbarcodes;
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "reports/inventory.tmpl",
@@ -60,20 +63,66 @@
offset => $offset,
pagesize => $pagesize,
datelastseen => $datelastseen,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
-if ($markseen) {
+if ($uploadbarcodes && length($uploadbarcodes)>0){
+ my $dbh=C4::Context->dbh;
+ my $date=format_date($input->param('setdate'));
+ $date = format_date("today") unless $date;
+# warn "$date";
+ my $strsth="update items set (datelastseen = $date) where items.barcode =?";
+ my $qupdate = $dbh->prepare($strsth);
+ my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =? and issues.returndate is null";
+ my $qonloan = $dbh->prepare($strsth);
+ my $strsth="select * from items where items.barcode =? and issues.wthdrawn=1";
+ my $qwthdrawn = $dbh->prepare($strsth);
+ my @errorloop;
+ my $count=0;
+ while (my $barcode=<$uploadbarcodes>){
+ chomp $barcode;
+# warn "$barcode";
+ if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){
+ push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};
+ }else{
+ $qupdate->execute($barcode);
+ $count += $qupdate->rows;
+# warn "$count";
+ if ($count){
+ $qonloan->execute($barcode);
+ if ($qonloan->rows){
+ my $data = $qonloan->fetchrow_hashref;
+ my ($doreturn, $messages, $iteminformation, $borrower) =returnbook($barcode, $data->{homebranch});
+ if ($doreturn){push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_RET'=>1}}
+ else {push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_NOT_RET'=>1}}
+ }
+ } else {
+ push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
+ }
+ }
+ }
+ $qupdate->finish;
+ $qonloan->finish;
+ $qwthdrawn->finish;
+ $template->param(date=>$date,Number=>$count);
+# $template->param(errorfile=>$errorfile) if ($errorfile);
+ $template->param(errorloop=>\@errorloop) if (@errorloop);
+}else{
+ if ($markseen) {
foreach my $field ($input->param) {
if ($field =~ /SEEN-(.*)/) {
&itemseen($1);
}
}
-}
-if ($minlocation) {
+ }
+ if ($minlocation) {
my $res = C4::Circulation::Circ2::listitemsforinventory($minlocation,$maxlocation,$datelastseen,$offset,$pagesize);
$template->param(loop =>$res,
nextoffset => ($offset+$pagesize),
prevoffset => ($offset?$offset-$pagesize:0),
);
+ }
}
output_html_with_http_headers $input, $cookie, $template->output;
Index: reports/issues_avg_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/issues_avg_stats.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reports/issues_avg_stats.pl 4 May 2005 09:02:39 -0000 1.3
+++ reports/issues_avg_stats.pl 4 Jul 2006 14:36:52 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: issues_avg_stats.pl,v 1.3 2005/05/04 09:02:39 tipaul Exp $
+# $Id: issues_avg_stats.pl,v 1.4 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -64,7 +64,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($line, $column, $rodsp, $podsp, $calc, \@filters);
Index: reports/issues_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- reports/issues_stats.pl 6 Jan 2006 16:39:42 -0000 1.11
+++ reports/issues_stats.pl 4 Jul 2006 14:36:52 -0000 1.12
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: issues_stats.pl,v 1.11 2006/01/06 16:39:42 tipaul Exp $
+# $Id: issues_stats.pl,v 1.12 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -68,7 +68,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param(do_it => $do_it);
+$template->param(do_it => $do_it,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
if ($do_it) {
# Displaying results
my $results = calculate($line, $column, $podsp, $type, $daysel, $monthsel, $calc, \@filters);
Index: reports/manager.pl
===================================================================
RCS file: /sources/koha/koha/reports/manager.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- reports/manager.pl 1 Mar 2005 13:41:32 -0000 1.2
+++ reports/manager.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -40,7 +40,11 @@
debug => 1,
});
$template->param(do_it => $do_it,
- report_name => $report_name);
+ report_name => $report_name,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
my $cgidir = C4::Context->config('intranetdir')."/cgi-bin/reports/";
unless (opendir(DIR, "$cgidir")) {
$cgidir = C4::Context->intranetdir."/reports/";
Index: reports/reports-home.pl
===================================================================
RCS file: /sources/koha/koha/reports/reports-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- reports/reports-home.pl 17 Jan 2006 16:43:39 -0000 1.2
+++ reports/reports-home.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -17,4 +17,8 @@
flagsrequired => {catalogue => 1},
debug => 1,
});
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
Index: search.marc/dictionary.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- search.marc/dictionary.pl 6 Jan 2006 16:39:42 -0000 1.10
+++ search.marc/dictionary.pl 4 Jul 2006 14:36:52 -0000 1.11
@@ -254,7 +254,11 @@
$template->param(search => $search[0],
marclist =>$field,
type=>$type,
- anindex => $input->param('index'));
+ anindex => $input->param('index'),
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
# Print the page
output_html_with_http_headers $input, $cookie, $template->output;
Index: search.marc/search.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/search.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- search.marc/search.pl 24 Mar 2006 13:20:58 -0000 1.30
+++ search.marc/search.pl 4 Jul 2006 14:36:52 -0000 1.31
@@ -150,15 +150,12 @@
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
if ($total == 1) {
# if only 1 answer, jump directly to the biblio
- # here we need to check if MARC searching is turned on or off.
- # if on, go to MARCdetail.pl else go to
- # detail.pl
- my $marc_bool = C4::Context->boolean_preference("MARC") || 0;
- if ($marc_bool eq "1") {
- print $query->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=".@$results[0]->{biblionumber});
- }
- else {
- print $query->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=".@$results[0]->{biblionumber});
+ if (C4::Context->preference("IntranetBiblioDefaultView") eq "normal") {
+ print $query->redirect("/cgi-bin/koha/detail.pl?bib=".@$results[0]->{biblionumber});
+ } elsif (C4::Context->preference("IntranetBiblioDefaultView") eq "marc") {
+ print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
+ } else {
+ print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
}
exit
}
@@ -213,6 +210,7 @@
} else {
$to = (($startfrom+1)*$resultsperpage);
}
+ my $defaultview = 'BiblioDefaultView'.C4::Context->preference('IntranetBiblioDefaultView');
$template->param(result => $results,
startfrom=> $startfrom,
displaynext=> $displaynext,
@@ -226,11 +224,13 @@
to=>$to,
numbers=>\@numbers,
searchdesc=> $searchdesc,
+ desc_asc=>$desc_or_asc,
+ orderby=>$orderby,
MARC_ON => C4::Context->preference("marc"),
+ $defaultview => 1,
);
} elsif ($op eq "AddStatement") {
-
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "search.marc/search.tmpl",
query => $query,
@@ -319,6 +319,7 @@
my $marclist = CGI::scrolling_list(-name=>"marclist",
-values=> $marcarray,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
-onChange => "sql_update()",
);
@@ -345,6 +346,7 @@
-values => \@itemtype,
-labels => \%itemtypes,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
$sth->finish;
@@ -374,6 +376,10 @@
# Print the page
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
# Local Variables:
Index: search.marc/suggest.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/suggest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- search.marc/suggest.pl 13 Jul 2004 12:53:53 -0000 1.2
+++ search.marc/suggest.pl 4 Jul 2006 14:36:52 -0000 1.3
@@ -54,7 +54,11 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
-$template->param("loop" => \@loop_suggests);
+$template->param("loop" => \@loop_suggests,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ );
output_html_with_http_headers $query, $cookie, $template->output;
1;
Index: suggestion/acceptorreject.pl
===================================================================
RCS file: /sources/koha/koha/suggestion/acceptorreject.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- suggestion/acceptorreject.pl 15 Jul 2004 09:42:47 -0000 1.1
+++ suggestion/acceptorreject.pl 4 Jul 2006 14:36:52 -0000 1.2
@@ -55,5 +55,8 @@
my $suggestions_loop= &searchsuggestion("","","","",'ASKED',"");
$template->param(suggestions_loop => $suggestions_loop,
"op_$op" => 1,
+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- updater/updatedatabase 27 Jun 2006 09:26:37 -0000 1.152
+++ updater/updatedatabase 4 Jul 2006 14:36:52 -0000 1.153
@@ -1,6 +1,10 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.152 2006/06/27 09:26:37 btoumi Exp $
+<<<<<<< updatedatabase
+# $Id: updatedatabase,v 1.153 2006/07/04 14:36:52 toins Exp $
+=======
+# $Id: updatedatabase,v 1.153 2006/07/04 14:36:52 toins Exp $
+>>>>>>> 1.100.2.46
# Database Updater
# This script checks for required updates to the database.
@@ -17,6 +21,7 @@
# CPAN modules
use DBI;
use Getopt::Long;
+
# Koha modules
use C4::Context;
@@ -40,9 +45,7 @@
);
my $silent;
-GetOptions(
- 's' =>\$silent
- );
+GetOptions( 's' => \$silent );
my $dbh = C4::Context->dbh;
print "connected to your DB. Checking & modifying it\n" unless $silent;
$|=1; # flushes output
@@ -140,10 +143,78 @@
`city_zipcode` char(20),
PRIMARY KEY (`cityid`)
)",
+<<<<<<< updatedatabase
roadtype => "(`roadtypeid` int auto_increment,
`road_type` char(100) NOT NULL,
PRIMARY KEY (`roadtypeid`)
+=======
+ marc_word => "(
+ bibid bigint(20) NOT NULL default '0',
+ tag char(3) NOT NULL default '',
+ tagorder tinyint(4) NOT NULL default '1',
+ subfieldid char(1) NOT NULL default '',
+ subfieldorder tinyint(4) NOT NULL default '1',
+ word varchar(255) NOT NULL default '',
+ sndx_word varchar(255) NOT NULL default '',
+ KEY bibid (bibid),
+ KEY tag (tag),
+ KEY tagorder (tagorder),
+ KEY subfieldid (subfieldid),
+ KEY subfieldorder (subfieldorder),
+ KEY word (word),
+ KEY sndx_word (sndx_word)
+ )",
+ marc_breeding => "( id bigint(20) NOT NULL auto_increment,
+ file varchar(80) NOT NULL default '',
+ isbn varchar(10) NOT NULL default '',
+ title varchar(128) default NULL,
+ author varchar(80) default NULL,
+ marc text NOT NULL,
+ encoding varchar(40) default NULL,
+ PRIMARY KEY (id),
+ KEY title (title),
+ KEY isbn (isbn)
+ )",
+ authorised_values => "(id int(11) NOT NULL auto_increment,
+ category char(10) NOT NULL default '',
+ authorised_value char(80) NOT NULL default '',
+ lib char(80) NULL,
+ PRIMARY KEY (id),
+ KEY name (category)
+ )",
+ userflags => "( bit int(11) NOT NULL default '0',
+ flag char(30), flagdesc char(255),
+ defaulton int(11)
+ )",
+ auth_types => "(
+ authtypecode char(10) not NULL,
+ authtypetext char(255) not NULL,
+ auth_tag_to_report char(3) not NULL,
+ summary text not NULL,
+ PRIMARY KEY (authtypecode)
+ )",
+ biblio_framework => "(
+ frameworkcode char(4) not NULL,
+ frameworktext char(255) not NULL,
+ PRIMARY KEY (frameworkcode)
)",
+ auth_subfield_structure => "(
+ authtypecode char(10) NOT NULL default '',
+ tagfield char(3) NOT NULL default '',
+ tagsubfield char(1) NOT NULL default '',
+ liblibrarian char(255) NOT NULL default '',
+ libopac char(255) NOT NULL default '',
+ repeatable tinyint(4) NOT NULL default '0',
+ mandatory tinyint(4) NOT NULL default '0',
+ tab tinyint(1) default NULL,
+ authorised_value char(10) default NULL,
+ value_builder char(80) default NULL,
+ seealso char(255) default NULL,
+ PRIMARY KEY (authtypecode,tagfield,tagsubfield),
+ KEY tab (authtypecode,tab)
+>>>>>>> 1.100.2.46
+ )",
+<<<<<<< updatedatabase
labels => "(
labelid int(11) NOT NULL auto_increment,
@@ -180,9 +251,160 @@
borrower2 integer
)",
+=======
+ auth_tag_structure => "(
+ authtypecode char(10) NOT NULL default '',
+ tagfield char(3) NOT NULL default '',
+ liblibrarian char(255) NOT NULL default '',
+ libopac char(255) NOT NULL default '',
+ repeatable tinyint(4) NOT NULL default '0',
+ mandatory tinyint(4) NOT NULL default '0',
+ authorised_value char(10) default NULL,
+ PRIMARY KEY (authtypecode,tagfield)
+ )",
+ auth_header => "(
+ authid bigint(20) unsigned NOT NULL auto_increment,
+ authtypecode char(10) NOT NULL default '',
+ datecreated date NOT NULL default '0000-00-00',
+ datemodified date default NULL,
+ origincode char(20) default NULL,
+ PRIMARY KEY (authid),
+ KEY origincode (origincode)
+ ) ",
+ auth_subfield_table => "(
+ subfieldid bigint(20) unsigned NOT NULL auto_increment,
+ authid bigint(20) unsigned NOT NULL default '0',
+ tag char(3) NOT NULL default '',
+ tagorder tinyint(4) NOT NULL default '1',
+ tag_indicator char(2) NOT NULL default '',
+ subfieldcode char(1) NOT NULL default '',
+ subfieldorder tinyint(4) NOT NULL default '1',
+ subfieldvalue varchar(255) default NULL,
+ PRIMARY KEY (subfieldid),
+ KEY authid (authid),
+ KEY tag (tag),
+ KEY subfieldcode (subfieldcode),
+ KEY subfieldvalue (subfieldvalue)
+ )",
+ auth_word => "(
+ authid bigint(20) NOT NULL default '0',
+ tagsubfield char(4) NOT NULL default '',
+ tagorder tinyint(4) NOT NULL default '1',
+ subfieldorder tinyint(4) NOT NULL default '1',
+ word varchar(255) NOT NULL default '',
+ sndx_word varchar(255) NOT NULL default '',
+ KEY authid (authid),
+ KEY marc_search (tagsubfield,word),
+ KEY word (word),
+ KEY sndx_word (sndx_word)
+ )",
+ suggestions => "(
+ suggestionid int(8) NOT NULL auto_increment,
+ suggestedby int(11) NOT NULL default '0',
+ managedby int(11) default NULL ,
+ STATUS varchar(10) NOT NULL default '',
+ note text,
+ author varchar(80) default NULL ,
+ title varchar(80) default NULL ,
+ copyrightdate smallint(6) default NULL ,
+ publishercode varchar(255) default NULL ,
+ date timestamp(8) NOT NULL ,
+ volumedesc varchar(255) default NULL ,
+ publicationyear smallint(6) default '0',
+ place varchar(255) default NULL ,
+ isbn varchar(10) default NULL ,
+ mailoverseeing smallint(1) default '0',
+ biblionumber int(11) default NULL ,
+ PRIMARY KEY (suggestionid) ,
+ KEY suggestedby(suggestedby) ,
+ KEY managedby(managedby)
+ )",
+ aqbasket => "(basketno int(11) NOT NULL auto_increment,
+ creationdate date,
+ closedate date,
+ booksellerid varchar(10),
+ authorisedby varchar(10),
+ booksellerinvoicenumber text,
+ PRIMARY KEY (basketno)
+ )",
+ serial => "(serialid int(11) NOT NULL auto_increment,
+ biblionumber varchar(100) NOT NULL default '',
+ subscriptionid varchar(100) NOT NULL default '',
+ serialseq varchar(100) NOT NULL default '',
+ status tinyint(4) NOT NULL default '0',
+ planneddate date NOT NULL default '0000-00-00',
+ publishedddate date NOT NULL default '0000-00-00',
+ PRIMARY KEY (serialid)
+ )",
+ subscription => "(biblionumber int(11) NOT NULL default '0',
+ subscriptionid int(11) NOT NULL auto_increment,
+ librarian varchar(100) default '',
+ startdate date default '0000-00-00',
+ aqbooksellerid int(11) default '0',
+ cost int(11) default '0',
+ aqbudgetid int(11) default '0',
+ weeklength tinyint(4) default '0',
+ monthlength tinyint(4) default '0',
+ numberlength tinyint(4) default '0',
+ periodicity tinyint(4) default '0',
+ dow varchar(100) default '',
+ numberingmethod varchar(100) default '',
+ notes text,
+ status varchar(100) NOT NULL default '',
+ add1 int(11) default 0,
+ every1 int(11) default 0,
+ whenmorethan1 int(11) default 0,
+ setto1 int(11),
+ lastvalue1 int(11),
+ add2 int(11) default 0,
+ every2 int(11) default 0,
+ whenmorethan2 int(11) default 0,
+ setto2 int(11),
+ lastvalue2 int(11),
+ add3 int(11) default 0,
+ every3 int(11) default 0,
+ innerloop1 int(11) default 0,
+ innerloop2 int(11) default 0,
+ innerloop3 int(11) default 0,
+ whenmorethan3 int(11) default 0,
+ setto3 int(11),
+ lastvalue3 int(11),
+ PRIMARY KEY (subscriptionid)
+ )",
+ subscriptionhistory => "(biblionumber int(11) NOT NULL default '0',
+ subscriptionid int(11) NOT NULL default '0',
+ histstartdate date NOT NULL default '0000-00-00',
+ enddate date default '0000-00-00',
+ missinglist longtext NOT NULL,
+ recievedlist longtext NOT NULL,
+ opacnote varchar(150) NOT NULL default '',
+ librariannote varchar(150) NOT NULL default '',
+ PRIMARY KEY (subscriptionid),
+ KEY biblionumber (biblionumber)
+ )",
+ labels => "(labelid int(11) NOT NULL auto_increment,
+ itemnumber varchar(100) NOT NULL default '',
+ timestamp timestamp(14) NOT NULL,
+ PRIMARY KEY (labelid)
+ )",
+ labels_conf => "(id int(4) NOT NULL auto_increment,
+ barcodetype char(100) default '',
+ title tinyint(1) default '0',
+ isbn tinyint(1) default '0',
+ itemtype tinyint(1) default '0',
+ barcode tinyint(1) default '0',
+ dewey tinyint(1) default '0',
+ class tinyint(1) default '0',
+ author tinyint(1) default '0',
+ papertype char(100) default '',
+ startrow int(2) default NULL,
+ PRIMARY KEY (id)
+ )",
+>>>>>>> 1.100.2.46
);
my %requirefields = (
+<<<<<<< updatedatabase
subscription => { 'letter' => 'char(20) NULL', 'distributedto' => 'text NULL'},
itemtypes => { 'imageurl' => 'char(200) NULL'},
aqbookfund => { 'branchcode' => 'varchar(4) NULL'},
@@ -191,6 +413,72 @@
auth_subfield_structure =>{ 'hidden' => 'TINYINT(3) NOT NULL UNSIGNED ZEROFILL', 'kohafield' => 'VARCHAR(45) NOT NULL', 'linkid' => 'TINYINT(1) NOT NULL UNSIGNED', 'isurl' => 'TINYINT(1) UNSIGNED'},
statistics => { 'associatedborrower' => 'integer'},
# tablename => { 'field' => 'fieldtype' },
+=======
+ biblio => { 'abstract' => 'text' },
+ deletedbiblio => { 'abstract' => 'text', 'marc' => 'blob' },
+ deleteditems =>
+ { 'marc' => 'blob', 'paidfor' => 'text', 'location' => 'varchar(80)' },
+ biblioitems => {
+ 'lccn' => 'char(25)',
+ 'url' => 'varchar(255)',
+ 'marc' => 'text'
+ },
+ deletedbiblioitems => {
+ 'lccn' => 'char(25)',
+ 'url' => 'varchar(255)',
+ 'marc' => 'text'
+ },
+ branchtransfers => { 'datearrived' => 'datetime' },
+ statistics => { 'borrowernumber' => 'int(11)' },
+ aqbooksellers => {
+ 'invoicedisc' => 'float(6,4)',
+ 'nocalc' => 'int(11)'
+ },
+ borrowers => {
+ 'userid' => 'char(30)',
+ 'password' => 'char(30)',
+ 'flags' => 'int(11)',
+ 'textmessaging' => 'varchar(30)',
+ 'zipcode' => 'varchar(25)',
+ 'homezipcode' => 'varchar(25)',
+ 'sort1' => 'char(80)',
+ 'sort2' => 'char(80)',
+ },
+ aqorders => {
+ 'budgetdate' => 'date',
+ 'sort1' => 'char(80)',
+ 'sort2' => 'char(80)',
+ },
+ aqbudget => {
+ 'aqbudgetid' => 'tinyint(4) auto_increment primary key',
+ 'branchcode' => 'varchar(4)',
+ },
+ aqbookfund => { 'branchcode' => 'varchar(4)', },
+ items => { 'paidfor' => 'text', 'location' => 'char(80)' },
+
+ #added so that reference items are not available for reserves...
+ itemtypes => { 'notforloan' => 'smallint(6)' },
+ systempreferences => {
+ 'explanation' => 'char(80)',
+ 'type' => 'char(20)',
+ 'options' => 'text'
+ },
+ z3950servers => { 'syntax' => 'char(80)' },
+ marc_tag_structure =>
+ { 'frameworkcode' => 'char(4) not NULL default \'\'' },
+ marc_subfield_structure => {
+ 'seealso' => 'char(255)',
+ 'frameworkcode' => 'char(4) not NULL default \'\'',
+ 'hidden' => 'tinyint(1)',
+ 'isurl' => 'tinyint(1)',
+ 'link' => 'char(80)',
+ },
+ bookshelf => {
+ 'owner' => 'char(80)',
+ 'category' => 'char(1)',
+ },
+ marc_biblio => { 'frameworkcode' => 'char(4) not NULL default \'\'' },
+>>>>>>> 1.100.2.46
);
my %dropable_table = (
@@ -204,10 +492,21 @@
);
my %uselessfields = (
+<<<<<<< updatedatabase
# tablename => "field1,field2",
borrowers => "suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
deletedborrowers=> "suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
);
+=======
+ aqorders => "requisitionedby,authorisedby,booksellerid,
+ deliverydays,followupdays,
+ numberfollowupsallowed,numberfollowupssent,
+ dateprinted,sourced,quantityreceiveddamaged,
+ subscriptionfrom,subscriptionto
+ "
+);
+
+>>>>>>> 1.100.2.46
# the other hash contains other actions that can't be done elsewhere. they are done
# either BEFORE of AFTER everything else, depending on "when" entry (default => AFTER)
@@ -220,73 +519,605 @@
# values given in the %tabledata hash.
my %tabledata = (
+<<<<<<< updatedatabase
# tablename => [
# { uniquefielrequired => 'fieldname', # the primary key in the table
# fieldname => fieldvalue,
# fieldname2 => fieldvalue2,
# },
# ],
+=======
+ userflags => [
+ {
+ uniquefieldrequired => 'bit',
+ bit => 0,
+ flag => 'superlibrarian',
+ flagdesc => 'Access to all librarian functions',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 1,
+ flag => 'circulate',
+ flagdesc => 'Circulate books',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 2,
+ flag => 'catalogue',
+ flagdesc => 'View Catalogue (Librarian Interface)',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 3,
+ flag => 'parameters',
+ flagdesc => 'Set Koha system paramters',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 4,
+ flag => 'borrowers',
+ flagdesc => 'Add or modify borrowers',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 5,
+ flag => 'permissions',
+ flagdesc => 'Set user permissions',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 6,
+ flag => 'reserveforothers',
+ flagdesc => 'Reserve books for patrons',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 7,
+ flag => 'borrow',
+ flagdesc => 'Borrow books',
+ defaulton => 1
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 8,
+ flag => 'reserveforself',
+ flagdesc => 'Reserve books for self',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 9,
+ flag => 'editcatalogue',
+ flagdesc => 'Edit Catalogue (Modify bibliographic/holdings data)',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 10,
+ flag => 'updatecharges',
+ flagdesc => 'Update borrower charges',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 11,
+ flag => 'acquisition',
+ flagdesc => 'Acquisition and/or suggestion management',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 12,
+ flag => 'management',
+ flagdesc => 'Set library management parameters',
+ defaulton => 0
+ },
+ {
+ uniquefieldrequired => 'bit',
+ bit => 13,
+ flag => 'tools',
+ flagdesc => 'Use tools (export, import, barcodes)',
+ defaulton => 0
+ },
+ ],
+>>>>>>> 1.100.2.46
systempreferences => [
{
uniquefieldrequired => 'variable',
+<<<<<<< updatedatabase
variable => 'Activate_Log',
value => 'On',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Turn Log Actions on DB On an Off',
type => 'YesNo',
+=======
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ variable => 'LibraryName',
+ value =>
+'<i><b>Koha<br/>Free Software ILS<br/><br/></b>Koha : a gift, a contribution<br/> in Maori</i>',
+ explanation => 'Library name as shown on main opac page',
+ type => ''
+
+>>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
+<<<<<<< updatedatabase
variable => 'IndependantBranches',
value => 0,
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Turn Branch independancy management On an Off',
type => 'YesNo',
+=======
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ variable => 'autoMemberNum',
+ value => '1',
+ explanation => 'Member number is auto-calculated',
+ type => 'YesNo'
+
+>>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
+<<<<<<< updatedatabase
variable => 'ReturnBeforeExpiry',
value => 'Off',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'If Yes, Returndate on issuing can\'t be after borrower card expiry',
type => 'YesNo',
+=======
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ variable => 'acquisitions',
+ value => 'normal',
+ explanation =>
+'Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions',
+ type => 'Choice',
+ options => 'simple|normal'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ variable => 'dateformat',
+ value => 'metric',
+ explanation =>
+ 'date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)',
+ type => 'Choice',
+ options => 'metric|us|iso'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'template',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'default',
+ explanation => 'Preference order for intranet interface templates',
+ type => 'Themes'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'autoBarcode',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'yes',
+ explanation => 'Barcode is auto-calculated',
+ type => 'YesNo'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'insecure',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'no',
+ explanation =>
+'If YES, no auth at all is needed. Be careful if you set this to yes!',
+ type => 'YesNo'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'authoritysep',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ value => '--',
+ explanation =>
+ 'the separator used in authority/thesaurus. Usually --',
+ type => 'free',
+ options => '10'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opaclanguages',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'en',
+ explanation =>
+'Set the preferred order for translations. The top language will be tried first.',
+ type => 'Languages'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opacthemes',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'css',
+ explanation =>
+'Set the preferred order for themes. The top theme will be tried first.',
+ type => 'Themes'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'timeout',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '1200',
+ explanation =>
+ 'Inactivity timeout for cookies authentication (in seconds)',
+ type => 'Integer'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'marc',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'yes',
+ explanation => 'Turn on MARC support',
+ type => 'YesNo'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'sortbynonfiling',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'no',
+ explanation => 'Sort search results by MARC nonfiling characters',
+ type => 'YesNo'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'marcflavour',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ value => 'MARC21',
+ explanation =>
+'your MARC flavor (MARC21 or UNIMARC) used for character encoding',
+ type => 'Choice',
+ options => 'MARC21|UNIMARC'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'checkdigit',
+ value => 'none',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ explanation =>
+'Validity checks on membership number: none or "Katipo" style checks',
+ type => 'Choice',
+ options => 'none|katipo'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'maxoutstanding',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '5',
+ explanation =>
+ 'maximum amount withstanding to be able make reserves ',
+ type => 'Integer'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'maxreserves',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '5',
+ explanation => 'maximum number of reserves a member can make',
+ type => 'Integer'
+
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'noissuescharge',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '5',
+ explanation =>
+ 'maximum amount withstanding to be able to check out an item',
+ type => 'Integer'
+
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'KohaAdminEmailAddress',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'your.mail at here',
+ explanation => 'the email address where borrowers modifs are sent',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'gist',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '0.125',
+ explanation =>
+ 'the gist rate. NOT in %, but in numeric form (0.12 for 12%)',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'printcirculationslips',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '0',
+ explanation =>
+ 'if set to 1, print circulation slips. If set to 0, don\'t',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'suggestion',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '0',
+ explanation => 'if set to 1, suggestions are activated in OPAC',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'ISBD',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => 'Fill with appropriate value...',
+ explanation => 'ISBD',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'virtualshelves',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '0',
+ explanation => 'Set virtual shelves management ON or OFF',
+ type => 'YesNo'
},
{
uniquefieldrequired => 'variable',
+ variable => 'itemcallnumber',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ value => '676a',
+ explanation =>
+'The MARC field/subfield that is used to calculate the itemcallnumber (in UNIMARC : 676a for Dewey, 680a for Loc)',
+ type => 'free'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'BiblioDefaultView',
+ value => 'normal',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ explanation =>
+'Define the default view of a biblio. Can be either normal, marc or isbd',
+ type => 'Choice',
+ options => 'normal|marc|isbd'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'LabelMARCView',
+ value => 'standard',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ explanation => 'Define how a MARC record will display',
+ type => 'Choice',
+ options => 'standard|economical'
+>>>>>>> 1.100.2.46
+ },
+
+ {
+ uniquefieldrequired => 'variable',
variable => 'opacstylesheet',
value => '',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'Enter a complete URL to use an alternate stylesheet in OPAC',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Enter a complete URL to use an alternate layout stylesheet in OPAC',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opaccolorstylesheet',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Enter the name of the color stylesheet to use in the OPAC',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opaclayoutstylesheet',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Enter the name of the layout stylesheet to use in the OPAC',
+ type => 'free',
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opacreadinghistory',
+ value => '1',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Turn on/off display of Patron Reading History in OPAC',
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opaclanguagesdisplay',
+ value => '1',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Turn on/off display of Change Language feature on OPAC',
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'patronimages',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Turn on/off display of patron images in Intranet and specify a file extension for images',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'intranetstylesheet',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Enter a complete URL to use an alternate layout stylesheet in Intranet',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'intranetcolorstylesheet',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Enter the name of the color stylesheet to use in Intranet',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'opacsmallimage',
value => '',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'opaclargeimage',
value => '',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'delimiter',
value => ';',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
explanation => 'separator for reports exported to spreadsheet',
type => 'free',
},
@@ -294,10 +1125,13 @@
uniquefieldrequired => 'variable',
variable => 'MIME',
value => 'OPENOFFICE.ORG',
- forceupdate => { 'explanation' => 1,
+ forceupdate => {
+ 'explanation' => 1,
'type' => 1,
- 'options' => 1},
- explanation => 'Define the default application for report exportations into files',
+ 'options' => 1
+ },
+ explanation =>
+'Define the default application for report exportations into files',
type => 'Choice',
options => 'EXCEL|OPENOFFICE.ORG'
},
@@ -305,10 +1139,13 @@
uniquefieldrequired => 'variable',
variable => 'Delimiter',
value => ';',
- forceupdate => { 'explanation' => 1,
+ forceupdate => {
+ 'explanation' => 1,
'type' => 1,
- 'options' => 1},
- explanation => 'Define the default separator character for report exportations into files',
+ 'options' => 1
+ },
+ explanation =>
+'Define the default separator character for report exportations into files',
type => 'Choice',
options => ';|tabulation|,|/|\|#'
},
@@ -316,10 +1153,13 @@
uniquefieldrequired => 'variable',
variable => 'SubscriptionHistory',
value => ';',
- forceupdate => { 'explanation' => 1,
+ forceupdate => {
+ 'explanation' => 1,
'type' => 1,
- 'options' => 1},
- explanation => 'Define the information level for serials history in OPAC',
+ 'options' => 1
+ },
+ explanation =>
+ 'Define the information level for serials history in OPAC',
type => 'Choice',
options => 'simplified|full'
},
@@ -327,8 +1167,10 @@
uniquefieldrequired => 'variable',
variable => 'hidelostitems',
value => 'No',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
explanation => 'show or hide "lost" items in OPAC.',
type => 'YesNo',
},
@@ -336,26 +1178,33 @@
uniquefieldrequired => 'variable',
variable => 'IndependantBranches',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'Turn Branch independancy management On an Off',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation => 'Turn Branch independency management On and Off',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'ReturnBeforeExpiry',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'If Yes, Returndate on issuing can\'t be after borrower card expiry',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'If Yes, Returndate on issuing can\'t be after borrower card expiry',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'Disable_Dictionary',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
explanation => 'Disables Dictionary buttons if set to yes',
type => 'YesNo',
},
@@ -363,31 +1212,255 @@
uniquefieldrequired => 'variable',
variable => 'hide_marc',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'hide marc specific datas like subfield code & indicators to library',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'hide marc specific datas like subfield code & indicators to library',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'NotifyBorrowerDeparture',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'Delay before expiry where a notice is sent when issuing',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+ 'Delay before expiry where a notice is sent when issuing',
type => 'Integer',
},
{
uniquefieldrequired => 'variable',
variable => 'OpacPasswordChange',
value => '1',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Enable/Disable password change in OPAC (disable it when using LDAP auth)',
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'OpacNav',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Use HTML tabs to add navigational links to the left-hand navigational bar in OPAC',
+ type => 'Textarea',
+ options => '70|10'
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'IntranetNav',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation =>
+'Use HTML tabs to add navigational links to the left-hand navigational bar in Intranet',
+ type => 'Textarea',
+ options => '70|10'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'AnonSuggestions',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+ 'Set to anonymous borrowernumber to enable Anonymous suggestions',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'MARCOrgCode',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+'Your MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'AmazonContent',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+'Turn On Amazon Content - You MUST set AmazonDevKey and AmazonAssocTag if enabled',
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'AmazonDevKey',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+'see: aws-portal.amazon.com/gp/aws/developer/registration/index.html',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'AmazonAssocTag',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+ 'see: associates.amazon.com/gp/flex/associates/apply-login.html',
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1,
+ 'options' => 1
+ },
+ variable => 'TemplateEncoding',
+ value => 'iso-8859-1',
+ explanation => 'Specify the encoding to use in Templates',
+ type => 'Choice',
+ options => 'iso-8859-1|utf-8'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opaccredits',
+ value => '',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+ 'Put any HTML Credits at the bottom of the OPAC page',
+ type => 'Textarea',
+ options => '70|10'
+ },
+
+{
+ uniquefieldrequired => 'variable',
+ variable => 'opacheader',
+ value => '',
+ forceupdate => { 'explanation' => 1,
+ 'type' => 1},
+ explanation => 'Enter HTML to be included as a custom header in the OPAC',
+ type => 'Textarea',
+ options => '30|10'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'IntranetBiblioDefaultView',
+ value => 'marc',
+ forceupdate => { 'explanation' => 1,
+ 'type' => 1},
+ explanation => 'Define the default view of a biblio in the intranet. Can be either normal, marc, or ISBD',
+ type => 'Choice',
+ options => 'normal|marc|isbd'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opacbookbag',
+ value => '1',
forceupdate => { 'explanation' => 1,
'type' => 1},
- explanation => 'Enable/Disable password change in OPAC (disable it when using LDAP auth)',
+ explanation => 'Enable or disable display of biblio basket (book bag)',
+ type => 'YesNo'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'opacuserlogin',
+ value => '1',
+ forceupdate => { 'explanation' => 1,
+ 'type' => 1},
+ explanation => 'Enable or disable display of user login features',
+ type => 'YesNo'
+ },
+
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'serialsadditems',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+'If set, a new item will be automatically added when receiving an issue',
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'advancedMARCeditor',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+"If set, the MARC editor won't show you tag/subfields description",
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
+ variable => 'z3950NormalizeAuthor',
+ value => '0',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+"If set, Personnal Authorities will replace authors in biblio.author",
+ type => 'YesNo',
+ },
+ {
+ uniquefieldrequired => 'variable',
+ variable => 'z3950AuthorAuthFields',
+ value => '701,702,700',
+ forceupdate => {
+ 'explanation' => 1,
+ '
+ type' => 1
+ },
+ explanation =>
+"contains the MARC biblio tags of person authorities to fill biblio.author with when importing biblio",
+ type => 'free',
+ },
+ {
+ uniquefieldrequired => 'variable',
variable => 'useDaysMode',
value => 'Calendar',
forceupdate => { 'explanation' => 1,
@@ -406,6 +1479,7 @@
type => 'free',
},
{
+<<<<<<< updatedatabase
uniquefieldrequired => 'variable',
variable => 'borrowerRelationship',
value => 'father|mother,grand-mother',
@@ -413,6 +1487,14 @@
'type' => 1},
explanation => 'The relationships between a guarantor & a guarantee (separated by | or ,)',
type => 'free',
+=======
+ field => 'aqbudgetid',
+ type => 'tinyint(4)',
+ null => '',
+ key => 'PRI',
+ default => '',
+ extra => 'auto_increment'
+>>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
@@ -423,6 +1505,11 @@
explanation => 'Maximum delay to pick up a reserved document',
type => 'free',
},
+<<<<<<< updatedatabase
+=======
+ ],
+ marc_breeding => [
+>>>>>>> 1.100.2.46
{
uniquefieldrequired => 'variable',
variable => 'TransfersMaxDaysWarning',
@@ -478,6 +1565,7 @@
type => 'YesNo',
},
],
+<<<<<<< updatedatabase
);
@@ -491,6 +1579,9 @@
# },
# ],
serial => [
+=======
+ serial => [
+>>>>>>> 1.100.2.46
{
field => 'notes',
type => 'TEXT',
@@ -500,6 +1591,7 @@
extra => ''
},
],
+<<<<<<< updatedatabase
aqbasket => [
{
field => 'booksellerid',
@@ -790,6 +1882,18 @@
type => 'PRIMARY',
}
],
+=======
+ biblioitems => [
+ {
+ field => 'dewey',
+ type => 'varchar(30)',
+ null => 'NULL',
+ key => '',
+ default => '',
+ extra => ''
+ },
+ ],
+>>>>>>> 1.100.2.46
);
my %foreign_keys = (
@@ -1271,7 +2375,6 @@
$existingtables{$table} = 1;
}
-
# Now add any missing tables
foreach $table ( keys %requiretables ) {
unless ( $existingtables{$table} ) {
@@ -1295,7 +2398,49 @@
}
}
}
+<<<<<<< updatedatabase
+
+=======
+unless ( $existingtables{'z3950servers'} ) {
+ #MJR: added syntax entries to close bug 624
+ print "Adding z3950servers table...\n" unless $silent;
+ my $sti = $dbh->prepare(
+ "create table z3950servers (
+ host char(255),
+ port int,
+ db char(255),
+ userid char(255),
+ password char(255),
+ name text,
+ id int,
+ checked smallint,
+ rank int,
+ syntax char(80))"
+ );
+ $sti->execute;
+ $sti = $dbh->prepare(
+ "insert into z3950servers
+ values ('z3950.loc.gov',
+ 7090,
+ 'voyager',
+ '', '',
+ 'Library of Congress',
+ 1, 1, 1, 'USMARC')"
+ );
+ $sti->execute;
+}
+unless ( $existingtables{'issuingrules'} ) {
+ $dbh->do("alter table categoryitem rename issuingrules");
+ $dbh->do("ALTER TABLE issuingrules ADD maxissueqty int(4) default NULL");
+ $dbh->do("ALTER TABLE issuingrules ADD issuelength int(4) default NULL");
+ $dbh->do(
+ "ALTER TABLE issuingrules ADD branchcode varchar(4) NOT NULL default ''"
+ );
+ print "renaming categoryitem\n" unless $silent;
+}
+
+>>>>>>> 1.100.2.46
#---------------------------------
# Columns
@@ -1309,7 +2454,8 @@
$types{$column} = $type;
} # while
foreach $column ( keys %{ $requirefields{$table} } ) {
- print " Check column $column [$types{$column}]\n" if $debug and not $silent;
+ print " Check column $column [$types{$column}]\n"
+ if $debug and not $silent;
if ( !$types{$column} ) {
# column doesn't exist
@@ -1327,7 +2473,69 @@
} # foreach column
} # foreach table
-foreach $table ( keys %fielddefinitions ) {
+foreach $table ( keys %fielddefinitions ) {
+<<<<<<< updatedatabase
+ print "Check table $table\n" if $debug;
+ $sth = $dbh->prepare("show columns from $table");
+ $sth->execute();
+ my $definitions;
+ while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+ {
+ $definitions->{$column}->{type} = $type;
+ $definitions->{$column}->{null} = $null;
+ $definitions->{$column}->{null} = 'NULL' if $null eq 'YES';
+ $definitions->{$column}->{key} = $key;
+ $definitions->{$column}->{default} = $default;
+ $definitions->{$column}->{extra} = $extra;
+ } # while
+ my $fieldrow = $fielddefinitions{$table};
+ foreach my $row (@$fieldrow) {
+ my $field = $row->{field};
+ my $type = $row->{type};
+ my $null = $row->{null};
+# $null = 'YES' if $row->{null} eq 'NULL';
+ my $key = $row->{key};
+ my $default = $row->{default};
+ my $null = $row->{null};
+# $default="''" unless $default;
+ my $extra = $row->{extra};
+ my $def = $definitions->{$field};
+ my $after = ($row->{after}?" after ".$row->{after}:"");
+
+ unless ( $type eq $def->{type}
+ && $null eq $def->{null}
+ && $key eq $def->{key}
+ && $extra eq $def->{extra} )
+ {
+ if ( $null eq '' ) {
+ $null = 'NOT NULL';
+ }
+ if ( $key eq 'PRI' ) {
+ $key = 'PRIMARY KEY';
+ }
+ unless ( $extra eq 'auto_increment' ) {
+ $extra = '';
+ }
+
+ # if it's a new column use "add", if it's an old one, use "change".
+ my $action;
+ if ($definitions->{$field}->{type}) {
+ $action="change $field"
+ } else {
+ $action="add";
+ }
+# if it's a primary key, drop the previous pk, before altering the table
+ my $sth;
+ if ($key ne 'PRIMARY KEY') {
+ $sth =$dbh->prepare("alter table $table $action $field $type $null $key $extra default ? $after");
+ } else {
+ $sth =$dbh->prepare("alter table $table drop primary key, $action $field $type $null $key $extra default ? $after");
+ }
+ $sth->execute($default);
+ print " alter or create $field in $table\n" unless $silent;
+ }
+ }
+=======
print "Check table $table\n" if $debug;
$sth = $dbh->prepare("show columns from $table");
$sth->execute();
@@ -1345,15 +2553,13 @@
foreach my $row (@$fieldrow) {
my $field = $row->{field};
my $type = $row->{type};
- my $null = $row->{null};
-# $null = 'YES' if $row->{null} eq 'NULL';
my $key = $row->{key};
my $default = $row->{default};
my $null = $row->{null};
-# $default="''" unless $default;
+
+ # $default="''" unless $default;
my $extra = $row->{extra};
my $def = $definitions->{$field};
- my $after = ($row->{after}?" after ".$row->{after}:"");
unless ( $type eq $def->{type}
&& $null eq $def->{null}
@@ -1372,56 +2578,436 @@
# if it's a new column use "add", if it's an old one, use "change".
my $action;
- if ($definitions->{$field}->{type}) {
- $action="change $field"
- } else {
- $action="add";
+ if ( $definitions->{$field}->{type} ) {
+ $action = "change $field";
}
-# if it's a primary key, drop the previous pk, before altering the table
+ else {
+ $action = "add";
+ }
+
+ # if it's a primary key, drop the previous pk, before altering the table
my $sth;
- if ($key ne 'PRIMARY KEY') {
- $sth =$dbh->prepare("alter table $table $action $field $type $null $key $extra default ? $after");
- } else {
- $sth =$dbh->prepare("alter table $table drop primary key, $action $field $type $null $key $extra default ? $after");
+ if ( $key ne 'PRIMARY KEY' ) {
+ $sth =
+ $dbh->prepare(
+"alter table $table $action $field $type $null $key $extra default ?"
+ );
+ }
+ else {
+ $sth =
+ $dbh->prepare(
+"alter table $table drop primary key, $action $field $type $null $key $extra default ?"
+ );
}
$sth->execute($default);
- print " alter or create $field in $table\n" unless $silent;
+ print " Alter $field in $table\n" unless $silent;
}
}
+>>>>>>> 1.100.2.46
}
-# Populate tables with required data
+<<<<<<< updatedatabase
+=======
+# Get list of columns from borrowers table
+my %itemtypes;
+my %nullenabled;
+$sth = $dbh->prepare("show columns from borrowers");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $itemtypes{$column} = $type;
+ $nullenabled{$column} = $null;
+}
+
+unless ( $itemtypes{'cardnumber'} eq 'varchar(20)' ) {
+ $itemtypes{'cardnumber'} =~ /varchar\((\d+)\)/;
+ my $oldlength = $1;
+ if ( $oldlength < 16 ) {
+ print
+"Setting maximum cardnumber length to 16 (was $oldlength) and marking unique.\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare(
+ "alter table borrowers change cardnumber cardnumber varchar(16)");
+ $sti->execute;
+ $sti->finish;
+ $sti = $dbh->prepare("alter table borrowers drop index cardnumber");
+ $sti->execute;
+ $sti->finish;
+ $sti = $dbh->prepare("alter table borrowers add unique(cardnumber)");
+ $sti->execute;
+ $sti->finish;
+ }
+}
+
+#
+# Get list of columns from items table
+$sth = $dbh->prepare("show columns from items");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $itemtypes{$column} = $type;
+ $nullenabled{$column} = $null;
+}
+
+unless ( $itemtypes{'barcode'} eq 'varchar(20)' ) {
+ $itemtypes{'barcode'} =~ /varchar\((\d+)\)/;
+ my $oldlength = $1;
+ if ( $oldlength < 20 ) {
+ print "Setting maximum barcode length to 20 (was $oldlength).\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare("alter table items change barcode barcode varchar(20)");
+ $sti->execute;
+ }
+}
+
+#
+# dropping unique barcode index & setting barcode to null allowed.
+#
+$sth = $dbh->prepare("show index from items");
+$sth->execute;
+while (
+ my (
+ $table, $non_unique, $key_name, $Seq_in_index,
+ $Column_name, $Collation, $cardinality, $sub_part,
+ $Packed, $comment
+ )
+ = $sth->fetchrow
+ )
+{
+ if ( $key_name eq 'barcode' && $non_unique eq 0 ) {
+ print "dropping BARCODE index to enable empty barcodes\n"
+ unless $silent;
+ $dbh->do("ALTER TABLE `items` DROP INDEX `barcode`");
+ }
+}
+$dbh->do("ALTER TABLE `items` CHANGE `barcode` `barcode` VARCHAR( 20 )")
+ unless ( $nullenabled{barcode} eq 'YES' );
+
+#
+# creating fulltext index in bibliothesaurus if needed
+#
+$sth = $dbh->prepare("show index from bibliothesaurus");
+$sth->execute;
+my $exists = 0;
+while (
+ my (
+ $table, $non_unique, $key_name, $Seq_in_index,
+ $Column_name, $Collation, $cardinality, $sub_part,
+ $Packed, $comment
+ )
+ = $sth->fetchrow
+ )
+{
+ if ( $key_name eq 'category_2' ) {
+ $exists = 1;
+ }
+}
+print "Creating fulltext index on bibliothesaurus\n" unless $exists or $silent;
+$dbh->do(
+ 'create fulltext index category_2 on bibliothesaurus (category,freelib)')
+ unless $exists;
+
+#
+# creating index in z3950results if needed
+#
+$sth = $dbh->prepare("show index from z3950results");
+$sth->execute;
+my $exists = 0;
+while (
+ my (
+ $table, $non_unique, $key_name, $Seq_in_index,
+ $Column_name, $Collation, $cardinality, $sub_part,
+ $Packed, $comment
+ )
+ = $sth->fetchrow
+ )
+{
+ if ( $key_name eq 'query_server' ) {
+ $exists = 1;
+ }
+}
+print "Creating index on z3950results\n" unless $exists or $silent;
+$dbh->do('create unique index query_server on z3950results (queryid,server)')
+ unless $exists;
+
+# changing z3950daemon field to NULL in marc_breeding
+$dbh->do(
+"ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"
+);
+
+# making borrowernumber an auto_increment field
+$dbh->do(
+"ALTER TABLE `borrowers` CHANGE `borrowernumber` `borrowernumber` INTEGER auto_increment"
+);
+
+# changing indexes in marc_*_structure to use frameworkcode
+$dbh->do('alter table marc_subfield_structure drop index tab');
+$dbh->do('create index tab on marc_subfield_structure (frameworkcode,tab)');
+$dbh->do('alter table marc_subfield_structure drop index kohafield');
+$dbh->do(
+'create index kohafield on marc_subfield_structure (frameworkcode,kohafield)'
+);
+
+# extending the timestamp in branchtransfers...
+my %branchtransfers;
+
+$sth = $dbh->prepare("show columns from branchtransfers");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $branchtransfers{$column} = $type;
+}
+
+unless ( $branchtransfers{'datesent'} eq 'datetime' ) {
+ print "Setting type of datesent in branchtransfers to datetime.\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare(
+ "alter table branchtransfers change datesent datesent datetime");
+ $sti->execute;
+}
+
+unless ( $branchtransfers{'datearrived'} eq 'datetime' ) {
+ print "Setting type of datearrived in branchtransfers to datetime.\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare(
+ "alter table branchtransfers change datearrived datearrived datetime");
+ $sti->execute;
+}
+
+# changing the branchcategories table around...
+my %branchcategories;
+
+$sth = $dbh->prepare("show columns from branchcategories");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $branchcategories{$column} = $type;
+}
+
+unless ( $branchcategories{'categorycode'} eq 'varchar(4)' ) {
+ print
+"Setting type of categorycode in branchcategories to varchar(4),\n and making the primary key.\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare(
+"alter table branchcategories change categorycode categorycode varchar(4) not null"
+ );
+ $sti->execute;
+ $sti =
+ $dbh->prepare(
+ "alter table branchcategories add primary key (categorycode)");
+ $sti->execute;
+}
+
+unless ( $branchcategories{'categoryname'} eq 'text' ) {
+ print "Changing branchcode in branchcategories to categoryname text.\n"
+ unless $silent;
+ my $sth =
+ $dbh->prepare(
+ "alter table branchcategories change branchcode categoryname text");
+ $sth->execute;
+}
+
+unless ( $branchcategories{'codedescription'} eq 'text' ) {
+ print
+ "Replacing branchholding in branchcategories with codedescription text.\n"
+ unless $silent;
+ my $sth =
+ $dbh->prepare(
+ "alter table branchcategories change branchholding codedescription text"
+ );
+ $sth->execute;
+}
+
+# changing the items table around...
+my %items;
+
+$sth = $dbh->prepare("show columns from items");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $items{$column} = $type;
+}
+
+if ( $items{'bulk'} eq "varchar(30)" ) {
+ print " Setting callnumber in items table\n" unless $silent;
+ my $sti =
+ $dbh->prepare(
+"ALTER TABLE `items` CHANGE `bulk` `itemcallnumber` VARCHAR( 30 ) DEFAULT NULL"
+ );
+ $sti->execute;
+ $sti =
+ $dbh->prepare(
+"update marc_subfield_structure set kohafield=\"items.itemcallnumber\" where kohafield=\"items.bulk\""
+ );
+ $sti->execute;
+}
+
+# changing the marc_subfield_structure table around...
+my %marc_subfield_structure;
+
+$sth = $dbh->prepare("show columns from marc_subfield_structure");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $marc_subfield_structure{$column} = $type;
+}
+
+if ( $marc_subfield_structure{thesaurus_category} ) {
+ print " changing thesaurus_category in marc_subfield_structure table\n"
+ unless $silent;
+ my $sti =
+ $dbh->prepare(
+"ALTER TABLE marc_subfield_structure CHANGE `thesaurus_category` `authtypecode` VARCHAR(10 ) DEFAULT NULL"
+ );
+ $sti->execute;
+}
+
+#
+# creating index in issuingrules if needed
+#
+$sth = $dbh->prepare("show index from issuingrules");
+$sth->execute;
+my $exists = 0;
+while (
+ my (
+ $table, $non_unique, $key_name, $Seq_in_index,
+ $Column_name, $Collation, $cardinality, $sub_part,
+ $Packed, $comment
+ )
+ = $sth->fetchrow
+ )
+{
+ if ( $key_name eq 'PRIMARY' ) {
+ $exists = 1;
+ }
+}
+print "Creating index on issuing rules\n" unless $exists or $silent;
+$dbh->do(
+'ALTER TABLE issuingrules ADD PRIMARY KEY ( branchcode, categorycode, itemtype )'
+ )
+ unless $exists;
+
+$dbh->do('ALTER TABLE marc_tag_structure drop primary key');
+$dbh->do(
+ 'ALTER TABLE marc_tag_structure ADD PRIMARY KEY ( frameworkcode, tagfield )'
+);
+
+$dbh->do('ALTER TABLE marc_subfield_structure drop primary key');
+$dbh->do(
+'ALTER TABLE marc_subfield_structure ADD PRIMARY KEY ( frameworkcode, tagfield, tagsubfield )'
+);
+
+$dbh->do(
+"alter table marc_subfield_table change tagorder tagorder int not null default '1'"
+);
+
+# Get list of columns from marc_word table
+my %marc_word;
+my %nullenabled;
+$sth = $dbh->prepare("show columns from marc_word");
+$sth->execute;
+while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+{
+ $marc_word{$column} = $type;
+ $nullenabled{$column} = $null;
+}
+if ( $marc_word{subfieldid} ) {
+ #create field tagsubfield, copy tag+subfieldid, then drop tag and subfieldid
+ print "Modifying marc_word (concat on tag and subfield for better perfs)\n"
+ unless $silent;
+ $dbh->do(
+"ALTER TABLE `marc_word` ADD `tagsubfield` CHAR( 4 ) NOT NULL AFTER `bibid`"
+ );
+ $dbh->do("update marc_word set tagsubfield=concat(tag,subfieldid)");
+ $dbh->do("alter table marc_word drop tag");
+ $dbh->do("alter table marc_word drop subfieldid");
+ $dbh->do("create index Search_Marc on marc_word (tagsubfield,word)");
+}
+
+>>>>>>> 1.100.2.46
+# Populate tables with required data
# synch table and deletedtable.
-foreach my $table (('borrowers','items','biblio','biblioitems')) {
+foreach my $table ( ( 'borrowers', 'items', 'biblio', 'biblioitems' ) ) {
my %deletedborrowers;
print "synch'ing $table\n";
$sth = $dbh->prepare("show columns from deleted$table");
$sth->execute;
- while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ) {
- $deletedborrowers{$column}=1;
+ while ( my ( $column, $type, $null, $key, $default, $extra ) =
+ $sth->fetchrow )
+ {
+ $deletedborrowers{$column} = 1;
}
$sth = $dbh->prepare("show columns from $table");
$sth->execute;
my $previous;
- while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ) {
- unless ($deletedborrowers{$column}) {
- my $newcol="alter table deleted$table add $column $type";
- if ($null eq 'YES') {
+ while ( my ( $column, $type, $null, $key, $default, $extra ) =
+ $sth->fetchrow )
+ {
+ unless ( $deletedborrowers{$column} ) {
+ my $newcol = "alter table deleted$table add $column $type";
+ if ( $null eq 'YES' ) {
$newcol .= " NULL ";
- } else {
+ }
+ else {
$newcol .= " NOT NULL ";
}
$newcol .= "default $default" if $default;
$newcol .= " after $previous" if $previous;
- $previous=$column;
+ $previous = $column;
print "creating column $column\n";
$dbh->do($newcol);
}
}
}
+<<<<<<< updatedatabase
+=======
+# fill aqbasket if it's empty and aqorder is not
+# => it means it has just been created & must be filled
+$sth = $dbh->prepare("select count(*) from aqbasket");
+$sth->execute;
+if ( $sth->fetchrow == 0 ) {
+ $sth = $dbh->prepare("select count(*) from aqorders");
+ $sth->execute;
+ if ( $sth->fetchrow > 0 ) {
+ print "Populating new table aqbasket\n";
+ print
+"IMPORTANT NOTE: error message \"Duplicate entry 'X' for key 1\" may appear. it should not be a real trouble\n";
+ $sth =
+ $dbh->prepare(
+"select distinct basketno,booksellerid,authorisedby,entrydate,booksellerinvoicenumber from aqorders"
+ );
+ $sth->execute;
+ my ( $basketno, $booksellerid, $authorisedby, $entrydate,
+ $booksellerinvoicenumber );
+ my $sth2 =
+ $dbh->prepare(
+"insert into aqbasket (basketno,creationdate,booksellerid,authorisedby,booksellerinvoicenumber) values (?,?,?,?,?)"
+ );
+ while (
+ (
+ $basketno, $booksellerid,
+ $authorisedby, $entrydate,
+ $booksellerinvoicenumber
+ )
+ = $sth->fetchrow
+ )
+ {
+ print
+"$basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber\n";
+ $sth2->execute( $basketno, $entrydate, $booksellerid, $authorisedby,
+ $booksellerinvoicenumber );
+ }
+ }
+}
+>>>>>>> 1.100.2.46
foreach my $table ( keys %tabledata ) {
print "Checking for data required in table $table...\n" unless $silent;
my $tablerows = $tabledata{$table};
@@ -1434,6 +3020,7 @@
"select $uniquefieldrequired from $table where $uniquefieldrequired=?"
);
$sth->execute($uniquevalue);
+<<<<<<< updatedatabase
if ($sth->rows) {
foreach my $field (keys %$forceupdate) {
if ($forceupdate->{$field}) {
@@ -1608,23 +3195,60 @@
print "\r$totaldone / $totaltodo" unless ($totaldone % 100);
}
print "\rdone\n";
+=======
+ if ( $sth->rows ) {
+ foreach my $field ( keys %$forceupdate ) {
+ if ( $forceupdate->{$field} ) {
+ my $sth =
+ $dbh->prepare(
+"update systempreferences set $field=? where $uniquefieldrequired=?"
+ );
+ $sth->execute( $row->{$field}, $uniquevalue );
+ }
+ }
+ }
+ else {
+ print "Adding row to $table: " unless $silent;
+ my @values;
+ my $fieldlist;
+ my $placeholders;
+ foreach my $field ( keys %$row ) {
+ next if $field eq 'uniquefieldrequired';
+ next if $field eq 'forceupdate';
+ my $value = $row->{$field};
+ push @values, $value;
+ print " $field => $value" unless $silent;
+ $fieldlist .= "$field,";
+ $placeholders .= "?,";
+ }
+ print "\n" unless $silent;
+ $fieldlist =~ s/,$//;
+ $placeholders =~ s/,$//;
+ my $sth =
+ $dbh->prepare(
+ "insert into $table ($fieldlist) values ($placeholders)");
+ $sth->execute(@values);
+ }
+ }
+>>>>>>> 1.100.2.46
}
# at last, remove useless fields
foreach $table ( keys %uselessfields ) {
- my @fields = split /,/,$uselessfields{$table};
+ my @fields = split /,/, $uselessfields{$table};
my $fields;
my $exists;
foreach my $fieldtodrop (@fields) {
$fieldtodrop =~ s/\t//g;
$fieldtodrop =~ s/\n//g;
- $exists =0;
+ $exists = 0;
$sth = $dbh->prepare("show columns from $table");
$sth->execute;
- while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+ while ( my ( $column, $type, $null, $key, $default, $extra ) =
+ $sth->fetchrow )
{
- $exists =1 if ($column eq $fieldtodrop);
+ $exists = 1 if ( $column eq $fieldtodrop );
}
if ($exists) {
print "deleting $fieldtodrop field in $table...\n" unless $silent;
@@ -1634,6 +3258,7 @@
}
} # foreach
+<<<<<<< updatedatabase
# MOVE all tables TO UTF-8 and innoDB
$sth = $dbh->prepare("show table status");
@@ -1652,6 +3277,8 @@
}
}
+=======
+>>>>>>> 1.100.2.46
$sth->finish;
#
@@ -1821,6 +3448,10 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.153 2006/07/04 14:36:52 toins
+# Head & rel_2_2 merged
+#
+<<<<<<< updatedatabase
# Revision 1.152 2006/06/27 09:26:37 btoumi
# modify (initials,phone ) fields property in borrowers and deletedborrowers table
#
@@ -1894,6 +3525,141 @@
#
# Revision 1.136 2006/04/17 21:55:33 sushi
# Added 'labels' and 'labels_conf' tables, for spine lable tool.
+=======
+# Revision 1.100.2.46 2006/06/20 18:02:23 oleonard
+# Fixing two minor typos
+#
+# Revision 1.100.2.45 2006/06/13 12:34:15 hdl
+# Adding publication date to issues arrival. So that two dates can be used.
+#
+# Revision 1.100.2.44 2006/06/02 15:21:40 tipaul
+# moving dewey to a varchar
+#
+# Revision 1.100.2.43 2006/04/27 18:07:40 oleonard
+# Adding two new system preferences:
+#
+# 1. opacuserlogin shows/hides login-based features like reserves, private shelves, and login forms. On by default.
+# 2. opacbookbag shows/hides the book bag (biblio basket). On by default.
+#
+# Revision 1.100.2.42 2006/04/22 13:52:12 oleonard
+# Adding opacheader and IntranetBiblioDefaultView system preferences
+#
+# Revision 1.100.2.41 2006/04/21 08:54:55 hdl
+# Adding two new sysprefs :
+# - z3950NormalizeAuthor of type YesNo. Set this to yes if you want author field to be filled with authorities fields when importing biblio in z3950
+# - z3950AuthorAuthfields, free text : type in comma-separated list of fields to search for author names for AuthorNormalization.
+#
+# Adding a feature on a Z3950 import.
+# You can now automatically fill author with person name authority contained in the biblio if sysprefs are filled.
+#
+# Revision 1.100.2.40 2006/04/18 09:34:15 plg
+# bug fixed: typo fixed in labels and labels_conf tables creation query.
+#
+# Revision 1.100.2.39 2006/04/17 21:19:52 sushi
+# Added labels, and label_conf tables for spine labels tool.
+#
+# Revision 1.100.2.38 2006/04/05 14:58:04 kados
+# adding TemplateEncoding syspref: allows librarian to specify the
+# encoding to use on templates.
+#
+# Revision 1.100.2.37 2006/04/04 13:54:10 tipaul
+# advancedMARCeditor systempref management
+#
+# Revision 1.100.2.36 2006/03/18 22:55:26 kados
+# add syspref for the MARC Organization Code of the library
+#
+# Revision 1.100.2.35 2006/03/08 17:50:55 kados
+# Modifying patronimages: now it can be used to specify the file extension
+# of the images (to avoid hard-codeing in templates).
+#
+# Revision 1.100.2.34 2006/03/08 13:28:23 tipaul
+# changing the size of some new systempref to a bloc (more convenient)
+#
+# Revision 1.100.2.33 2006/03/04 06:05:13 kados
+# New syspref: AnonSuggestions to allow an anonymous patron to make a
+# suggestion (requested by NPL). To enable, set to the borrowernumber
+# of the anonymous patron (must be created).
+#
+# Revision 1.100.2.32 2006/03/03 16:20:23 kados
+# hopefully fixes truncated amazon.com links in syspref
+# ----------------------------------------------------------------------
+#
+# Revision 1.100.2.31 2006/03/01 21:44:16 kados
+# Adds 'opacreadinghistory' syspref for turning this on/off for libraries
+# who are scared of their government (ie, in countries where there a
+# patriot act) :-)
+#
+# Revision 1.100.2.30 2006/03/01 15:52:13 kados
+# Whoops ... should have checked, that name is already used. Changed it to
+# opaclanguagesdisplay.
+#
+# Revision 1.100.2.29 2006/03/01 15:51:28 kados
+# adds opaclanguages syspref, which allows turning on/off the display of
+# the languages pref on OPAC (default is on)
+#
+# Revision 1.100.2.28 2006/03/01 15:38:53 kados
+# Adding patronimages syspref. Adding opaclayoutstylesheet. Some explainations
+# are in order:
+#
+# Right now there are three stylesheet sysprefs:
+#
+# opacstylesheet - an external stylesheet specified by URL (replaces all other
+# stylesheets)
+#
+# opaccolorstylesheet - local stylesheet specified by filename
+# opaclayoutstylesheet - local stylesheet specified by filename
+#
+# Revision 1.100.2.27 2006/02/27 15:40:32 tipaul
+# setting serialadditems systempreference to 0 by default : no behaviour change when upgrading Koha
+#
+# Revision 1.100.2.26 2006/02/23 03:19:48 kados
+# Adds the 'sortbynonfiling' systempref. With this enabled, Koha will
+# correctly sort title searches according to the nonfiling characters
+# in the MARC records.
+#
+# Revision 1.100.2.25 2006/02/21 20:00:13 kados
+# setting default value for LabelMARCView to 'standard'
+# ----------------------------------------------------------------------
+#
+# Revision 1.100.2.24 2006/02/21 18:40:08 kados
+# Adding LabeledMARCView systempref to choose whether tags are displayed
+# in standard or economical format. Later, this can be used to display
+# 'strict' format with no labels for insane librarians who want that.
+#
+# Revision 1.100.2.23 2006/02/07 15:33:35 hdl
+# Adding a new system preference : serialsadditem
+#
+# Adding two functions in Biblio.pm : getitemlocation and getitemstatus (helpful to get location list and status list, status is supposed to be in relation with items.notforloan)
+#
+# Adding a new function in Bull.pm : serialsitemize which take serial id and item information and creates the item
+# Modifying statecollection to add a new line (used for data input)
+#
+# Revision 1.100.2.22 2006/02/05 21:53:54 kados
+# Adds database support for IntranetNav systempref -- used to add HTML
+# tags to left-hand navigation menu on Intranet.
+# ----------------------------------------------------------------------
+#
+# Revision 1.100.2.21 2006/02/04 18:17:00 kados
+# Adds opaccolorstylesheet, intranetstylesheet, intranetcolorstylesheet
+# to systemprefs.
+#
+# Revision 1.100.2.20 2006/02/04 05:16:40 kados
+# Allows putting credits at bottom of OPAC page
+#
+# Revision 1.100.2.19 2006/02/04 01:44:59 kados
+# Adds Fully Preferences-based Amazon.com feature. See mail to koha-devel
+# for details.
+#
+# Revision 1.100.2.18 2006/02/03 23:12:23 kados
+# Adds system prefs for using Amazon.com content in the OPAC
+#
+# Revision 1.100.2.17 2006/02/03 20:55:16 kados
+# Adding a new system preference: OpacNav. Can be used to add HTML
+# navigation links to the left-hand navbar in the OPAC.
+#
+# Revision 1.100.2.16 2005/12/30 11:13:29 tipaul
+# * tool to synchronise TABLE and deletedTABLE structures in updatedatabase
+>>>>>>> 1.100.2.46
#
# Revision 1.135 2006/04/15 02:37:03 tgarip1957
# Marc record should be set to UTF-8 in leader.Force it.
Index: value_builder/marc21_leader.pl
===================================================================
RCS file: /sources/koha/koha/value_builder/marc21_leader.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- value_builder/marc21_leader.pl 6 Jan 2006 16:39:43 -0000 1.3
+++ value_builder/marc21_leader.pl 4 Jul 2006 14:36:52 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: marc21_leader.pl,v 1.3 2006/01/06 16:39:43 tipaul Exp $
+# $Id: marc21_leader.pl,v 1.4 2006/07/04 14:36:52 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -43,6 +43,13 @@
my $res="
<script>
function Focus$function_name(subfield_managed) {
+ for (i=0 ; i<document.f.field_value.length ; i++) {
+ if (document.f.tag[i].value == '000') {
+ if (!document.f.field_value[i].value) {
+ document.f.field_value[i].value = ' nam a22 7a 4500';
+ }
+ }
+ }
return 1;
}
@@ -51,7 +58,7 @@
}
function Clic$function_name(i) {
- defaultvalue=document.forms[0].field_value[i].value;
+ defaultvalue=document.forms['f'].field_value[i].value;
newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
}
@@ -88,7 +95,7 @@
my $f17 = substr($result,17,1);
my $f18 = substr($result,18,1);
my $f19 = substr($result,19,1);
-
+ my $f2023 = substr($result,20,4);
$template->param(index => $index,
"f5$f5" => 1,
"f6$f6" => 1,
@@ -98,6 +105,7 @@
"f17$f17" => 1,
"f18$f18" => 1,
"f19$f19" => 1,
+ "f2023" => $f2023,
);
print $input->header(-cookie => $cookie),$template->output;
}
Index: value_builder/unimarc_field_4XX.pl
===================================================================
RCS file: /sources/koha/koha/value_builder/unimarc_field_4XX.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- value_builder/unimarc_field_4XX.pl 6 Jan 2006 16:39:43 -0000 1.7
+++ value_builder/unimarc_field_4XX.pl 4 Jul 2006 14:36:52 -0000 1.8
@@ -72,7 +72,7 @@
my $query = new CGI;
my $op = $query->param('op');
my $type=$query->param('type');
- warn "operation ".$op;
+# warn "operation ".$op;
my $startfrom=$query->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my ($template, $loggedinuser, $cookie);
@@ -112,7 +112,7 @@
$subfield_value_a.=" (".$marcrecord->field('700')->subfield("c")." - " if ($marcrecord->field('700')->subfield("c"));
$subfield_value_a.=" (" if (($marcrecord->field('700')->subfield("f")) and not( $marcrecord->field('700')->subfield("c")));
$subfield_value_a.=$marcrecord->field('700')->subfield("f") if ($marcrecord->field('700')->subfield("f"));
- $subfield_value_a.=")" if ($marcrecord->field('701')->subfield("f")) or ($marcrecord->field('701')->subfield("c"));
+ $subfield_value_a.=")" if ($marcrecord->field('700')->subfield("f")) or ($marcrecord->field('700')->subfield("c"));
} elsif ($marcrecord->field('702')){
$subfield_value_a=$marcrecord->field('702')->subfield("a");
$subfield_value_a.=", ".$marcrecord->field('702')->subfield("b") if ($marcrecord->field('702')->subfield("b"));
Index: z3950/processz3950queue
===================================================================
RCS file: /sources/koha/koha/z3950/processz3950queue,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- z3950/processz3950queue 20 Jun 2005 14:37:51 -0000 1.15
+++ z3950/processz3950queue 4 Jul 2006 14:36:52 -0000 1.16
@@ -1,14 +1,14 @@
#!/usr/bin/perl
-# $Id: processz3950queue,v 1.15 2005/06/20 14:37:51 tipaul Exp $
-
+# $Id: processz3950queue,v 1.16 2006/07/04 14:36:52 toins Exp $
+use MARC::Record;
use C4::Context;
use DBI;
use strict;
use C4::Biblio;
use C4::Output;
use C4::Breeding;
-use Net::Z3950;
+use ZOOM;
=head1 NAME
@@ -208,7 +208,7 @@
} elsif ($type eq 'keyword') {
$attr='1=1016';
}
- my $query="\@attr $attr \"$term\"";
+ my $query = "\@attr $attr \"$term\"";
print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n";
# try to connect
my $conn;
@@ -216,9 +216,9 @@
my $error=0;
# the z3950 query is builded. Launch it.
if ($user) {
- $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1);
+ $conn= new ZOOM::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1);
} else {
- $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database) || ($noconnection=1);
+ $conn= new ZOOM::Connection($servername, $port, databaseName => $database) || ($noconnection=1);
}
if ($noconnection || $error) {
# if connection impossible, don't go further !
@@ -256,16 +256,17 @@
$stj->execute($resultsid);
#######
print "$$/$id : connected to $globalname\n";
+ print "Global Syntax =>".$globalsyntax."<=";
eval {$conn->option(elementSetName => 'F')};
- eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "MARC21");
- eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC");
+ eval { $conn->option(preferredRecordSyntax => 'USMARC');} if ($globalsyntax eq "USMARC");
+ eval { $conn->option(preferredRecordSyntax => 'UNIMARC');} if ($globalsyntax eq "UNIMARC");
if ($@) {
print "$$/$id : $globalname ERROR: $@ for $resultsid\n";
# in case pb during connexion, set result to "empty" to avoid everlasting loops
my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?");
$stj->execute(0,0,$now,$resultsid);
} else {
- my $rs=$conn->search($query);
+ my $rs=$conn->search_pqf($query) or warn "Connection Problem:".$conn->errmsg();
pe();
# we have an answer for a query => get results & store them in marc_breeding table
my $numresults=$rs->size();
@@ -279,8 +280,10 @@
my $result='';
my $scantimerstart=time();
for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
- my $rec=$rs->record($i);
- my $marcdata = $rec->rawdata();
+ my $rec=$rs->record($i-1);
+ my $marcdata = $rec->raw();
+ #my $marcrecord = MARC::Record->new_from_usmarc($marcdata);
+ #warn $marcrecord->as_formatted();
$globalencoding = ref($rec);
$result.=$marcdata;
}
Index: z3950/search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- z3950/search.pl 18 Feb 2006 10:07:29 -0000 1.5
+++ z3950/search.pl 4 Jul 2006 14:36:52 -0000 1.6
@@ -49,11 +49,12 @@
my $toggle;
my $record;
-my $oldbiblio;
+my $biblionumber;
if ($bibid > 0) {
$record = MARCgetbiblio($dbh,$bibid);
- $oldbiblio = MARCmarc2koha($dbh,$record);
+ $biblionumber=MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid);
}
+
my $errmsg;
unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh.
if ($isbn) {
More information about the Koha-cvs
mailing list