Attachment #103740 for bug #21395

View | Details | Raw Unified | Return to bug 21395
Collapse All | Expand All

Lines 23-29 Link Here

(-)a/docs/CAS/CASProxy/examples/proxy_cas_data.pl (-1 / +1 lines)
23		23
24	=head1 CGI PARAMETERS	24	=head1 CGI PARAMETERS
25		25
26	=item PGTIOU	26	=head2 PGTIOU
27		27
28	The Proxy Granting Ticket IOU the CAS Server returned to us when we gave him the Service Ticket	28	The Proxy Granting Ticket IOU the CAS Server returned to us when we gave him the Service Ticket
29	This PGTIOU will allow us to retrive the matching PGTID	29	This PGTIOU will allow us to retrive the matching PGTID

Lines 31-37 while (my ($authid,$authtypecode)=$rq->fetchrow){ Link Here

(-)a/misc/migration_tools/22_to_30/export_Authorities.pl (-1 / +3 lines)
31		31
32	if (C4::Context->preference('marcflavour') eq "UNIMARC"){	32	if (C4::Context->preference('marcflavour') eq "UNIMARC"){
33	$record->leader(' nac 22 1u 4500');	33	$record->leader(' nac 22 1u 4500');
34	my $string= ($time=~m/([0-9\-]+)/) ? $1 : undef	34	my @time = localtime(time);
		35	my $time = sprintf('%04d%02d%02d', $time[5] + 1900, $time[4] + 1, $time[3]);
		36	my $string= ($time=~m/([0-9\-]+)/) ? $1 : undef;
35	$string=~s/\-//g;	37	$string=~s/\-//g;
36	$string = sprintf("%-*s",26, $string);	38	$string = sprintf("%-*s",26, $string);
37	substr($string,9,6,"frey50");	39	substr($string,9,6,"frey50");

Lines 30-36 open my $fileoutput, '>:encoding(UTF-8)', "./$filename/$authid.xml" or die "unab Link Here

(-)a/misc/migration_tools/22_to_30/export_Authorities_xml.pl (-1 / +3 lines)
30		30
31	# if (C4::Context->preference('marcflavour') eq "UNIMARC"){	31	# if (C4::Context->preference('marcflavour') eq "UNIMARC"){
32	$record->leader(' nac 22 1u 4500');	32	$record->leader(' nac 22 1u 4500');
33	my $string = ($time=~m/([0-9\-]+)/) ? $1 : undef	33	my @time = localtime(time);
		34	my $time = sprintf('%04d%02d%02d', $time[5] + 1900, $time[4] + 1, $time[3]);
		35	my $string = ($time=~m/([0-9\-]+)/) ? $1 : undef;
34	$string=~s/\-//g;	36	$string=~s/\-//g;
35	$string = sprintf("%-*s",26, $string);	37	$string = sprintf("%-*s",26, $string);
36	substr($string,9,6,"frey50");	38	substr($string,9,6,"frey50");




# adding marc xml, just for convenience
$dbh->do('ALTER TABLE `biblioitems` ADD `marcxml` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ');
# moving data from marc_subfield_value to biblio
my $sth = $dbh->prepare('select bibid,biblionumber from marc_biblio');
$sth->execute;
my $sth_update = $dbh->prepare('update biblioitems set marc=?, marcxml=? where biblionumber=?');
my $totaldone=0;

    $sth_update->execute($record->as_usmarc(),$record->as_xml_record($marcflavour),$biblionumber);
    $totaldone++;
    print ".";
    print "\r$totaldone" unless ($totaldone % 100);
}
print "\rdone\n";


    }
    if (C4::Context->preference('marcflavour')=~/unimarc/i){
      $record->leader('     nac  22     1u 4500');
      $update=1;
      my $string;
      if ($record->field(100)) {
        $string = substr($record->subfield(100,"a")."                                   ",0,35);

Lines 38-48 use YAML; Link Here

(-)a/reports/reserves_stats.pl (-2 / +2 lines)
38		38
39	=head1 NAME	39	=head1 NAME
40		40
41	reports/reserve_stats.pl	41	reports/reserve_stats.pl
42		42
43	=head1 DESCRIPTION	43	=head1 DESCRIPTION
44		44
45	Plugin that shows reserve stats	45	Plugin that shows reserve stats
46		46
47	=cut	47	=cut
48		48

Lines 60-65 also need to override WEBSERVER_IP. Link Here

(-)a/rewrite-config.PL (-4 / +7 lines)
60		60
61	=cut	61	=cut
62		62
		63	my $myhost;
		64	my $mydomain;
63	if ( $myhost = $ENV{WEBSERVER_HOST} \|\| hostname ) {	65	if ( $myhost = $ENV{WEBSERVER_HOST} \|\| hostname ) {
64	( $mydomain = $myhost ) =~ s/.*?\.//;	66	( $mydomain = $myhost ) =~ s/.*?\.//;
65	} else {	67	} else {
Lines 67-72 if ( $myhost = $ENV{WEBSERVER_HOST} \|\| hostname ) { Link Here
67	$mydomain = 'localdomain';	69	$mydomain = 'localdomain';
68	}	70	}
69		71
		72	my $myip;
70	unless ( $myip = $ENV{WEBSERVER_IP} ) {	73	unless ( $myip = $ENV{WEBSERVER_IP} ) {
71	my $byname = gethostbyname( $myhost )	74	my $byname = gethostbyname( $myhost )
72	or die "Could not get the IP address of $myhost, DNS fault? ($!)";	75	or die "Could not get the IP address of $myhost, DNS fault? ($!)";
Lines 75-86 unless ( $myip = $ENV{WEBSERVER_IP} ) { Link Here
75	}	78	}
76		79
77		80
78	$prefix = $ENV{'INSTALL_BASE'} \|\| "/usr";	81	my $prefix = $ENV{'INSTALL_BASE'} \|\| "/usr";
79		82
80	# These are our configuration guesses	83	# These are our configuration guesses
81	# Keys were extracted by	84	# Keys were extracted by
82	# <grep -o '__.__' etc/ \| cut -f2 -d: \| sort -u \| sed -e 's/^/ "/;s/$/" => "",/'	85	# <grep -o '__.__' etc/ \| cut -f2 -d: \| sort -u \| sed -e 's/^/ "/;s/$/" => "",/'
83	%configuration = (	86	my %configuration = (
84	"__KOHA_INSTALLED_VERSION__" => "no_version_found",	87	"__KOHA_INSTALLED_VERSION__" => "no_version_found",
85	"__LOG_DIR__" => "/var/log",	88	"__LOG_DIR__" => "/var/log",
86	"__PLUGINS_DIR__" => "/var/lib/koha/plugins",	89	"__PLUGINS_DIR__" => "/var/lib/koha/plugins",
Lines 172-179 if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') { Link Here
172	$configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';	175	$configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';
173	}	176	}
174		177
175	$fname = $ARGV[0];	178	my $fname = $ARGV[0];
176	$file = &read_file($fname);	179	my $file = &read_file($fname);
177	$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;	180	$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
178		181
179	# At this point, file is in 'blib' and by default	182	# At this point, file is in 'blib' and by default

Lines 61-67 foreach my $line (<$MARC21UTF8>) { Link Here

(-)a/t/db_dependent/Record/Record.t (-2 / +1 lines)
61	$marc21_utf8 =~ s/\n$//;	61	$marc21_utf8 =~ s/\n$//;
62	close $MARC21UTF8;	62	close $MARC21UTF8;
63		63
64	open(my $MARC21MARC8COMBCHARS, '<', WHEREAMI."/marc21_marc8_combining_chars.dat" or die $!;	64	open(my $MARC21MARC8COMBCHARS, '<', WHEREAMI."/marc21_marc8_combining_chars.dat") or die $!;
65	my $marc21_marc8_combining_chars;	65	my $marc21_marc8_combining_chars;
66	foreach my $line(<$MARC21MARC8COMBCHARS>) {	66	foreach my $line(<$MARC21MARC8COMBCHARS>) {
67	$marc21_marc8_combining_chars.=$line;	67	$marc21_marc8_combining_chars.=$line;
68	-

Return to bug 21395

Lines 26-32 $dbh->do('ALTER TABLE `biblioitems` CHANGE `marc` `marc` LONGBLOB NULL DEFAULT N Link Here

(-)a/misc/migration_tools/22_to_30/move_marc_to_biblioitems.pl (-3 / +2 lines)
26	# adding marc xml, just for convenience	26	# adding marc xml, just for convenience
27	$dbh->do('ALTER TABLE `biblioitems` ADD `marcxml` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ');	27	$dbh->do('ALTER TABLE `biblioitems` ADD `marcxml` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ');
28	# moving data from marc_subfield_value to biblio	28	# moving data from marc_subfield_value to biblio
29	$sth = $dbh->prepare('select bibid,biblionumber from marc_biblio');	29	my $sth = $dbh->prepare('select bibid,biblionumber from marc_biblio');
30	$sth->execute;	30	$sth->execute;
31	my $sth_update = $dbh->prepare('update biblioitems set marc=?, marcxml=? where biblionumber=?');	31	my $sth_update = $dbh->prepare('update biblioitems set marc=?, marcxml=? where biblionumber=?');
32	my $totaldone=0;	32	my $totaldone=0;
Lines 46-52 while (my ($bibid,$biblionumber) = $sth->fetchrow) { Link Here
46	$sth_update->execute($record->as_usmarc(),$record->as_xml_record($marcflavour),$biblionumber);	46	$sth_update->execute($record->as_usmarc(),$record->as_xml_record($marcflavour),$biblionumber);
47	$totaldone++;	47	$totaldone++;
48	print ".";	48	print ".";
49	print "\r$totaldone / $totaltodo" unless ($totaldone % 100);	49	print "\r$totaldone" unless ($totaldone % 100);
50	}	50	}
51	print "\rdone\n";	51	print "\rdone\n";
52		52
Lines 149-155 sub LocalMARCgetbiblio { Link Here
149	}	149	}
150	if (C4::Context->preference('marcflavour')=~/unimarc/i){	150	if (C4::Context->preference('marcflavour')=~/unimarc/i){
151	$record->leader(' nac 22 1u 4500');	151	$record->leader(' nac 22 1u 4500');
152	$update=1;
153	my $string;	152	my $string;
154	if ($record->field(100)) {	153	if ($record->field(100)) {
155	$string = substr($record->subfield(100,"a")." ",0,35);	154	$string = substr($record->subfield(100,"a")." ",0,35);