From kb2qzv at users.sourceforge.net Wed Oct 1 14:47:01 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 05:47:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.1,1.2 opac-account.tmpl,1.1,1.2 opac-auth.tmpl,1.3,1.4 opac-detail.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 opac-moredetail.tmpl,1.2,1.3 opac-reserve.tmpl,1.1,1.2 opac-search.tmpl,1.2,1.3 opac-searchresults.tmpl,1.1,1.2 opac-user.tmpl,1.2,1.3 opac-userupdate.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1984 Modified Files: kohaerror.tmpl opac-account.tmpl opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-search.tmpl opac-searchresults.tmpl opac-user.tmpl opac-userupdate.tmpl subject.tmpl Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** kohaerror.tmpl 28 Sep 2003 08:31:24 -0000 1.1 --- kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 6,10 **** !
Wystąpił błąd
--- 6,10 ---- !
Wyst±pił bł±d
Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-account.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** Konto dla ! [Pocz±tek][Wyloguj]

--- 3,7 ---- Konto dla ! [ Pocz±tek][Wyloguj]

*************** *** 37,39 **** ! --- 37,39 ---- ! \ No newline at end of file Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-auth.tmpl 29 Jan 2003 23:42:30 -0000 1.3 --- opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 *************** *** 1,22 **** - - !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

!

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

!

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

!

Wprowadziłeś niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

--- 1,20 ---- !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

!

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

!

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

!

Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

*************** *** 31,50 ****
- ! !
Koha - Wstęp
NumerKarty:
Hasło:
 - -
- - --- 29,45 ---- +
! !
Koha - Wstęp
NumerKarty:
Hasło:
+ Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-detail.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 2,6 **** !

Zalogowany jako: [Strony Członkowskie][Log Out]

Zaloguj się do Koha

--- 2,6 ---- !

Zalogowany jako: [Strony Członkowskie][Wyloguj się]

Zaloguj się do Koha

Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 134,135 **** --- 134,138 ----

+ ±ż¶Ľęćńół + ˇŻ¦¬ĘĆŃÓŁ + Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-moredetail.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,5 **** - -
--- 1,3 ---- *************** *** 13,24 **** ! ! ! &type=intra> ()

! ! --- 11,23 ---- ! ! &type=intra> ()

! > ! >

*************** *** 67,73 ****
! ! ! --- 66,72 ---- ! > ! > ! > *************** *** 112,115 **** - - --- 111,112 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-reserve.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,8 ****
! !

Zalogowano jako: [Strony członkowskie][Wyloguj]

Zaloguj się do Koha

--- 3,8 ----
! !

Zalogowano jako: [Strony członkowskie][Wyloguj się]

Zaloguj się do Koha

*************** *** 10,130 **** ! ! !
! Przepraszamy, nie wolno ci złożyć zamówienia ponieważ zalegasz na . ! Przepraszamy, nie możesz złożyć więcej jak rezerwacji. ! Złożyłe¶/a¶ juz zamówienie na tę pozycję. ! Musisz wybrać przynajmniej jeden typ pozycji! !

- - ! ! !

! Strona rezerwacji dla pozycji: ( ) !

!

Złożono już zamówień na tę pozycję.

!

! Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji, ! która stanie się dostępna a należy do jednego z tych typów ! zostanie dla Ciebie zatrzymana. !

! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
ZamówienieTyp PozycjiEgzemplarze
Rezerwacja nie możliwa
!

! Prosimy wybrać oddział, z którego chcesz odebrać pozycję: !
! !

! ! ! !
Rezerwacja tego dnia:: ! ! ! ! ! ! ! !
Koniec rezerwacji tego dnia: ! ! ! ! ! ! ! !
! !

! ! ! ! ! - ! !

! Prosimy potwierdzić, że chcesz zamówić pozycję typu: !

! !

! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Typ Pozycji
! ! Która ma być podjęta z .
! ! ! !
Uwaga, bedzie pobrana opłata w wysoko¶ci PLN
! ! ! ! !
! --- 10,113 ---- ! ! !
! Przepraszamy, nie możesz złozyć zamówienia ponieważ zalegasz na . ! Przepraszamy, nie możesz złożyć więcej jak rezerwacji. ! Złożyłe¶/a¶ już zamówienie na tę pozycję. ! Musisz wybrać przynajmniej jeden typ pozycji! ! Musisz podać oddział do odbioru! !

! !

Strona rezerwacji dla pozycji: ( )

!

Złożono już zamówień na tę pozycję.

!

Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji,która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana. ! !

! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
ZamówienieTyp PozycjiEgzemplarze
Rezerwacja nie możliwa
!

! Prosimy wybrać oddział, z którego chcesz odebrać pozycję: !
!

! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Rezerwacja tego dnia: ! ! ! ! ! !
Koniec rezerwacji tego dnia: ! ! ! ! ! !
!

! !

! !

Prosimy potwierdzić, że chcesz zamówić pozycję typu:

!

! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Typ Pozycji
! która ma być podjęta .
! ! !
Uwaga, będzie pobrana opłata w wysoko¶ci PLN
! ! !
Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.2 --- opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,69 **** ! !

Zalogowano jako: [Strony członkowskie][Wyloguj]

!

Zaloguj się do Koha

! ! ! !
!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
!
Słowo kluczowe
Tytuł ZwykłeDokładne
Autor
Ilustrator
Przedmiot
Klasa ! !
Barcode
!
!
!
! ! ! --- 1,92 ---- ! !

Zalogowano jako: [Strony członkowskie][Wyloguj]

!

Zaloguj się do Koha

! ! ! !
!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! +
Słowa kluczowe
LUB :
Przedmiot
LUB jedno albo więcej z :
TytułNormalnePrecyzyjne
Autor
Ilustrator
Klasa ! !
Kod kreskowy
Zauważ, że je¶li wpiszesz jak±¶ warto¶ć do Słowa kluczowe, oraz inn± gdzie indziej to użyta zostanie jedynie warto¶ć Słowa kluczowego
+ +
+
+ + + Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-searchresults.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 ****
!

Zalogowano jako: [Strony członkowskie][Wyloguj się]

--- 3,7 ----
!

Zalogowano jako: [Strony członkowskie][Wyloguj się]

Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 7 Jan 2003 17:13:21 -0000 1.2 --- opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 17,24 ****

! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadzałe¶/a¶ się, zmieniłe¶/a¶ numer telefonu lub adres e-mail? !

! Zaktualizuj Dane

--- 16,22 ----

! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadzałe¶/a¶ się, zmieniłe¶/a¶ numer telefonu lub adres e-mail?

! Zaktualizuj dane *************** *** 26,30 **** - Witaj [Wyloguj się]

--- 24,27 ---- *************** *** 43,47 **** -
Masz niezapłacone należno¶ci i kary w wysoko¶ci
--- 40,43 ---- *************** *** 51,55 **** -
Posiadasz kredyt na
--- 47,50 ---- *************** *** 74,88 **** ! Obecnie masz wypożyczonych pozycji.
! ! ! --- 69,83 ---- ! Obecnie masz wypożyczonych pozycji
Tytuł Autor Do zwrotuTyp Pozycji OpłatyStatus
! ! ! *************** *** 94,99 **** ! ! --- 89,94 ---- ! ! *************** *** 134,136 **** --- 129,132 ---- + Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-userupdate.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 1,54 **** ! !

Zalogowano jako: [Wyloguj się]

!

Zaloguj się do Koha

! ! ! ! !
!
!
tytuł Autor Do zwrotuTyp pozycji OpłatyBież±cy Status
TakNieTakNie
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Nazwisko
Tytuł
Imię
Ulica
Miasto
Tel. domowy
Tel./Fax w pracy
Email
!
! !

! ! ! --- 1,56 ---- ! !

Zalogowano jako: [Wyloguj się]

!

Zaloguj się do Koha

! ! ! Proszę nanie¶ć potrzebne zmiany. Biblioteka otrzyma wiadomo¶ć e-mailem.
! Zmiany te nie ukaż± się dopóki biblioteka ich nie zatwierdzi..

! ! !
!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Nazwisko
Tytuł
Imię
Ulica
Miasto
Tel. domowy
Tel./Fax w pracy
Email
!
!
!
! ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** !

Logged in as: [Wyloguj się]

Zaloguj się do Koha

--- 3,7 ---- !

Zalogowano jako: [Wyloguj się]

Zaloguj się do Koha

*************** *** 22,26 ****
! trafienia od do z recordów.
--- 22,26 ----
! Trafienia od do z rekordów.
*************** *** 48,50 **** - --- 48,49 ---- From tipaul at users.sourceforge.net Wed Oct 1 15:25:51 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:25:51 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv11361/C4 Modified Files: Biblio.pm Log Message: seems a char encoding problem modified something in char_decode sub... changing back to something that works... Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** Biblio.pm 17 Sep 2003 14:21:13 -0000 1.62 --- Biblio.pm 1 Oct 2003 13:25:49 -0000 1.63 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.63 2003/10/01 13:25:49 tipaul + # seems a char encoding problem modified something in char_decode sub... changing back to something that works... + # # Revision 1.62 2003/09/17 14:21:13 tipaul # fixing bug that makes a MARC biblio disappear when using full acquisition (order => recieve ==> MARC editor). *************** *** 684,688 **** my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table --- 687,691 ---- my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table *************** *** 2299,2418 **** # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/€/gm ; ! s/\xe2/€/gm ; ! s/\xe9/€/gm ; ! s/\xec/€/gm ; ! s/\xf1/€/gm ; ! s/\xf3/€/gm ; ! s/\xf9/€/gm ; ! s/\xfb/€/gm ; ! s/\xc1\x61/€/gm ; ! s/\xc1\x65/€/gm ; ! s/\xc1\x69/€/gm ; ! s/\xc1\x6f/€/gm ; ! s/\xc1\x75/€/gm ; ! s/\xc1\x41/€/gm ; ! s/\xc1\x45/€/gm ; ! s/\xc1\x49/€/gm ; ! s/\xc1\x4f/€/gm ; ! s/\xc1\x55/€/gm ; ! s/\xc2\x41/€/gm ; ! s/\xc2\x45/€/gm ; ! s/\xc2\x49/€/gm ; ! s/\xc2\x4f/€/gm ; ! s/\xc2\x55/€/gm ; ! s/\xc2\x59/€/gm ; ! s/\xc2\x61/€/gm ; ! s/\xc2\x65/€/gm ; ! s/\xc2\x69/€/gm ; ! s/\xc2\x6f/€/gm ; ! s/\xc2\x75/€/gm ; ! s/\xc2\x79/€/gm ; ! s/\xc3\x41/€/gm ; ! s/\xc3\x45/€/gm ; ! s/\xc3\x49/€/gm ; ! s/\xc3\x4f/€/gm ; ! s/\xc3\x55/€/gm ; ! s/\xc3\x61/€/gm ; ! s/\xc3\x65/€/gm ; ! s/\xc3\x69/€/gm ; ! s/\xc3\x6f/€/gm ; ! s/\xc3\x75/€/gm ; ! s/\xc4\x41/€/gm ; ! s/\xc4\x4e/€/gm ; ! s/\xc4\x4f/€/gm ; ! s/\xc4\x61/€/gm ; ! s/\xc4\x6e/€/gm ; ! s/\xc4\x6f/€/gm ; ! s/\xc8\x45/€/gm ; ! s/\xc8\x49/€/gm ; ! s/\xc8\x65/€/gm ; ! s/\xc8\x69/€/gm ; ! s/\xc8\x76/€/gm ; ! s/\xc9\x41/€/gm ; ! s/\xc9\x4f/€/gm ; ! s/\xc9\x55/€/gm ; ! s/\xc9\x61/€/gm ; ! s/\xc9\x6f/€/gm ; ! s/\xc9\x75/€/gm ; ! s/\xca\x41/€/gm ; ! s/\xca\x61/€/gm ; ! s/\xd0\x43/€/gm ; ! s/\xd0\x63/€/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/€/gm ; ! s/\xe1\x65/€/gm ; ! s/\xe1\x69/€/gm ; ! s/\xe1\x6f/€/gm ; ! s/\xe1\x75/€/gm ; ! s/\xe1\x41/€/gm ; ! s/\xe1\x45/€/gm ; ! s/\xe1\x49/€/gm ; ! s/\xe1\x4f/€/gm ; ! s/\xe1\x55/€/gm ; ! s/\xe2\x41/€/gm ; ! s/\xe2\x45/€/gm ; ! s/\xe2\x49/€/gm ; ! s/\xe2\x4f/€/gm ; ! s/\xe2\x55/€/gm ; ! s/\xe2\x59/€/gm ; ! s/\xe2\x61/€/gm ; ! s/\xe2\x65/€/gm ; ! s/\xe2\x69/€/gm ; ! s/\xe2\x6f/€/gm ; ! s/\xe2\x75/€/gm ; ! s/\xe2\x79/€/gm ; ! s/\xe3\x41/€/gm ; ! s/\xe3\x45/€/gm ; ! s/\xe3\x49/€/gm ; ! s/\xe3\x4f/€/gm ; ! s/\xe3\x55/€/gm ; ! s/\xe3\x61/€/gm ; ! s/\xe3\x65/€/gm ; ! s/\xe3\x69/€/gm ; ! s/\xe3\x6f/€/gm ; ! s/\xe3\x75/€/gm ; ! s/\xe4\x41/€/gm ; ! s/\xe4\x4e/€/gm ; ! s/\xe4\x4f/€/gm ; ! s/\xe4\x61/€/gm ; ! s/\xe4\x6e/€/gm ; ! s/\xe4\x6f/€/gm ; ! s/\xe8\x45/€/gm ; ! s/\xe8\x49/€/gm ; ! s/\xe8\x65/€/gm ; ! s/\xe8\x69/€/gm ; ! s/\xe8\x76/€/gm ; ! s/\xe9\x41/€/gm ; ! s/\xe9\x4f/€/gm ; ! s/\xe9\x55/€/gm ; ! s/\xe9\x61/€/gm ; ! s/\xe9\x6f/€/gm ; ! s/\xe9\x75/€/gm ; ! s/\xea\x41/€/gm ; ! s/\xea\x61/€/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; --- 2302,2421 ---- # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/Ć/gm ; ! s/\xe2/Đ/gm ; ! s/\xe9/Ř/gm ; ! s/\xec/ţ/gm ; ! s/\xf1/ć/gm ; ! s/\xf3/đ/gm ; ! s/\xf9/ř/gm ; ! s/\xfb/ß/gm ; ! s/\xc1\x61/ŕ/gm ; ! s/\xc1\x65/č/gm ; ! s/\xc1\x69/ě/gm ; ! s/\xc1\x6f/ň/gm ; ! s/\xc1\x75/ů/gm ; ! s/\xc1\x41/Ŕ/gm ; ! s/\xc1\x45/Č/gm ; ! s/\xc1\x49/Ě/gm ; ! s/\xc1\x4f/Ň/gm ; ! s/\xc1\x55/Ů/gm ; ! s/\xc2\x41/Á/gm ; ! s/\xc2\x45/É/gm ; ! s/\xc2\x49/Í/gm ; ! s/\xc2\x4f/Ó/gm ; ! s/\xc2\x55/Ú/gm ; ! s/\xc2\x59/Ý/gm ; ! s/\xc2\x61/á/gm ; ! s/\xc2\x65/é/gm ; ! s/\xc2\x69/í/gm ; ! s/\xc2\x6f/ó/gm ; ! s/\xc2\x75/ú/gm ; ! s/\xc2\x79/ý/gm ; ! s/\xc3\x41/Â/gm ; ! s/\xc3\x45/Ę/gm ; ! s/\xc3\x49/Î/gm ; ! s/\xc3\x4f/Ô/gm ; ! s/\xc3\x55/Ű/gm ; ! s/\xc3\x61/â/gm ; ! s/\xc3\x65/ę/gm ; ! s/\xc3\x69/î/gm ; ! s/\xc3\x6f/ô/gm ; ! s/\xc3\x75/ű/gm ; ! s/\xc4\x41/Ă/gm ; ! s/\xc4\x4e/Ń/gm ; ! s/\xc4\x4f/Ő/gm ; ! s/\xc4\x61/ă/gm ; ! s/\xc4\x6e/ń/gm ; ! s/\xc4\x6f/ő/gm ; ! s/\xc8\x45/Ë/gm ; ! s/\xc8\x49/Ď/gm ; ! s/\xc8\x65/ë/gm ; ! s/\xc8\x69/ď/gm ; ! s/\xc8\x76/˙/gm ; ! s/\xc9\x41/Ä/gm ; ! s/\xc9\x4f/Ö/gm ; ! s/\xc9\x55/Ü/gm ; ! s/\xc9\x61/ä/gm ; ! s/\xc9\x6f/ö/gm ; ! s/\xc9\x75/ü/gm ; ! s/\xca\x41/Ĺ/gm ; ! s/\xca\x61/ĺ/gm ; ! s/\xd0\x43/Ç/gm ; ! s/\xd0\x63/ç/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC" || $encoding eq "MARC21") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/ŕ/gm ; ! s/\xe1\x65/č/gm ; ! s/\xe1\x69/ě/gm ; ! s/\xe1\x6f/ň/gm ; ! s/\xe1\x75/ů/gm ; ! s/\xe1\x41/Ŕ/gm ; ! s/\xe1\x45/Č/gm ; ! s/\xe1\x49/Ě/gm ; ! s/\xe1\x4f/Ň/gm ; ! s/\xe1\x55/Ů/gm ; ! s/\xe2\x41/Á/gm ; ! s/\xe2\x45/É/gm ; ! s/\xe2\x49/Í/gm ; ! s/\xe2\x4f/Ó/gm ; ! s/\xe2\x55/Ú/gm ; ! s/\xe2\x59/Ý/gm ; ! s/\xe2\x61/á/gm ; ! s/\xe2\x65/é/gm ; ! s/\xe2\x69/í/gm ; ! s/\xe2\x6f/ó/gm ; ! s/\xe2\x75/ú/gm ; ! s/\xe2\x79/ý/gm ; ! s/\xe3\x41/Â/gm ; ! s/\xe3\x45/Ę/gm ; ! s/\xe3\x49/Î/gm ; ! s/\xe3\x4f/Ô/gm ; ! s/\xe3\x55/Ű/gm ; ! s/\xe3\x61/â/gm ; ! s/\xe3\x65/ę/gm ; ! s/\xe3\x69/î/gm ; ! s/\xe3\x6f/ô/gm ; ! s/\xe3\x75/ű/gm ; ! s/\xe4\x41/Ă/gm ; ! s/\xe4\x4e/Ń/gm ; ! s/\xe4\x4f/Ő/gm ; ! s/\xe4\x61/ă/gm ; ! s/\xe4\x6e/ń/gm ; ! s/\xe4\x6f/ő/gm ; ! s/\xe8\x45/Ë/gm ; ! s/\xe8\x49/Ď/gm ; ! s/\xe8\x65/ë/gm ; ! s/\xe8\x69/ď/gm ; ! s/\xe8\x76/˙/gm ; ! s/\xe9\x41/Ä/gm ; ! s/\xe9\x4f/Ö/gm ; ! s/\xe9\x55/Ü/gm ; ! s/\xe9\x61/ä/gm ; ! s/\xe9\x6f/ö/gm ; ! s/\xe9\x75/ü/gm ; ! s/\xea\x41/Ĺ/gm ; ! s/\xea\x61/ĺ/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; From tipaul at users.sourceforge.net Wed Oct 1 15:43:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:43:50 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv16353/updater Modified Files: updatedatabase Log Message: fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** updatedatabase 30 Sep 2003 16:22:05 -0000 1.59 --- updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => '', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', *************** *** 796,799 **** --- 796,802 ---- $dbh->do("ALTER TABLE `items` CHANGE `barcode` `barcode` VARCHAR( 20 )") unless ($nullenabled{barcode} eq 'YES'); + # changing z3950daemon field to NULL in marc_breeding + $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 915,918 **** --- 918,924 ---- # $Log$ + # Revision 1.60 2003/10/01 13:43:48 tipaul + # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". + # # Revision 1.59 2003/09/30 16:22:05 tipaul # adding barcode NOT mandatory feature. Just run updatedatabase to get it. From tipaul at users.sourceforge.net Wed Oct 1 17:03:47 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:03:47 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv32687/updater Modified Files: updatedatabase Log Message: oups... typo fix in z3950random field definition Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 --- updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'NULL', key => '', default => '', *************** *** 918,923 **** # $Log$ ! # Revision 1.60 2003/10/01 13:43:48 tipaul ! # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". # # Revision 1.59 2003/09/30 16:22:05 tipaul --- 918,923 ---- # $Log$ ! # Revision 1.61 2003/10/01 15:03:45 tipaul ! # oups... typo fix in z3950random field definition # # Revision 1.59 2003/09/30 16:22:05 tipaul From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/C4 Z3950.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/C4 Modified Files: Z3950.pm Log Message: fix fog bug #622 : processz3950queue fails Index: Z3950.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Z3950.pm 29 Apr 2003 16:50:51 -0000 1.9 --- Z3950.pm 1 Oct 2003 15:08:14 -0000 1.10 *************** *** 215,219 **** my $serverlist=''; ! $serverlist = join(" ", @serverlist); # chop $serverlist; --- 215,219 ---- my $serverlist=''; ! $serverlist = join("|", @serverlist); # chop $serverlist; *************** *** 307,310 **** --- 307,313 ---- #-------------------------------------- # $Log$ + # Revision 1.10 2003/10/01 15:08:14 tipaul + # fix fog bug #622 : processz3950queue fails + # # Revision 1.9 2003/04/29 16:50:51 tipaul # really proud of this commit :-) From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/z3950 Modified Files: processz3950queue Log Message: fix fog bug #622 : processz3950queue fails Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** processz3950queue 5 Sep 2003 11:30:22 -0000 1.6 --- processz3950queue 1 Oct 2003 15:08:14 -0000 1.7 *************** *** 97,101 **** my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\s+/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; --- 97,101 ---- my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; From kb2qzv at users.sourceforge.net Wed Oct 1 17:14:34 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 08:14:34 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes join-top.inc,1.2,1.3 members-top.inc,1.2,1.3 opac-bottom.inc,1.1,1.2 opac-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv2606 Modified Files: join-top.inc members-top.inc opac-bottom.inc opac-top.inc Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: join-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/join-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** join-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- join-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,69 **** ! ! KOHA: Zostań członkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KOHA: Zostań członkiemSzukaj ! ! ! Zapisy ! ! Pocz±tek
KOHA
! ! ! ! !
! --- 1,67 ---- + ! ! KOHA: Zostań członkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KOHA: Zostań członkiem/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">Szukaj ! ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-join.gif" ! width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home">
/images/inside-koha-bottom.gif" ! width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" ! width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" >
! ! ! ! !
! ±ż¶Ľęćńół ! ˇŻ¦¬ĘĆŃÓŁ \ No newline at end of file Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- members-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 35,42 **** src="/images/menu-search.gif" width=71 height=30 alt="Szukaj" hspace=0 vspace=0 border=0 name="menu-search"> - - Zapisy
! !

 

!
!
! ! Przeszukiwanie Katalogu || ! ! Zostań członkiem || ! Pocz±tek ! ! !
! ! --- 1,32 ----
! ! ! !

 

! !
! !
! ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz±tek ! ! ! ! ! !
! ! ! ! ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,73 **** ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KOHA: Przeszukiwanie KataloguSearch ! ! ! Zapisy ! ! Pocz±tek
KOHA
! ! ! ! !
--- 1,70 ---- ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KOHA: Przeszukiwanie KataloguSearch ! ! Zapisy ! ! Pocz±tek
KOHA
! ! ! ! !
From kb2qzv at users.sourceforge.net Fri Oct 3 22:04:20 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Fri, 03 Oct 2003 13:04:20 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.4,1.5 opac-detail.tmpl,1.2,1.3 opac-main.tmpl,1.3,1.4 opac-reserve.tmpl,1.2,1.3 opac-user.tmpl,1.3,1.4 opac-userupdate.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27293 Modified Files: opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-reserve.tmpl opac-user.tmpl opac-userupdate.tmpl Log Message: minor translation improvements Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 --- opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + *************** *** 29,35 **** -
--- 30,36 ----
Koha - Wstęp
+ *************** *** 39,45 ****
Koha - Wstęp
- --- 40,49 ----
+ + + + Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 65,69 **** Witryna Online ! Dostępn --- 65,69 ---- Witryna Online ! Dostępna *************** *** 76,78 ****

- --- 76,77 ---- Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 134,138 ****

- ±ż¶Ľęćńół - ˇŻ¦¬ĘĆŃÓŁ - --- 134,135 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 35,40 **** Egzemplarze ! ! --- 35,40 ---- Egzemplarze ! ! *************** *** 53,57 **** - - --- 64,67 ---- *************** *** 87,90 **** --- 85,89 ----

Prosimy potwierdzić, że chcesz zamówić pozycję typu:

+
Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 130,132 **** - --- 130,131 ---- Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 44,48 ****

! --- 44,48 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 10:26:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:26:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv23506/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:27:41 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:27:41 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv23662/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv23760/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:40 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:40 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv23803/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:37:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:37:22 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv24872 Added Files: about.tmpl Log Message: first translation --- NEW FILE ---

Dane o bież±cej wersji Koha w celu zgłaszania błędów (lub dla informacji ogólnej).

Rezerwacja tego dnia: --- 53,56 ---- *************** *** 65,69 ****
Koniec rezerwacji tego dnia:
Wersja Koha:
Wersja OS (przez 'uname -a'):
Wersja Perl:
Wersja MySQL:
Wersja Apache:
From kb2qzv at users.sourceforge.net Sat Oct 4 10:43:12 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:43:12 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl auth.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv25416 Modified Files: auth.tmpl Log Message: corrections of closing tag Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/auth.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** auth.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- auth.tmpl 4 Oct 2003 08:43:10 -0000 1.3 *************** *** 3,22 **** !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

!

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

!

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

!

Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

--- 3,22 ---- !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

 !

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

 !

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

 !

Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

 From kb2qzv at users.sourceforge.net Sat Oct 4 10:48:37 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:48:37 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl bookcount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26009 Modified Files: bookcount.tmpl Log Message: latest code update Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/bookcount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** bookcount.tmpl 7 Jan 2003 16:45:50 -0000 1.2 --- bookcount.tmpl 4 Oct 2003 08:48:35 -0000 1.3 *************** *** 2,9 ****

! ! &type="intra"> ()

- --- 2,8 ----

!

! &type="intra"> ()

From kb2qzv at users.sourceforge.net Sat Oct 4 11:00:33 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:00:33 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl boraccount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27387 Modified Files: boraccount.tmpl Log Message: latest code update Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/boraccount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** boraccount.tmpl 25 Jan 2003 20:05:47 -0000 1.2 --- boraccount.tmpl 4 Oct 2003 09:00:30 -0000 1.3 *************** *** 3,10 **** ! Konto dla

!   !

--- 3,10 ---- !

Konto dla ">

! Generuj rachunek   ! Generuj kredyt

*************** *** 15,21 ****

! ! ! --- 15,21 ---- ! ! ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,50 **** - - - --- 45,47 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 11:15:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:15:07 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl intranet-main.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv28840 Modified Files: intranet-main.tmpl Log Message: latest code update Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/intranet-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- intranet-main.tmpl 4 Oct 2003 09:15:04 -0000 1.3 *************** *** 15,27 **** if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> --- 15,27 ---- if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> *************** *** 45,72 **** ! ! ! --- 8,16 ---- ! ! *************** *** 19,62 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KARY I OPŁATYKWOTADO ZAPŁATY
/images/background-mem.gif" colspan=2>KARY I OPŁATY/images/background-mem.gif" colspan=1>KWOTA/images/background-mem.gif" colspan=1>DO ZAPŁATY
RAZEM DO ZAPŁATY
Razem do zapłaty
! ! ! ! ! ! ! ! ! ! --- 45,72 ---- ! !
! ! ! ! ! ! ! ! ! ! *************** *** 75,108 **** ! ! ! - - --- 75,112 ---- ! ! ! ! *************** *** 112,117 **** --- 116,121 ---- *************** *** 127,131 ****
WprowadĽ wyrażenie i naci¶nij kalwisz enter.
! --- 131,135 ----
WprowadĽ wyrażenie i naci¶nij kalwisz enter.
! *************** *** 139,143 **** ! ! ! ! ! --- 170,176 ---- ! *************** *** 178,182 **** ! --- 182,186 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 11:21:03 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:21:03 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl mancredit.tmpl,1.2,1.3 maninvoice.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv29571 Modified Files: mancredit.tmpl maninvoice.tmpl Log Message: latest code update Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** mancredit.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 *************** *** 21,23 **** - --- 21,22 ---- Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 7 Jan 2003 19:52:00 -0000 1.1 --- maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 *************** *** 1,4 **** - - --- 1,2 ---- *************** *** 21,28 **** !
!
! Koha: Horowhenua Library Trust
WprowadĽ wyrażenie i naci¶nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (więcej opcji)
!
!
! Koha: Horowhenua Library Trust		 + +
+ +
WprowadĽ wyrażenie i naci¶nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (więcej opcji)
! !
! ! ! !




!
!
Opis
Kwota
! ! \ No newline at end of file --- 19,25 ----
Opis
Kwota
! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 11:25:46 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:25:46 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv30220 Added Files: member-flags.tmpl Log Message: first upload --- NEW FILE ---

,

>
FLAGI
>

From kb2qzv at users.sourceforge.net Sat Oct 4 11:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:34:17 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbib.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv32526 Modified Files: modbib.tmpl Log Message: latest code update Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbib.tmpl 7 Jan 2003 20:13:24 -0000 1.1 --- modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 *************** *** 8,16 ****
Autor">
Tytuł">
Autor">
Tytuł">
Subject - ...
Data Copyright">
Tytuł Serii">
Autor dodatkowy">
Podtytuł">
Ujednolicony">
Notatki
Seria">
Analytic Author
Analytic Title
--- 19,53 ---- ! Przedmiot ! Data Copyright'u ! "> Tytuł Serii ! "> Autor dodatkowy ! "> Podtytuł ! "> Ujednolicony ! "> Notatki ! Seria ! "> From kb2qzv at users.sourceforge.net Sat Oct 4 11:52:38 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:52:38 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbibitem.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2303 Modified Files: modbibitem.tmpl Log Message: latest code update Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbibitem.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 *************** *** 1,7 **** ! !

! "&type=intra> ()
! Modyfikuj Grupę -
--- 1,5 ---- !

"&type=intra> ()
! Modyfikuj Grupę -


*************** *** 70,75 **** ! ZMIANY DOTYCZˇCE TYCH KODÓW KRESKOWYCH
! Zaznacz te kody kreskowe, których zmiany maj± dotyczyć. Te nie-zaznaczone zachowaj± swoj± oryginaln± grupę. --- 68,73 ---- ! ZMIANY MAJˇCE DOTYCZYĆ TYCH KODÓW KRESKOWYCH
! Zaznacz TE kody kreskowe, których zmiany maj± dotyczyć. Wszystkie nie-zaznaczone zachowaj± swoj± oryginaln± grupę. *************** *** 101,110 **** ! POMOC: Musisz klikn±ć w żadane kółko wyboru (na zielonym tle), i albo przypisać pozycję/e do istniej±cego już w systemie rekordu, ! albo zmodyfikować ten rekord. JE¦LI zmiany maj± dotyczyć jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich ! automatycznie osobny rekord grupowy.

 

- --- 99,106 ---- ! POMOC: Musisz klikn±ć w ż±dane kółko wyboru (na zielonym tle), następnie albo przypisać pozycję/e do istniej±cego już w systemie rekordu, ! albo zmodyfikować ten rekord. JE¦LI zmiany maj± dotyczyć jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

 

From kb2qzv at users.sourceforge.net Sat Oct 4 11:59:51 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:59:51 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3204 Modified Files: moditem.tmpl Log Message: latest code update Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** moditem.tmpl 26 Jan 2003 03:36:37 -0000 1.3 --- moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 *************** *** 1,5 **** ! ()
--- 38,42 ----
--- 1,5 ---- !

()


! ! --- 19,34 ---- ! ! *************** *** 38,43 ****
*************** *** 19,34 **** Zagubiona ! zaznaczono > ! Tak ! zaznaczono > ! Nie
Anulowana zaznaczono > ! Tak ! zaznaczono > ! Nie
Zagubiona ! checked > ! Yes ! checked > ! No
Cancelled checked > ! Yes ! checked > ! No
!
! //images/filesave.png border=0>
*************** *** 45,48 **** ! ! --- 44,46 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 12:03:06 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:03:06 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modwebsites.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3938 Modified Files: modwebsites.tmpl Log Message: latest code update Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modwebsites.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 *************** *** 2,6 ****

">Powrót do strony szczegółów ! EOF --- 2,6 ----

">Powrót do strony szczegółów ! *************** *** 47,51 **** ! EOF --- 47,51 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 12:07:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:07:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newimember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv4513 Modified Files: newimember.tmpl Log Message: latest code update Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 *************** *** 7,15 **** Nieważny numer karty.

" value=""> !
--- 7,16 ---- Nieważny numer karty.

+ Warto¶ci zgodne. Kliknij OK, by potwierdzić nowego czytelnika

" value=""> !
*************** *** 17,19 **** - --- 18,19 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 12:10:45 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:10:45 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv7558 Modified Files: newjmember.tmpl Log Message: latest code update Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newjmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 *************** *** 5,9 ****

'PotwierdĽ Wpis'

! --- 5,9 ----

'PotwierdĽ Wpis'

!
*************** *** 13,17 **** --- 13,17 ---- *************** *** 29,33 **** --- 29,33 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 14:53:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:53:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl request.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1364 Added Files: request.tmpl stats.tmpl Log Message: first upload --- NEW FILE ---
/images/place-request.gif" align=right > "> ">

Zamawienie: >

! &nbpsq;
!  
! &nbpsq;
!  
/images/background-mem.gif">Ranga /images/background-mem.gif">Numer Członka /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbiór /images/background-mem.gif">Zamówienie
Kolejna dostępna,
(lub wybierz z listy poniżej)
/images/background-mem.gif">Zamówienie /images/background-mem.gif">Typ pozycji /images/background-mem.gif">Klasyfikacja /images/background-mem.gif">Tom /images/background-mem.gif">Data publikacji /images/background-mem.gif">Egzemplarze
Nie może być wybrana > >

 

action=modrequest.pl method=post>
/images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJˇCE ZAMÓWIENIA
/images/background-mem.gif">Ranga /images/background-mem.gif">Członek /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbiór /images/background-mem.gif">Zamówienie
> > > Oczekuj±ca pozycja w > &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> Kolejna dostępna Tylko ten typ :
Wymaż rezerwację wybieraj±c "del" z listy ranga. //images/2rightarrow.png">


--- NEW FILE ---
Nazwa Typ Data/czas Kwota Odział

Zapłacono w sumie:
Odpisano w sumie:

From kb2qzv at users.sourceforge.net Sat Oct 4 14:58:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:58:43 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newmember.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 overdue.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.2,1.3 updatebiblio.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2725 Modified Files: newmember.tmpl opac-main.tmpl overdue.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: latest code update Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,13 **** -

PotwierdĽ Wpis

" > ! ! --- 1,10 ---- +

PotwierdĽ Wpis

"> ! NOWY CZYTELNIK ! !  
" > ! *************** *** 21,30 **** " > ! - --- 18,24 ---- " > ! *************** *** 49,61 **** ! ! ! ! --- 43,47 ---- *************** *** 70,74 **** " > ! - - - - - --- 75,85 ---- " > ! *************** *** 125,134 **** " > ! - --- 100,106 ---- " > ! *************** *** 149,158 **** " > ! - --- 121,127 ---- " > ! *************** *** 188,197 **** ! " > ! --- 157,171 ---- ! ! ! ! " > ! *************** *** 229,238 **** " > ! - --- 203,209 ---- " > ! *************** *** 252,256 **** ! --- 223,249 ---- !

BŁˇD

!

Następuj±ce pola s± Ľle wypełnione. Wróć do poprzedniej strony i spróbuj raz jeszcze:

! ! Cardnumber
! ! ! Invalid_cardnumber
! ! ! Gender
! ! ! Given Names
! ! ! Surname
! ! ! Postal Street Address
! ! ! Postal city
! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,135 **** ! WITAMY W KATALOGU KOHA
/images/background-mem.gif"> ! NOWY CZŁONEK
"> SZCZEGÓŁY CZŁONKOWSKIE -   -
/images/background-mem.gif"> SZCZEGÓŁY CZŁONKOWSKIE
! !
! Area ! !
!
! Data Zapisu --- 56,60 ----
! Data zapisu *************** *** 89,110 **** !
"> DANE PERSONALNE -   -
- Etniczno¶ć - - -
!
/images/background-mem.gif"> DANE PERSONALNE
"> ADRES CZYTELNIKA -   -
/images/background-mem.gif"> ADRES CZYTELNIKA
"> DANE OSOBY KONTAKTOWEJ -   -
/images/background-mem.gif"> DANE OSOBY KONTAKTOWEJ
"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ !  
! Text messaging ! !
/images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
"> NOTATKI -   -
/images/background-mem.gif"> NOTATKI

Koha: Katalog i usługi dla czytelników		 Szukaj w katalogu
   

WprowadĽ wyrażenie i naci¶nij klawisz enter.
-Wyszukiwanie zaawansowane (więcej opcji)

Zalogowano jako: [Wyloguj]

Zaloguj się do Koha

! --- 1,269 ---- ! + WITAMY W KATALOGU KOHA + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ Koha: Katalog i usługi dla czytelników		Szukaj w katalogu
   
+ +
+ + WprowadĽ wyrażenie i naci¶nij klawisz enter.
+ + + -Wyszukiwanie zaawansowane (więcej opcji)
+ + +

+ +

Zalogowano jako: [Wyloguj]

+ +

Zaloguj się do Koha

+ +
+ +
+

+

! Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,10 **** ! ! ! ! ! ! Pozycje zaległe w dniu

--- 1,6 ---- ! !

Pozycje zaległe w dniu


*************** *** 34,39 **** ! ! ! ! --- 30,32 ---- ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** thesaurus_popup.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,16 **** ! ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!

"> ! "> ! "> ! ! ! --- 1,18 ---- ! ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!
!

! "> ! "> ! "> ! ! !

*************** *** 24,33 **** !
"> "> wprowadĽ now± authority : ! ! ! --- 40,43 ---- } ! ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** updatebiblio.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 3,9 **** !

Kliknij "Wy¶lij", by wymusić hasło przedmiotowe
!

--- 3,9 ---- !

Kliknij "Prze¶lij..", by wymusić przedmiot
!

*************** *** 17,19 **** - --- 17,18 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 21:46:31 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:46:31 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25169 Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: first translation and upload --- NEW FILE ---

Akwizycje


SKŁADANIE ZAMÓWIENIA, ODBIÓR LUB MODYFIKACJA
Nazwa dostawcy
ODBIÓR LUB MODYFIKACJA ZAMÓWIEŃ REGULARNYCH
Wyszukiwanie tytułowe

KURSY WYMIANY
" value=>
BUDŻET ORAZ WYDATKI KSIĘGARSKIE
Budżet Suma Wydano Alokowano Dostępne
Total

Zastosuj kombinację klawiszy [ctrl + r] aby wy¶wietlić uaktualnione cyfry. Podane cyfry s± przybliżone, gdyż kurs wymiany wpływa na kwotę faktycznie zapłacon±.

POMOC zamówienia:

    By rozpocz±ć akwizycję, niezależnie czy jest to zamówienie, zakup własny czy darowizna najpierw wyszukaj dostawcę, dodaj go je¶li potrzeba.
    Następnie wybierz poprzedni koszyk lub utwórz nowy. Uwaga, koszyk będzie należał do nazwy użytkownika z jak± się zalogowałe¶/a¶.
    Aby złozyć zamówienie należy ustalić czy istnieje już opis dla pozycji, następnie albo dodać pozycję albo wstawić nowy opis i dodać pozycję.

W celu zamknięcia koszyka kliknij na "zobacz koszyki" lub szukaj powyżej, a następnie naci¶nij "zatwierdĽ koszyk".

--- NEW FILE ---

Rachunek:
Otrzymany przez:

Receipt Summary for: Invoice,

- Odbiór zamówienia


Koszyk dla:
Zamówienie złożone:

/images/background-mem.gif" colspan=2> SZCZEGÓŁY KATALOGU
Tytuł * " >
Autor " >
Data Copyright " >
Format
ISBN ">
Series ">
Oddział
Kod kreskowy pozycji * ">
Informacje tomowe (for serials) *
> > > "> "> "> /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0>
DETALE KSIĘGOWO-FINANSOWE
Bookfund *
Ilo¶ć zamówiona ">
Ilo¶ć odebrana * ">
Koszt wymiany ">
Budgeted Cost ">
Faktyczny koszt * ">
Numer rachunku ">
Uwagi ">

 


Koszyk ISBN TYTUŁ AUTOR Ilo¶ć Otrzymano
&biblio=&invoice=&freight=&gst=&id=>
--- NEW FILE ---

Koszyk dla >


(Our Reference: , #, zatwierdzone przez: )

"> > ">
Zamówienie Isbn Tytuł Autor $ rrp $est Ilo¶ć Suma
&id=&basket=">
POMOC
W celu zmiany informacji dotycz±cej katalogu lub zaksięgowania danego zamówienia nalezy klikn±ć w tytuł.
 SubTotal
GST
TOTAL
"> "> Dodaj zamówienie : wprowadĽ hasło lub tytuł:

--- NEW FILE ---

Koszyk dla


(Our Reference: , #, zatwierdzone przez: )
Tel: , Fax:
,
,

"> "> Wyszukaj hasło lub tytuł:
>
Zamówienie Isbn Tytuł Autor Ilo¶ć
--- NEW FILE ---
"> "> "> "> "> "> "> "> "> "> " value=""> Obejrzyj koszyk

- Szczegóły zamówienia


Koszyk dla:

SZCZEGÓŁY KATALOGU
TYTUŁ * ">
Autor " >
Data Copyright ">
Format
ISBN ">
Series ">
Oddział
/images/holder.gif" width=32 height=250 align=left>
DETALE KSIĘGOWO-FINANSOWE
Ilo¶ć " onchange='update(this.form)' >
Bookfund
Cena dostawcy " onchange='update(this.form)'>
Koszt wymiany
" onchange='update(this.form)'>
Budgeted Cost
(ex GST, inc discount) 		" onchange='update(this.form)'>
Budgeted GST
BUDGETED TOTAL
Koszt faktyczny
Numer rachunku *
Uwagi ">
//images/2rightarrow.png" border=0 align=right>
HELP
  • Tłuste pola s± obowiazkowe dla stworzenia nowego opisu i pozycji.

  • Zacienione pola mog± być użyte w celu "szybkiego" odbioru zamówienia, gdy pozycje były kupione lokalnie lub darowane. W tym wypadku ilo¶ć "zamówiona" zostanie wprowadzona do bazy jako ilo¶ć otrzymana.

 

--- NEW FILE ---

Wyniki wyszukiwania dostawców


Szukano dostawcy , znaleziono rezultat(y)(ów)

>
Zamów Odbierz Podmiot
Koszyk Pozycje Pracownik Data
/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
">


Dodaj dostawcę --- NEW FILE ---
Rachunek:
Otrzymany przez:

Receipt Summary for : , Rachunek

"> "> "> "> Szukaj ISBN lub tytuł:

">
KOSZYK ISBN TYTUŁ AUTOR FAKTYCZNY P&P IL SUMA
&biblio=&invoice=&gst=&freight=&id="> $ $
SUBTOTALS $ $
POMOC
The total at the bottom of the page should be within a few cents of the total for the invoice.

When you have finished this invoice save the changes.

GST $
TOTAL $
--- NEW FILE ---

Odbiór zamówień od dostawcy ">

>

INFORMACJE O RACHUNKU DOSTAWCY
Numer rachunku dostawcy
GST
Za przesyłkę
/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>

--- NEW FILE --- >

Uaktualnienie:

Dodaj dostawcę

Szczegóły podmiotu
Nazwa podmiotu ">
Adres pocztowy
Adres fizyczny
Telefon ">
Fax ">
Witryna ">
Dane kontaktowe
Nazwisko ">
Stanowisko ">
Telefon ">
Inny telefon ">
Fax ">
E-mail ">
Uwagi
/images/filesave.png" border=0 title="save" alt="save">
BIEŻˇCY STATUS
Dostawca jest checked>Active checked>Inactive
DANE O ZAMÓWIENIACH
Publishers and Imprints
List Prices are
Invoice Prices are
GST Registered checked>Yes checked>No
List Item Price Includes GST checked>Yes checked>No
Invoice Item Price Includes GST checked>Yes checked>No
Rabat > %
From kb2qzv at users.sourceforge.net Sat Oct 4 21:47:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:47:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25270 Modified Files: newbasket2.tmpl Log Message: minor corrections Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket2.tmpl 10 Jan 2003 22:04:42 -0000 1.1 --- newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 *************** *** 1,5 **** !

Nowy koszyk dla:

--- 1,5 ---- !

Koszyk dla:

From kb2qzv at users.sourceforge.net Sun Oct 5 20:51:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:51:48 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple isbnsearch.tmpl,1.3,1.4 marcimport.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4163 Modified Files: isbnsearch.tmpl marcimport.tmpl Log Message: update of code and translation Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** isbnsearch.tmpl 3 Feb 2003 05:36:43 -0000 1.3 --- isbnsearch.tmpl 5 Oct 2003 18:51:46 -0000 1.4 *************** *** 1,44 **** ! ! Rezultaty wyszukiwania opisu
! Szukano ISBN
! Trafienia od do wy¶wietlono -

! ! ! ! ! ! ! ! ! "> ! -
TYTUŁAUTOR©Pozycje
">Edycja...

- - &offset=&num="> - -

- Trafienia według stron: - &offset=&num=5">5 - &offset=&num=10">10 - &offset=&num=20">20 - &offset=&num=50">50 -

-
-

 

--- 1,104 ---- ! Rezultaty wyszukiwania opisu
! Szukałe¶ ISBN tytuł
! znaleziono
! Trafienia z wy¶wietlono

! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! ! !
Opisy w koha
! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! !
TytułAutor© 
">Dodaj pozycję">Edytuj...
Nic nie znaleziono
!
! ! ! ! !
Opisy w hurtowni opisów
! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
TytułAutorISBNpochodz±cy z  
! ">Dodaj opis
Nic nie znaleziono
    ">Dodaj nowy opis">Dodaj nowy opis
+
Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marcimport.tmpl 9 Jan 2003 11:27:22 -0000 1.1 --- marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 *************** *** 1,3 **** -

System akwizycji MARC

--- 1,2 ---- *************** *** 5,18 **** !
Importuj do farmy hodowlanej
!

Importuj wyniki :

    rekordy importowano

    nie importowano ponieważ już s± w bazie

    !

    nie importowano ponieważ już s± w farmie

    nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

    rekordów przeczytanych

    --- 4,17 ---- !
    Importuj do hurtowni opisów
    !

    Import wyniki :

      rekordy importowano

      nie importowano ponieważ już s± w bazie

      !

      nie importowano ponieważ już s± w hurtowni

      nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

      rekordów przeczytanych

      *************** *** 21,31 ****
        ! Wybierz plik, by importować go do farmy hodowlanej. Będzie przeczytany i dla każdego znalezionego numeru ISBN ! utworzone zostanie nowe "ciel±tko" w farmie. Je¶li ISBN już w farmie istnieje można zdecydować czy nowe ! powinno być zignorowane czy też stare nadpisane nowym.
        ! Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c ! pochodzenie sugerowanych danych MARC !
        ! Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha. !
      " enctype="multipart/form-data"> --- 20,28 ----
        !
      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w hurtowni.
        • !
      • Je¶li ISBN już w hurtowni istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
        • !
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
        • !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
        • !
      " enctype="multipart/form-data">
      *************** *** 43,47 **** ! --- 40,44 ---- ! From kb2qzv at users.sourceforge.net Sun Oct 5 20:57:18 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:57:18 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple marcimport.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4985 Modified Files: marcimport.tmpl Log Message: update of code and translation Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 --- marcimport.tmpl 5 Oct 2003 18:57:16 -0000 1.3 *************** *** 20,25 ****
        !
      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w hurtowni.
        • !
      • Je¶li ISBN już w hurtowni istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
        • --- 20,25 ----
          !
        • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w farmie.
          • !
        • Je¶li ISBN już w farmie istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
        • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
        • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
          • *************** *** 40,46 ****
      ! ! --- 40,52 ---- ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Oct 5 21:20:44 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 12:20:44 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv8858 Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl Log Message: first upload --- NEW FILE --- Dodaj nowy opis bibliograficzny
      Je¶li ISBN już jest w farmie : Odrzuć ten, zatrzymaj istniej±cy
      Zast±p istniej±cy nowym
      Je¶li ISBN już jest w hurtowni : Odrzuć ten, zatrzymaj istniej±cy
      Zast±p istniej±cy nowym
      Je¶li ISBN już jest w hurtowni : Odrzuć ten, zatrzymaj istniej±cy
      ! Zast±p istniej±cy nowym
      Character encoding (USMARC or UNIMARC) !
      !
      Je¶li ISBN już jest w hurtowni: Ignoruj to, zatrzymaj istniej±ce
      ! Nadpisz istniej±ce obecnym
      Sekcja Pierwsza: Informacje Copyright

      Proszę okre¶lić tytuł
      Tytuł: *
      Podtytuł:
      Autor:
      Tytuł serii:
      (je¶li dotyczy)
      Data Copyright:
      Abstract:
      Uwagi:
      * Wymagane pola --- NEW FILE --- test

      Musisz nadać pozycji kod kreskowy

      Musisz otworzyć now± grupę, do której dodana zostanie pozycja

      Niestety, ten kod jest już w użyciu

      REKORD BIBLIOGRAFICZNY
      Autor:
      Copyright:
      Tytuł serii:
      Uwagi:
      GRUPA -
      URL:
      Data:
      Uwagi:
      GRUPA -
      ISBN:
      Dewey:
      Wydawca:
      Miejsce:
      Data:
      Pozycja:
      Odział własny:
      Uwagi:

      ">
      DODAJ NOWˇ POZYCJĘ:
      Dla witryny dodaj tylko grupę
      Kod kreskowy pozycji:
      Oddział:
      Cena wymiany:
      Uwagi:
      Dodaj do istniej±cej grupy:
      Grupa:
      LUB dodaj do nowej grupy:
      Format:
      ISBN:
      Wydawca:
      Rok publikacji:
      Miejsce publikacji:
      Ilustrator:
      Dodatkowi autorzy:
      Każdy autor w osobnej linii
      Subject Headings:
      One Subject per line
      Witryna URL:
      Dewey:
      Dewey Subclass:
      ISSN:
      LCCN:
      Tom:
      Numer:
      Volume Description:
      Strony:
      Wymiary:
      Uwagi:
      From slef at users.sourceforge.net Sun Oct 5 23:27:08 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 05 Oct 2003 14:27:08 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.51,1.52 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv30966 Modified Files: Install.pm Log Message: add locale test (Closes: 576) and remove crap underlining Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** Install.pm 8 Sep 2003 13:36:00 -0000 1.51 --- Install.pm 5 Oct 2003 21:27:06 -0000 1.52 *************** *** 231,239 **** access some of the features of the intranet. ! IMPORTANT : ! ! ============ ! ! You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. --- 231,235 ---- access some of the features of the intranet. ! IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. *************** *** 719,722 **** --- 715,721 ---- if (@missing > 0) { my $missing=''; + if (POSIX::setlocale(LC_ALL) != "C") { + $missing.=" export LC_ALL=C\n"; + } foreach my $module (@missing) { $missing.=" perl -MCPAN -e 'install \"$module\"'\n"; *************** *** 878,886 **** Please provide a good password for the user %s. ! IMPORTANT : ! ! ============ - You can log in using this userid and password at any time. Password for database user %s: |; --- 877,882 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; From kb2qzv at users.sourceforge.net Mon Oct 6 00:44:04 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 15:44:04 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue catalogue-home.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv11000 Modified Files: catalogue-home.tmpl detail-opac.tmpl detail.tmpl Log Message: no message Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- catalogue-home.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 5,42 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -
      ! Wyszukiwanie w katalogu -
      - - -
      ! ! ! ! ! ! ! ! ! !
      Numer pozycji     OR
       
      HELP
      ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

      ! Catalogue ! Maintenance: To add a new biblio or item go to ! acquisitions.

      ! To request, modify or delete a biblio or item first search for it here.

      --- 5,33 ---- !

      Przeszukiwanie katalogu

      ! ! ! ! ! ! ! ! ! !
      Kod kreskowy     LUB
       
      ! ! POMOC
      ! Wyszukiwanie: Wypełnienie kilku pól w kwerendzie (np. Słowo kluczowe + autor + klasa) spowoduje wolniejsze wyszukiwanie.

      ! !

      *************** *** 44,64 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Słowa kluczowe
      Tytuł ZwykłeDokładne
      Autor
      Ilustrator
      Dewey
      Class ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Słowo kluczowe
      Tytuł ! Zwykłe ! Precyzyjne !
      Autor
      Ilustrator
      Dewey
      Class
      OR
      S
      ! ! ! !
      ! !

      ! Półki wirtualne ! ! --- 68,110 ----

      LUB
      Hasło przedm.
      ! ! ! ! ! ! !
      ! ! //images/2rightarrow.png" BORDER=0 > ! ! ! ! Półki wirtualne !
      !
      ! !

      !

      Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail-opac.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,13 **** - - - - -

      Zalogowany jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       - --- 1,4 ---- *************** *** 28,32 ****
      ! Podtytuł:
      Autor:
      --- 19,23 ----
      ! Podtytuł:
      Autor:
      *************** *** 40,44 **** W sumie pozycji:

      ! --- 31,35 ---- W sumie pozycji:

      ! *************** *** 51,55 **** Lokalizacja Termin zwrotu ! Wypożyczono? --- 42,46 ---- Lokalizacja Termin zwrotu ! Wypożyczono Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,69 **** - - ! ! ! ! ! ! > ! ! ! () !

      ! ! ! ! ! ! ! ! ! ! !
      ! REKORD BIBLIO ! ! ! ! ! !
      !
      ! "> ! ! !
      !
      ! ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło przedmiotowe:
      ! Copyright:
      ! Uwagi:
      ! Ujednolicony:
      ! Seria:
      ! W sumie pozycji: !

      ! !

      ! ! ! REKORD BIBLIO ! ! ! ! !

      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło:
      ! Copyright:
      ! Uwagi:
      ! Tytuł ujednol.:
      ! Seria:
      ! Całkowita liczba pozycji: !

      ! ! ! !

      ! /images/background-mem.gif"> *************** *** 28,33 **** --- 28,35 ---- *************** *** 36,48 ****
      Opis MARC :
      9
      		 "> !
      9
      		 + "> ! ! wyszukiwarka z3950
      !
      ! !
      ">"> -
        --- 38,52 ----
      !
      ! ! /images/background-mem.gif"> ! ! *************** *** 58,70 **** !
      ">"> - )">+
        * *************** *** 50,53 **** --- 54,58 ---- "> "> + "> ">
      ! ! --- 19,38 ---- From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail.tmpl 18 Sep 2003 13:28:59 -0000 1.5 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 *************** *** 19,59 ****

      ">"> -
        --- 63,77 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Sous-titre:
      ! Autres auteurs:
      ! Editeur
      ! Année:
      ! Périodique:
      ! URL :
      !
      ! Résumé:
      !
      ! Sujet:
      !
      ! Nombre d'exemplaires: !

      !

      ! Sous-titre: ! Auteur:
      ! Autre Auteur:
       ! Publié par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! Côte dewey :
      ! URL :
      ! Nbre d'exemplaires:
      ! ! ! ! ! ! ! !
      ! Notice biblio N° !
      !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">" class="button">MARC
      !
      !
      ! ! Sous-titre:
      ! Auteur: >
      ! Autre Auteur:
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre unique:
      ! Périodique:
      ! URL :
      ! Nbre total d'exemplaires: !

      !

      --- 19,52 ----

      ! ! ! ! ! ! !
      ! Notice N° !
      !
      " class="button">MARC

      ! ! Sous-titre: ! Auteur: >
      ! Autre Auteur:
       ! Publié par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! Côte dewey :
      ! URL :
      ! Nbre total d'exemplaires: !

      ! !

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** detail.tmpl 18 Sep 2003 07:38:22 -0000 1.7 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.8 *************** *** 23,50 **** !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! Subtitle:
      ! Author: >
      ! Additional Author:
      ! Series Title:
      ! Subject:
      ! Copyright:
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Total Number of Items:

      --- 23,44 ---- !
      " class="button">MARC

      ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items:

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.tmpl 8 May 2003 12:26:14 -0000 1.8 --- opac-detail.tmpl 14 Oct 2003 11:37:47 -0000 1.9 *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! BIBLIO RECORD ! ! !
      ! ! Subtitle:
      ! Author:
      ! Subject:
      ! Copyright:
      ! Total Number of Items: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      --- 16,80 ---- ! ! ! ! ! ! !
      ! BIBLIO RECORD ! !
      ! ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      From tipaul at users.sourceforge.net Tue Oct 14 14:36:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 05:36:38 -0700 Subject: [Koha-cvs] CVS: koha/misc cleanmarcdb.pl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25755/misc Added Files: cleanmarcdb.pl Log Message: script to clean MARC DB when a subfield is removed from the MARC editor : the subfield is NOT removed from DB (to avoid stupid loss of data). This script forever removes unused subfields from the DB. Quite fast script. --- NEW FILE --- #!/usr/bin/perl # small script that rebuilds the non-MARC DB use strict; # Koha modules used # use MARC::File::USMARC; use MARC::Record; use MARC::Batch; use C4::Context; use C4::Biblio; use Time::HiRes qw(gettimeofday); use Getopt::Long; my ( $input_marc_file, $number) = ('',0); my ($version, $confirm,$test_parameter); GetOptions( 'c' => \$confirm, 'h' => \$version, 't' => \$test_parameter, ); if ($version || (!$confirm)) { print < shows this screen) \t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long) \t-t => test only, change nothing in DB EOF ;#' die; } my $dbh = C4::Context->dbh; my $i=0; my $starttime = gettimeofday; my $cleansubfield = $dbh->prepare("delete from marc_subfield_table where tag=? and subfieldcode=?"); my $cleanword = $dbh->prepare("delete from marc_word where tag=? and subfieldid=?"); # get tags structure my $tags = MARCgettagslib($dbh,1); foreach my $tag (sort keys(%{$tags})) { foreach my $subfield (sort keys(%{$tags->{$tag}})) { next if $subfield eq "lib"; next if $subfield eq "mandatory"; next if $subfield eq "tab"; # DO NOT drop biblionumber, biblioitemnumber and itemnumber. # they are stored internally, and are mapped to tab -1. This script must keep them or it will completly break Koha DB !!! next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblio.biblionumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblioitems.biblioitemnumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "items.itemnumber"); # now, test => if field is ignored (in tab -1 or '') => drop everything in the MARC table ! if ($tags->{$tag}->{$subfield}->{tab} eq -1 || $tags->{$tag}->{$subfield}->{tab} eq '') { print "dropping $tag \$ $subfield\n"; $cleansubfield->execute($tag,$subfield) unless $test_parameter; $cleanword->execute($tag,$subfield) unless $test_parameter; print "TEST " if $test_parameter; print "done\n"; } } } my $timeneeded = gettimeofday - $starttime; print "done in $timeneeded seconds\n"; From rangi at users.sourceforge.net Thu Oct 16 22:36:28 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:28 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** circulation.tmpl 7 Aug 2003 12:41:59 -0000 1.9 --- circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 *************** *** 164,173 **** ! ! ! ! ! !

      --- 164,170 ---- !
      ! ! +
      *************** *** 222,226 **** --- 219,263 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Patron information
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Catégorie: +
      CHARGES> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CHARGES onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      WAITING + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      ODUESYes, See below
      NOTES
      + +



      From rangi at users.sourceforge.net Thu Oct 16 22:36:27 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:27 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/circ Modified Files: circulation.pl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** circulation.pl 24 Jul 2003 08:33:35 -0000 1.60 --- circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 *************** *** 297,300 **** --- 297,301 ---- firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, + categorycode => $borrower->{'categorycode'}, question => $question, barcode => $barcode, *************** *** 309,317 **** CGIselectborrower => $CGIselectborrower, - patrontable => $patrontable, - flaginfotable => $flaginfotable, - CHARGES => $flags->{'CHARGES'}, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); --- 310,315 ---- CGIselectborrower => $CGIselectborrower, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); *************** *** 367,425 **** my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; ! } } else { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag $flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } elsif ($flag eq 'WAITING') { ! my $itemswaiting=''; ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'} $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})
      \n"; } ! $flaginfotext.="$flag$itemswaiting\n"; ! } elsif ($flag eq 'ODUES') { ! my $items=$flags->{$flag}->{'itemlist'}; ! my $itemswaiting="\n"; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="\n"; ! } } ! $itemswaiting.="
      $iteminformation->{'date_due'}{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}$iteminformation->{'title'}
      \n"; ! if ($query->param('module') ne 'returns'){ ! $flaginfotext.="$flag$flags->{$flag}->{'message'}, See below\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; } - } else { - $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; - } } } - ($flaginfotext) && ($flaginfotext="Flags$flaginfotext\n"); - $flaginfotext.=""; - my $patrontable= << "EOF"; -

      - - - - EOF return($patrontable, $flaginfotext); } --- 365,436 ---- my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext; ! #my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { + warn $flag; + my @itemswaiting=''; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! $template->param( ! noissues => 'true', ! color => $color, ! ); ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); ! } } else { ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); } ! if ($flag eq 'WAITING') { ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'}; ! push @itemswaiting, $iteminformation; ! } ! $template->param( ! waiting => 'true', ! waitingmsg => $flags->{'WAITING'}->{'message'}, ! itemswaiting => \@itemswaiting, ! ); } ! if ($flag eq 'ODUES') { ! $template->param( ! odues => 'true', ! oduesmsg => $flags->{'ODUES'}->{'message'} ! ); ! ! my $items=$flags->{$flag}->{'itemlist'}; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! push @itemswaiting, $iteminformation; ! } ! } ! if ($query->param('module') ne 'returns'){ ! $template->param( nonreturns => 'true' ); ! } ! } ! if ($flag eq 'NOTES') { ! $template->param( ! notes => 'true', ! notesmsg => $flags->{'NOTES'}->{'message'} ! ); } } } return($patrontable, $flaginfotext); } From tipaul at users.sourceforge.net Fri Oct 17 12:02:59 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 17 Oct 2003 03:02:59 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.65,1.66 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv26914/C4 Modified Files: Biblio.pm Log Message: Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** Biblio.pm 14 Oct 2003 09:45:29 -0000 1.65 --- Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.66 2003/10/17 10:02:56 tipaul + # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. + # # Revision 1.65 2003/10/14 09:45:29 tipaul # adding rebuildnonmarc.pl script : run this script when you change a link between marc and non MARC DB. It rebuilds the non-MARC DB (long operation) *************** *** 1193,1197 **** foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>1 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { --- 1196,1200 ---- foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>2 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { From cauchoip at users.sourceforge.net Fri Oct 17 13:10:59 2003 From: cauchoip at users.sourceforge.net (Pierre Cauchois) Date: Fri, 17 Oct 2003 04:10:59 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3396 Modified Files: circulation.tmpl Log Message: fix for #436 on french default template Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** circulation.tmpl 22 Sep 2003 13:05:17 -0000 1.5 --- circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 *************** *** 163,172 **** ! ! ! ! ! !
      Patron Information
      - {'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}
      $borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'}
      --- 163,169 ---- !
      ! ! +
      *************** *** 221,225 **** --- 218,262 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Informations lecteur
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Catégorie: +
      Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
      Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      En attente + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      RetardsOui, voir ci-dessous
      Notes
      + +



      *************** *** 228,236 **** /images/background-mem.gif"> ! Todays Issues ! Due DateBar CodeTitleAuthorClass --- 265,273 ---- /images/background-mem.gif"> ! Emprunts du jour ! Retour pour leCode barreTitreAuteurClasse From tipaul at users.sourceforge.net Mon Oct 20 16:25:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 07:25:38 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.53,1.54 koha.upgrade,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7969/misc Modified Files: Install.pm koha.upgrade Log Message: koha.upgrade bugfixes. Should work... Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Install.pm 6 Oct 2003 09:10:39 -0000 1.53 --- Install.pm 20 Oct 2003 14:25:36 -0000 1.54 *************** *** 1772,1776 **** my %configfile; ! open (KC, "<$etcdir/koha.conf"); while () { chomp; --- 1772,1776 ---- my %configfile; ! open (KC, ") { chomp; *************** *** 1788,1799 **** } ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } --- 1788,1799 ---- } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** koha.upgrade 22 Jan 2003 03:45:39 -0000 1.4 --- koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 *************** *** 8,27 **** if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; - - loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } --- 8,24 ---- if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } *************** *** 37,41 **** This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? ([Y]/N): |; --- 34,38 ---- This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? (Y/[N]): |; *************** *** 43,64 **** chomp $answer; ! if ($answer =~/n/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; - - checkperlmodules(); - - my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; --- 40,57 ---- chomp $answer; ! unless ($answer =~/y/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; checkperlmodules(); my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; *************** *** 66,84 **** if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } } - } } --- 59,77 ---- if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } } } *************** *** 92,106 **** foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! )) { ! if ( -d $mysql ) { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! $mysqldir='/usr'; ! } my ($sec, $min, $hr, $day, $month, $year) = (localtime(time))[0,1,2,3,4,5]; --- 85,115 ---- foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <) { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } --- 128,136 ---- while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } *************** *** 129,133 **** close MD; - my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; --- 138,141 ---- *************** *** 194,198 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 202,206 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; *************** *** 272,275 **** --- 280,284 ---- /etc/apache-ssl/conf/apache.conf /etc/httpd/conf/httpd.conf + /etc/httpd/conf/commonhttpd.conf /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { *************** *** 362,366 **** unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); --- 371,375 ---- unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); *************** *** 382,387 **** ! open (KC, "/etc/koha.conf"); ! my $kccontents=''; my $kc; while () { --- 391,396 ---- ! ! my $kccontents='';open (KC, "/etc/koha.conf"); my $kc; while () { *************** *** 455,461 **** and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. - - [NOTE PERMISSIONS ARE NOT COMPLETED AS OF 1.2.3RC1. Do not give passwords to - any patrons unless you want them to have full access to your intranet.] |; print "Press the key to continue: "; --- 464,467 ---- *************** *** 469,473 **** = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. --- 475,480 ---- = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. From tipaul at users.sourceforge.net Mon Oct 20 17:45:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:45:00 -0700 Subject: [Koha-cvs] CVS: koha/marc deletemarc,1.1,NONE koha2marc,1.6,NONE marcschema.sql,1.16,NONE perlmarcstructure,1.4,NONE updatedb2marc.pl,1.6,NONE Message-ID: Update of /cvsroot/koha/koha/marc In directory sc8-pr-cvs1:/tmp/cvs-serv28788/marc Removed Files: deletemarc koha2marc marcschema.sql perlmarcstructure updatedb2marc.pl Log Message: removing outdated scripts. --- deletemarc DELETED --- --- koha2marc DELETED --- --- marcschema.sql DELETED --- --- perlmarcstructure DELETED --- --- updatedb2marc.pl DELETED --- From slef at users.sourceforge.net Mon Oct 20 18:13:03 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:13:03 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv4145 Modified Files: updatedatabase Log Message: Omitted annotation added. Closes: 624 Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 --- updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 *************** *** 646,649 **** --- 646,650 ---- } unless ( $existingtables{'z3950servers'} ) { + #MJR: added syntax entries to close bug 624 print "Adding z3950servers table...\n"; my $sti = $dbh->prepare( "create table z3950servers ( *************** *** 919,922 **** --- 920,926 ---- # $Log$ + # Revision 1.63 2003/10/20 16:13:01 slef + # Omitted annotation added. Closes: 624 + # # Revision 1.62 2003/10/20 16:10:19 slef # Adding USMARC to LOC z3950 entry From tipaul at users.sourceforge.net Mon Oct 20 18:27:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:27:00 -0700 Subject: [Koha-cvs] CVS: koha release_notes_200RC1.txt,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv6776 Added Files: release_notes_200RC1.txt Log Message: 1st draft of release notes for next public release --- NEW FILE --- RELEASE NOTES ============= this version of Koha is the 1st one of the 2.0.0 series in the "stable" tree. IT DOES NOT MEAN IT HAS NO BUGS. It means that at least 5 libraries are using it and they don't encounter unsolvable problems. If you want to adopt Koha, you're welcomed, but you're warned that this version still has some bugs and missing features. INSTALLATION ========== * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./installer.pl * follow the instructions. UPGRADE from previous 2.0.0preX version ======= * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. UPGRADE from previous 1.2.x version ======= This upgrade is possible with this release for the 1st time. EXPECT IT TO HAVE SOME BUGS SOMEWHERE. USE IT ONLY IF YOU KNOW HOW TO GO BACK TO PREVIOUS SITUATION. Otherwise, WAIT for 2.0.0RC2 or so. * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. * launch Koha * Go to Parameters >> Marc structure option and Koha-MARC links option. * Modify default MARC structure to fit your needs. * open a console/term * Enter : cd /path/to/koha/misc export PERL5LIB=/path/to/koha ./koha2marc.pl the old DB is "copied" in the new MARC one. Koha 2.0.0RC1 is ready. BUGFIXES/IMPROVEMENTS ======= BUGS FIXED : +++++++++ 619 : Visiting selectbranchprinter.pl automatically resets branch 618 : Add member process does not check for duplicate barcode 532 : Can't assign new password without changing UserID 599 : edited items are stored incorrectly in old Koha DB (aka : barcode non mandatory bug) 616 : MARCgetbiblio doesn't create leader 500 : [INTRANET]Only 21 items are displayed in the search result 595 : 'Add field' link in /acqui.simple/addbiblio.pl adds incorrect field. 622 : processz3950queue fails 576 : add install locale test 39 : Update Dirs in z3950 scripts 536 : bulkmarcimport.pl generates subtitle error 436 : circulation.pl only partially templated (this bug is partially fixed) IMPROVEMENTS +++++++++ * Polish version of Koha (courtesy of Benedykt) * some useful tools in misc directory to manage the DB * adding "fines" entry in parameters section : to manage fees when a book is returned too late * From tipaul at users.sourceforge.net Mon Oct 20 18:28:01 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:28:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import In directory sc8-pr-cvs1:/tmp/cvs-serv6956/koha-tmpl/intranet-tmpl/default/fr/import Modified Files: breeding.tmpl Log Message: Index: breeding.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** breeding.tmpl 4 Jun 2003 13:46:24 -0000 1.1 --- breeding.tmpl 20 Oct 2003 16:27:59 -0000 1.2 *************** *** 37,40 **** --- 37,46 ---- + encodage (MARC21 or UNIMARC) + +
      + + + Si l'ISBN existe déjà dans le réservoir : Ignorer celui-ci, conserver celui qui existe déjà
      From tipaul at users.sourceforge.net Mon Oct 20 17:42:45 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:42:45 -0700 Subject: [Koha-cvs] CVS: koha/misc koha2marc.pl,NONE,1.1 dumpmarc.pl,1.2,1.3 koha.upgrade,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv28325/misc Modified Files: dumpmarc.pl koha.upgrade Added Files: koha2marc.pl Log Message: Upgrade script : the koha2marc.pl copies the old DB into the new MARC one. This script must be executed when migrating from 1.2.x to 2.0.x. --- NEW FILE --- #!/usr/bin/perl use C4::Context; use CGI; use DBI; #use strict; use C4::Biblio; use C4::Output; use Getopt::Long; my ( $confirm,$delete); GetOptions( 'c' => \$confirm, 'd' => \$delete, ); my $dbh = C4::Context->dbh; if ($delete) { print "deleting MARC tables\n"; $dbh->do("delete from marc_biblio"); $dbh->do("delete from marc_subfield_table"); $dbh->do("delete from marc_blob_subfield"); $dbh->do("delete from marc_word"); } my $userid=$ENV{'REMOTE_USER'}; my $sthbiblioitem = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); my $sthitems = $dbh->prepare("select itemnumber from items where biblionumber=?"); my $sth=$dbh->prepare("select biblionumber from biblio"); $sth->execute; my $env; $env->{'marconly'}=1; my ($MARC, $biblionumber,$biblioitemnumber,$bibid); while (($biblionumber) = $sth->fetchrow) { print "Processing $biblionumber\n"; $sthbiblioitem->execute($biblionumber); ($biblioitemnumber) = $sthbiblioitem->fetchrow; $MARC = &MARCkoha2marcBiblio($dbh,$biblionumber,$biblioitemnumber); $bibid = &MARCaddbiblio($dbh,$MARC,$biblionumber); # now, search items, and add them... $sthitems->execute($biblionumber); while (($itemnumber) = $sthitems->fetchrow) { $MARC = &MARCkoha2marcItem($dbh,$biblionumber,$itemnumber); &MARCadditem($dbh,$MARC,$biblionumber); } } Index: dumpmarc.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/dumpmarc.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dumpmarc.pl 21 May 2003 14:19:32 -0000 1.2 --- dumpmarc.pl 20 Oct 2003 15:42:43 -0000 1.3 *************** *** 40,41 **** --- 40,42 ---- $i++; } + print "\n==================\n$i record parsed\n"; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 --- koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 *************** *** 492,495 **** --- 492,507 ---- You may also need to uncomment a "LoadModules env_module ... " line and restart Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) Please report any problems you encounter through http://bugs.koha.org/ From slef at users.sourceforge.net Mon Oct 20 18:10:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:10:21 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv3778 Modified Files: updatedatabase Log Message: Adding USMARC to LOC z3950 entry Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 --- updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 *************** *** 656,660 **** id int, checked smallint, ! rank int)" ); $sti->execute; --- 656,661 ---- id int, checked smallint, ! rank int, ! syntax char(80))" ); $sti->execute; *************** *** 665,669 **** '', '', 'Library of Congress', ! 1, 1, 1)" ); $sti->execute; --- 666,670 ---- '', '', 'Library of Congress', ! 1, 1, 1, 'USMARC')" ); $sti->execute; *************** *** 918,921 **** --- 919,925 ---- # $Log$ + # Revision 1.62 2003/10/20 16:10:19 slef + # Adding USMARC to LOC z3950 entry + # # Revision 1.61 2003/10/01 15:03:45 tipaul # oups... typo fix in z3950random field definition From slef at users.sourceforge.net Mon Oct 20 21:16:52 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:52 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.54,1.55 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7426/misc Modified Files: Install.pm Log Message: Work on install bugs (see bug 632) Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** Install.pm 20 Oct 2003 14:25:36 -0000 1.54 --- Install.pm 20 Oct 2003 19:16:50 -0000 1.55 *************** *** 958,965 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on %s/koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. Enter the Apache userid: |; --- 958,966 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; *************** *** 978,982 **** /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf --- 979,983 ---- /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache2.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf *************** *** 1068,1072 **** NOTE: You will need to add lines to your main httpd.conf to ! Include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). --- 1069,1073 ---- NOTE: You will need to add lines to your main httpd.conf to ! include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). *************** *** 1192,1196 **** startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf"`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; --- 1193,1197 ---- startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf" 2>/dev/null`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; *************** *** 1418,1422 **** #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\n"; close(FILE); --- 1419,1423 ---- #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf"; close(FILE); *************** *** 1772,1776 **** my %configfile; ! open (KC, ") { chomp; --- 1773,1778 ---- my %configfile; ! #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. ! open (KC, "<$etcdir/koha.conf"); while () { chomp; From slef at users.sourceforge.net Mon Oct 20 21:16:53 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:53 -0700 Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-shell.sh,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv7426/z3950 Modified Files: z3950-daemon-shell.sh Log Message: Work on install bugs (see bug 632) Index: z3950-daemon-shell.sh =================================================================== RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-shell.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** z3950-daemon-shell.sh 6 Oct 2003 09:10:39 -0000 1.3 --- z3950-daemon-shell.sh 20 Oct 2003 19:16:50 -0000 1.4 *************** *** 35,42 **** --- 35,48 ---- export PERL5LIB + KOHA_CONF=$KohaConf + export KOHA_CONF + exec $KohaZ3950Script $LogDir >>$LOGFILE 2>&1 #------------------- # $Log$ + # Revision 1.4 2003/10/20 19:16:50 slef + # Work on install bugs (see bug 632) + # # Revision 1.3 2003/10/06 09:10:39 slef # Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.15,1.16 marctagstructure.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** authorised_values.tmpl 4 Jul 2003 14:03:44 -0000 1.15 --- authorised_values.tmpl 21 Oct 2003 15:47:07 -0000 1.16 *************** *** 76,90 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 76,96 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.18 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.19 *************** *** 132,137 **** ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> --- 132,149 ---- ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/admin authorised_values.pl,1.10,1.11 marctagstructure.pl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv22352/admin Modified Files: authorised_values.pl marctagstructure.pl Log Message: fix for #577 Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** authorised_values.pl 24 Jun 2003 10:26:17 -0000 1.10 --- authorised_values.pl 21 Oct 2003 15:47:07 -0000 1.11 *************** *** 66,70 **** debug => 1, }); ! my $pagesize=20; my $op = $input->param('op'); --- 66,70 ---- debug => 1, }); ! my $pagesize=5; my $op = $input->param('op'); *************** *** 188,198 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => ""); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => ""); ! ! } } #---- END $OP eq DEFAULT --- 188,203 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT Index: marctagstructure.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** marctagstructure.pl 1 Aug 2003 14:23:52 -0000 1.16 --- marctagstructure.pl 21 Oct 2003 15:47:07 -0000 1.17 *************** *** 193,201 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => "'); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => "'); } } #---- END $OP eq DEFAULT --- 193,208 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters authorised_values.tmpl,1.5,1.6 marctagstructure.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** authorised_values.tmpl 4 Jul 2003 14:04:02 -0000 1.5 --- authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 *************** *** 81,95 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 81,101 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.6 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 *************** *** 154,159 **** //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! //images/1leftarrow.png" title="Prec" ALT="Prec" BORDER=0 >       ! //images/1rightarrow.png" title="Suivant" ALT="Suivant" BORDER=0> --- 154,171 ---- //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From rangi at users.sourceforge.net Wed Oct 22 22:20:50 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:20:50 -0700 Subject: [Koha-cvs] CVS: koha updatebibitem.pl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv23486 Modified Files: updatebibitem.pl Log Message: Fix for bug 591 Index: updatebibitem.pl =================================================================== RCS file: /cvsroot/koha/koha/updatebibitem.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** updatebibitem.pl 13 Oct 2002 07:35:50 -0000 1.11 --- updatebibitem.pl 22 Oct 2003 20:20:48 -0000 1.12 *************** *** 22,26 **** use CGI; use strict; ! use C4::Acquisitions; use C4::Output; use C4::Search; --- 22,26 ---- use CGI; use strict; ! use C4::Biblio; use C4::Output; use C4::Search; From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/circ Modified Files: circulation.pl Log Message: moving more html out of the script Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 --- circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 *************** *** 156,162 **** # HTML code.... ! my $responsesform = ''; foreach (keys %responses) { ! $responsesform.="\n"; } my $questionform; --- 156,166 ---- # HTML code.... ! my %responseform; ! my @responsearray; foreach (keys %responses) { ! # $responsesform.="\n"; ! $responseform{'name'}=$_; ! $responseform{'value'}=$responses{$_}; ! push @responsearray,\%responseform; } my $questionform; *************** *** 290,294 **** printername => $printers->{$printer}->{'printername'}, allowborrow =>$allowborrow, - #question form question => $question, --- 294,297 ---- *************** *** 305,316 **** yearoptions => $yearoptions, stickyduedate => $stickyduedate, - responseform => $responsesform, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, - amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues ); --- 308,318 ---- yearoptions => $yearoptions, stickyduedate => $stickyduedate, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues, ! responseloop => \@responsearray ); From slef at users.sourceforge.net Wed Oct 22 16:48:10 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Wed, 22 Oct 2003 07:48:10 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.55,1.56 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25043 Modified Files: Install.pm Log Message: A lot of wording rewritten Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** Install.pm 20 Oct 2003 19:16:50 -0000 1.55 --- Install.pm 22 Oct 2003 14:48:08 -0000 1.56 *************** *** 122,151 **** my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing setup.\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! Welcome to the Koha install script! This script will prompt you for some ! basic information about your desired setup, then install Koha for you. ! ! If you want to install the Koha configuration file somewhere other than /etc ! (eg for non-root installation, or multiple Koha versions on one system), you ! should set the etcdir and prefix environment variables. If this is your ! only koha installation on this machine and you are running this as root, the ! default should be OK. ! ! To accept the default value for any question, simply hit Enter at the prompt. ! ! Please be sure to read the documentation, or visit the Koha website at ! http://www.koha.org for more information. Are you ready to begin the installation? ([Y]/N): |; $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING WARNING WARNING WARNING WARNING ! ! You are about to install Koha version %s. This version of Koha is a ! release candidate. It is not intended to be installed on production systems. It is being released so that users can test it before we release a final ! version. Are you sure you want to install Koha %s? (Y/[N]): |; --- 122,153 ---- my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing...\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! This program will ask some questions and try to install koha for you. ! You need to know: where most koha files should be stored (you can set ! the prefix environment variable for this); the username and password of ! a mysql superuser; and details of your library setup. You may also need ! to know details of your Apache setup. ! ! If you want to install the Koha configuration files somewhere other than ! /etc (for multiple Koha versions on one system, for example), you should ! set the etcdir environment variable. Please look at your manuals for ! details of how to set that. ! ! Recommended answers are given in brackets after each question. To accept ! the default value for any question (indicated by []), simply hit Enter ! at the prompt. Are you ready to begin the installation? ([Y]/N): |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING: You are about to install Koha version %s. This is a ! release candidate, not intended for production systems. It is being released so that users can test it before we release a final ! version and report bugs to us. ! ! Most people should answer Yes here. Are you sure you want to install Koha %s? (Y/[N]): |; *************** *** 168,182 **** perl -MCPAN -e 'install Net::Z3950' ! IMPORTANT NOTE : If you use PERL5.8.0 (RedHat 8.0 or Mandrake 9.x), you MUST install ! manually the Net::Z3950 and edit Makefile.PL and yazwrap/Makefile.PL to include: 'DEFINE' => '-D_GNU_SOURCE', Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting the following line in yazwrap/ywpriv.h : ! #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL & MODULES') . qq| Checking perl modules ... |; --- 170,187 ---- perl -MCPAN -e 'install Net::Z3950' ! ...or by installing packages for your distribution, if available. ! ! IMPORTANT NOTE : If you use Perl 5.8.0, you might need to ! edit NET::Z3950's Makefile.PL and yazwrap/Makefile.PL to include: ! 'DEFINE' => '-D_GNU_SOURCE', + Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting in yazwrap/ywpriv.h a line saying #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL MODULES') . qq| Checking perl modules ... |; *************** *** 187,191 **** You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They can be installed by running (as root) the following: %s --- 192,196 ---- You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They may be installed by running (as root) the following: %s *************** *** 193,197 **** $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('ALL PERL MODULES INSTALLED') . qq| All mandatory perl modules are installed. --- 198,202 ---- $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('PERL MODULES AVAILABLE') . qq| All mandatory perl modules are installed. *************** *** 201,206 **** $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists ! already). If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. --- 206,211 ---- $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists). ! If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. *************** *** 215,240 **** $messages->{'GetIntranetDir'}->{en} = ! heading('INTRANET/LIBRARIANS DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Intranet/Librarians files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('KOHA LOG DIRECTORY') . qq| ! Specify a log directory where any Koha daemons can create log files. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" module to add passwords for other accounts and set their permissions. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('KOHA INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! --- 220,245 ---- $messages->{'GetIntranetDir'}->{en} = ! heading('LIBRARIAN DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Librarian interface files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('LOG DIRECTORY') . qq| ! Specify a directory where log files will be written. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. ! You will be required to log in to ! access some features. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" screen to add passwords for other accounts and set their flags. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! *************** *** 242,254 **** http://%s\:%s/ - use mysql login and password to connect to this interface. Then, go to admin page, and create whatever fits your needs. ! and the OPAC interface at : ! http://%s\:%s/ ! Be sure to read the Hints file. ! For more information visit http://www.koha.org Press to exit the installer: |; --- 247,258 ---- http://%s\:%s/ ! use the koha admin mysql login and password to connect to this interface. ! and the OPAC interface at: ! http://%s\:%s/ ! Please read the Hints file and visit http://www.koha.org Press to exit the installer: |; *************** *** 749,764 **** $messages->{'NoUsrBinPerl'}->{en} = ! heading('Perl is not located in /usr/bin/perl') . qq| ! The Koha perl scripts expect to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable: [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! The Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! May I create this symlink? ([Y]/N): ! : |; $messages->{'DirFailed'}->{en} = RED.qq| --- 753,769 ---- $messages->{'NoUsrBinPerl'}->{en} = ! heading('No /usr/bin/perl') . qq| ! Koha expects to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! Some Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! Most users should answer Y here. ! ! May I try to create this symlink? ([Y]/N):|; $messages->{'DirFailed'}->{en} = RED.qq| *************** *** 854,874 **** =cut ! $messages->{'DatabaseName'}->{en} = heading('Name of MySQL database') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the hostname for mysql. Unless the database is located on ! another machine this will be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! Please provide the name of the user who will have full administrative rights ! to the %s database, when authenticating from %s. ! This user will also be used to access Koha's INTRANET interface. Database user [%s]: |; --- 859,882 ---- =cut ! $messages->{'DatabaseName'}->{en} = heading('Database Name') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. + Most users give a short single-word name for their library here. + Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the mysql server name. Unless the database is stored on ! another machine, this should be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! We are going to create a new mysql user for Koha. This user will have full administrative rights ! to the database called %s when they connect from %s. ! This is also the name of the Koha librarian superuser. ! Most users give a single-word name here. Database user [%s]: |; *************** *** 877,881 **** Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; --- 885,889 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this user and password at any time. Password for database user %s: |; *************** *** 937,946 **** $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES') . qq| I found more than one possible Apache configuration file: %s ! Choose the correct file [1]: |; $messages->{'NoApacheConfFiles'}->{en} = --- 945,954 ---- $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES FOUND') . qq| I found more than one possible Apache configuration file: %s ! Enter number of the file to read [1]: |; $messages->{'NoApacheConfFiles'}->{en} = *************** *** 948,954 **** I was not able to find your Apache configuration file. ! The file is usually called httpd.conf or apache.conf. ! Please specify the location of your config file: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| --- 956,962 ---- I was not able to find your Apache configuration file. ! The file is usually called httpd.conf, apache.conf or similar. ! Please enter the full name, starting with /: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| *************** *** 958,970 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of ! %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USERID') . qq| The userid %s is not a valid userid on this system. --- 966,978 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. ! This is used to set up access permissions for ! %s/koha.conf. This user should be set in one of the Apache configuration. ! Please try to find it and enter the user name below. You might find ! that "ps u|grep apache" will tell you. It probably is NOT "root". Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| The userid %s is not a valid userid on this system. *************** *** 1061,1070 **** heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and LIBRARIAN virtual hosts. By default this installer ! will do this by using one ip address and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf detailing ! what these other options are. NOTE: You will need to add lines to your main httpd.conf to --- 1069,1077 ---- heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and Librarian sites. By default this installer ! will do this by using one name and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf about them. NOTE: You will need to add lines to your main httpd.conf to *************** *** 1076,1087 **** $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB SERVER E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for the virtual hosts (this ! address is displayed if any errors are encountered). E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB SERVER HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. --- 1083,1094 ---- $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for Koha. This ! address is displayed if fatal errors are encountered. E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. *************** *** 1089,1102 **** Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC VIRTUAL HOST PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content from this host, you should change it ! to a different port (8000 might be a good choice). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('INTRANET VIRTUAL HOST PORT') . qq| ! Please enter the port for your Intranet interface. This must be different from the OPAC port (%s). --- 1096,1109 ---- Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content with this hostname, you should change it ! to a different port (8000 might be a good choice, but check any firewalls). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('LIBRARIAN PORT') . qq| ! Please enter the port for your Librarian interface. This must be different from the OPAC port (%s). *************** *** 1155,1160 **** heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find statements for them in your config. Please ! make sure that they are enabled for your Koha host. Press to continue: |; --- 1162,1167 ---- heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find them in your config. Please ! make sure that they are enabled for your Koha site. Press to continue: |; *************** *** 1163,1168 **** $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha ! Virtual Hosts. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache --- 1170,1174 ---- $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache *************** *** 1279,1293 **** $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('INTRANET AUTHENTICATION') . qq| ! I can set it up so that the Intranet/Librarian site is password protected using ! Apache's Basic Authorization. ! This is going to be phased out very soon. However, setting this up can provide ! an extra layer of security before the new authentication system is completely ! in place. ! Would you like to do this ([Y]/N): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a userid for intranet access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; --- 1285,1297 ---- $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('LIBRARIAN AUTHENTICATION') . qq| ! The Librarian site can be password protected using ! Apache's Basic Authorization instead of Koha user details. ! This method going to be phased out very soon. Most users should answer N here. ! Would you like to do this (Y/[N]): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a username for librarian access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; *************** *** 1295,1299 **** sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'y'); my $httpdconf = $etcdir."/koha-httpd.conf"; --- 1299,1303 ---- sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'n'); my $httpdconf = $etcdir."/koha-httpd.conf"; *************** *** 1441,1445 **** $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To allow us to create the koha database please enter your mysql server's root user password: --- 1445,1449 ---- $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To create the koha database, please enter your mysql server's root user password: *************** *** 1454,1466 **** heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, I have a batch of sample ! data that you can install now. ! If you are installing Koha with the intention of populating it with your own data, you probably don't want this sample data installed. --- 1458,1470 ---- heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, ! you can install some sample data now. ! If you are installing Koha to use your own data, you probably don't want this sample data installed. *************** *** 1473,1477 **** http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at +irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: --- 1477,1481 ---- http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: *************** *** 1483,1487 **** $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to install an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; --- 1487,1491 ---- $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to describe an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; *************** *** 1564,1569 **** $messages->{'UpdateMarcTables'}->{en} = ! heading('UPDATING MARC FIELD DEFINITION TABLES') . qq| ! You can import marc parameters for : 1 MARC21 --- 1568,1573 ---- $messages->{'UpdateMarcTables'}->{en} = ! heading('MARC FIELD DEFINITIONS') . qq| ! You can import MARC settings for: 1 MARC21 *************** *** 1571,1593 **** N none ! Please choose which parameter you want to install. Note if you choose N, ! nothing will be added, and it can be a BIG job to manually create those tables Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq| This version of koha supports a few languages. - Enter your language preference : either en, fr, es, pl or zh_TW ! Note that the en is always choosen when the system does not finds the ! language you choose in a specific screen. ! fr : all is translated (except pictures) ! es : a few intranet is translated (including pictures) ! pl : OPAC and a few intranet is translated ! zh_TW : partial translation ! Whether you specify a language here, you can always go to the ! intranet interface and change it from the system preferences. Which language do you choose? |; --- 1575,1598 ---- N none ! NOTE: If you choose N, ! nothing will be added, and you must create them all yourself. ! Only choose N if you want to use a MARC format not listed here, ! such as DANMARC. We would like to hear from you if you do. Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGE') . qq| This version of koha supports a few languages. ! en : default language, all pages available ! fr : complete translation (except pictures) ! es : partial librarian site translation (including pictures) ! pl : complete OPAC and partial librarian translation ! zh_TW : partial translation ! en is used when a screen is not available in your language ! If you specify a language here, you can still ! change it from the system preferences screen in the librarian sit. Which language do you choose? |; From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Thu Oct 23 22:33:55 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:33:55 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.63,1.64 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv8901/updater Modified Files: updatedatabase Log Message: Making the borrowenumber an auto_increment field Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -r1.63 -r1.64 *** updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 --- updatedatabase 23 Oct 2003 20:33:53 -0000 1.64 *************** *** 801,804 **** --- 801,807 ---- $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"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 920,923 **** --- 923,929 ---- # $Log$ + # Revision 1.64 2003/10/23 20:33:53 rangi + # Making the borrowenumber an auto_increment field + # # Revision 1.63 2003/10/20 16:13:01 slef # Omitted annotation added. Closes: 624 From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: moving more html out of the script Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 --- circulation.tmpl 22 Oct 2003 20:01:28 -0000 1.11 *************** *** 79,83 **** > > ! --- 79,85 ---- > > ! ! " value=""> ! *************** *** 95,99 **** > > ! --- 97,103 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:18:36 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:18:36 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv29298/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: circulation.tmpl Log Message: syn'ching chris commits Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 --- circulation.tmpl 25 Oct 2003 08:18:34 -0000 1.7 *************** *** 78,82 **** > > ! --- 78,84 ---- > > ! ! " value=""> ! *************** *** 94,98 **** > > ! --- 96,102 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:46:31 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:46:31 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.66,1.67 Breeding.pm,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv32447/C4 Modified Files: Biblio.pm Breeding.pm Log Message: minor fixes for bilbio deletion (still buggy) Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 --- Biblio.pm 25 Oct 2003 08:46:27 -0000 1.67 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.67 2003/10/25 08:46:27 tipaul + # minor fixes for bilbio deletion (still buggy) + # # Revision 1.66 2003/10/17 10:02:56 tipaul # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. *************** *** 1827,1831 **** sub OLDdelbiblio{ my ($dbh,$biblio)=@_; - # my $dbh=C4Connect; my $query="select * from biblio where biblionumber=$biblio"; my $sth=$dbh->prepare($query); --- 1830,1833 ---- *************** *** 1839,1843 **** } $query=~ s/\,$/\)/; - # print $query; $sth=$dbh->prepare($query); $sth->execute; --- 1841,1844 ---- *************** *** 1849,1853 **** } $sth->finish; - # $dbh->disconnect; } --- 1850,1853 ---- *************** *** 2126,2129 **** --- 2126,2131 ---- my $dbh = C4::Context->dbh; &OLDdelbiblio($dbh,$biblio); + my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblio); + &MARCdelbiblio($dbh,$bibid,0); } Index: Breeding.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Breeding.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Breeding.pm 8 Sep 2003 08:42:40 -0000 1.3 --- Breeding.pm 25 Oct 2003 08:46:28 -0000 1.4 *************** *** 72,75 **** --- 72,76 ---- for (my $i=0;$i<=$#marcarray;$i++) { my $marcrecord = MARC::File::USMARC::decode($marcarray[$i]."\x1D"); + my @warnings = $marcrecord->warnings(); if (ref($marcrecord) eq undef) { $notmarcrecord++; From tipaul at users.sourceforge.net Sat Oct 25 10:50:41 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:50:41 -0700 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_700_701_702.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1:/tmp/cvs-serv388/value_builder Modified Files: unimarc_field_700_701_702.pl Log Message: bugfix : use of '$var' instead of ? in sql statement Index: unimarc_field_700_701_702.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_700_701_702.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** unimarc_field_700_701_702.pl 27 Feb 2003 16:58:03 -0000 1.4 --- unimarc_field_700_701_702.pl 25 Oct 2003 08:50:39 -0000 1.5 *************** *** 122,127 **** if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST ('$search_string') and category ='NP'"); ! $sti->execute; while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; --- 122,127 ---- if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST (?) and category ='NP'"); ! $sti->execute($search_string); while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From slef at users.sourceforge.net Sun Oct 26 13:21:16 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 04:21:16 -0800 Subject: [Koha-cvs] CVS: koha/misc koha.upgrade,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv12088 Modified Files: koha.upgrade Log Message: Initial changes so that I can test. /etc still hardcoded. z3950 installation buggy. Really needs merge with Install.pm, which I will nw start on. Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 --- koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 *************** *** 7,15 **** $::language='en'; - if ($<) { - print "\n\nYou must run koha.upgrade as root.\n\n"; - exit; - } - ############################################### # SET THE etcdir ENVIRONMENT VAR INSTEAD # --- 7,10 ---- *************** *** 60,64 **** checkperlmodules(); ! my $backupdir='/usr/local/koha/backups'; print "Please specify a backup directory [$backupdir]: "; --- 55,59 ---- checkperlmodules(); ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; print "Please specify a backup directory [$backupdir]: "; *************** *** 189,193 **** OPAC: $::opacdir ! INTRANET: $::intranetdir --- 184,188 ---- OPAC: $::opacdir ! LIBRARIAN: $::intranetdir *************** *** 210,214 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 205,209 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; $answer = ; *************** *** 306,310 **** I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! /etc/koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; --- 301,305 ---- I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; *************** *** 470,474 **** using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; --- 465,469 ---- using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; From slef at users.sourceforge.net Sun Oct 26 14:21:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 05:21:21 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.57,1.58 koha.upgrade,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv23111 Modified Files: Install.pm koha.upgrade Log Message: first part of upgrade merge: some FIXMEs and testing to do Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** Install.pm 25 Oct 2003 09:53:54 -0000 1.57 --- Install.pm 26 Oct 2003 13:21:19 -0000 1.58 *************** *** 71,74 **** --- 71,75 ---- &populatedatabase &restartapache + &backupkoha &finalizeconfigfile &loadconfigfile *************** *** 142,145 **** --- 143,160 ---- Are you ready to begin the installation? ([Y]/N): |; + $messages->{'WelcomeToUpgrader'}->{en} = + heading('Welcome to the Koha Upgrader') . qq| + You are attempting to upgrade from Koha %s to %s. + + We recommend that you do a complete backup of all your files before upgrading. + This upgrade script will make a backup copy of your files for you. + + Would you like to proceed? (Y/[N]):|; + + $messages->{'AbortingInstall'}->{en} = + heading('ABORTING') . qq| + Aborting as requested. Please rerun when you are ready. + |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| *************** *** 258,261 **** --- 273,312 ---- Press to exit the installer: |; + $messages->{'UpgradeCompleted'}->{en} = heading('UPGRDE COMPLETE') . qq| + Congratulations ... your Koha upgrade is finished! + + If you are upgrading from a version of Koha + prior to 1.2.1, it is likely that you will have to modify your Apache + configuration to point it to the new files. + + In your INTRANET VirtualHost section you should have: + DocumentRoot $::intranetdir/htdocs + ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + In the OPAC VirtualHost section you should have: + DocumentRoot $::opacdir/htdocs + ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + You may also need to uncomment a "LoadModules env_module ... " line and restart + Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) + + Please report any problems you encounter through http://bugs.koha.org/ + + Press to exit the installer: |; + sub releasecandidatewarning { my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]); *************** *** 668,671 **** --- 719,788 ---- } + =item checkpaths + + checkpaths; + + Make sure that we loaded the right dirs from an old koha.conf + + =cut + + #FIXME: update to use Install.pm + sub checkpaths { + if ($opacdir && $intranetdir) { + print qq| + + I believe that your old files are located in: + + OPAC: $opacdir + LIBRARIAN: $intranetdir + + + Does this look right? ([Y]/N): + |; + $answer = ; + chomp $answer; + + if ($answer =~/n/i) { + $intranetdir=''; + $opacdir=''; + } else { + print "Great! continuing upgrade... \n"; + } + } + + if (!$opacdir || !$intranetdir) { + $intranetdir=''; + $opacdir=''; + while (!$intranetdir) { + print "Please specify the location of your LIBRARIAN files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $intranetdir=$answer; + } + if (! -e "$intranetdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $intranetdir=''; + } + } + while (!$opacdir) { + print "Please specify the location of your OPAC files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $opacdir=$answer; + } + if (! -e "$opacdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $opacdir=''; + } + } + } + + } =item checkperlmodules *************** *** 1363,1366 **** --- 1480,1484 ---- #MJR: preserve old files, just in case + #FIXME: use dated backups sub neatcopy { my $desc = shift; *************** *** 1612,1615 **** --- 1730,1734 ---- } + #FIXME: do not ask if we are upgrading from a MARC-ready system my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); *************** *** 1731,1734 **** --- 1850,1987 ---- } + =item backupkoha + + backupkoha; + + This function attempts to back up all koha's details. + + =cut + + #FIXME: rewrite to use Install.pm + sub backupkoha { + my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; + print "Please specify a backup directory [$backupdir]: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $backupdir=$answer; + } + + if (! -e $backupdir) { + my $result=mkdir ($backupdir, oct(770)); + if ($result==0) { + my @dirs = split(m#/#, $backupdir); + my $checkdir=''; + foreach (@dirs) { + $checkdir.="$_/"; + unless (-e "$checkdir") { + mkdir($checkdir, 0775); + } + } + } + } + + chmod 0770, $backupdir; + + # Backup MySql database + # + # + my $mysql; + my $mysqldir; + + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + print "I don't see mysql in the usual places.\n"; + for (;;) { + print "Where have you installed mysql? "; + chomp($mysqldir = ); + last if -f "$mysqldir/bin/mysqladmin"; + print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); + + my $itemcounter=0; + my $bibliocounter=0; + my $biblioitemcounter=0; + my $membercounter=0; + + while () { + (/insert into items /i) && ($itemcounter++); + (/insert into biblioitems /i) && ($biblioitemcounter++); + (/insert into biblio /i) && ($bibliocounter++); + (/insert into borrowers /i) && ($membercounter++); + print BF $_; + } + + close BF; + close MD; + + my $filels=`ls -hl $backupdir/Koha.backup_$date`; + chomp $filels; + printf qq| + + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + $filels + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): + |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; + + $answer = ; + chomp $answer; + + if ($answer=~/^n/i) { + print qq| + + Aborting. The database dump is located in: + + $backupdir/Koha.backup_$date + + |; + exit; + } else { + print "Great! continuing upgrade... \n"; + }; + + + + } =item finalizeconfigfile *************** *** 1775,1778 **** --- 2028,2032 ---- #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. + #FIXME: make a dated backup open (KC, "<$etcdir/koha.conf"); while () { *************** *** 1791,1802 **** } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } --- 2045,2057 ---- } ! #MJR: Reverted this too. You do not mess with my privates. Please ask for new functions if required. ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } *************** *** 1846,1851 **** =head1 SEE ALSO ! buildrelease.pl, installer.pl =cut --- 2101,2107 ---- =head1 SEE ALSO ! buildrelease.pl installer.pl + koha.upgrade =cut Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 --- koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 *************** *** 10,22 **** # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! my $etcdir = $ENV{etcdir}||'/etc'; ! system("mkdir -p $etcdir"); ! ! Install::setetcdir $etcdir; my $input; loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; --- 10,18 ---- # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! Install::setetcdir($ENV{etcdir}||'/etc'); my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; *************** *** 26,51 **** } ! print qq| ! ! ================ ! = Koha Upgrade = ! ================ ! ! You are attempting to upgrade from Koha $::kohaversion to $::newversion. ! ! We recommend that you do a complete backup of all your files before upgrading. ! This upgrade script will make a backup copy of your files for you. ! ! Would you like to proceed? (Y/[N]): ! |; ! ! my $answer = ; ! chomp $answer; unless ($answer =~/y/i) { ! print qq| ! ! Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. ! |; exit; } else { --- 22,30 ---- } ! #FIXME: need kohaversion number ! showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn'); unless ($answer =~/y/i) { ! showmessage(getmessage('AbortingInstall'),'PressEnter'); exit; } else { *************** *** 54,514 **** checkperlmodules(); ! ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $backupdir=$answer; ! } ! ! if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0770, $backupdir; ! ! # Backup MySql database # ! # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); ! ! my $itemcounter=0; ! my $bibliocounter=0; ! my $biblioitemcounter=0; ! my $membercounter=0; ! ! while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; ! } ! ! close BF; ! close MD; ! ! my $filels=`ls -hl $backupdir/Koha.backup_$date`; ! chomp $filels; ! printf qq| ! ! Backed up: ! ! %6d biblio entries ! %6d biblioitems entries ! %6d items entries ! %6d borrowers ! ! File Listing ! --------------------------------------------------------------------- ! $filels ! --------------------------------------------------------------------- ! ! Does this look right? ([Y]/N): ! |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; ! ! $answer = ; ! chomp $answer; ! ! if ($answer=~/^n/i) { ! print qq| ! ! Aborting. The database dump is located in: ! ! $backupdir/Koha.backup_$date ! ! |; ! exit; ! } else { ! print "Great! continuing upgrade... \n"; ! }; ! ! ! ! if ($::opacdir && $::intranetdir) { ! print qq| ! ! I believe that your old files are located in: ! ! OPAC: $::opacdir ! LIBRARIAN: $::intranetdir ! ! ! Does this look right? ([Y]/N): ! |; ! $answer = ; ! chomp $answer; ! ! if ($answer =~/n/i) { ! $::intranetdir=''; ! $::opacdir=''; ! } else { ! print "Great! continuing upgrade... \n"; ! } ! } ! ! ! if (!$::opacdir || !$::intranetdir) { ! $::intranetdir=''; ! $::opacdir=''; ! while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::intranetdir=$answer; ! } ! if (! -e "$::intranetdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::intranetdir=''; ! } ! } ! while (!$::opacdir) { ! print "Please specify the location of your OPAC files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::opacdir=$answer; ! } ! if (! -e "$::opacdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::opacdir=''; ! } ! } ! } ! ! ! ! print "\n\nBacking up old Koha scripts...\n"; ! print "===============================\n\n"; ! ! mkdir "$backupdir/kohafiles-$date", 0770; ! mkdir "$backupdir/kohafiles-$date/intranet", 0770; ! mkdir "$backupdir/kohafiles-$date/opac", 0770; ! ! my $result=system("cp -R $::intranetdir/* $backupdir/kohafiles-$date/intranet/"); ! if ($result) { ! print "Error encounted when copying $::intranetdir to $backupdir/kohafiles-$date/intranet/\n"; ! exit; ! } else { ! system("rm -rf $::intranetdir/*"); ! } ! $result=system("cp -R $::opacdir/* $backupdir/kohafiles-$date/opac/"); ! if ($result) { ! print "Error encounted when copying $::opacdir to $backupdir/kohafiles-$date/opac/\n"; ! exit; ! } else { ! system("rm -rf $::opacdir/*"); ! } ! ! print "Creating $::intranetdir/htdocs...\n"; ! mkdir ("$::intranetdir/htdocs", oct(750)); ! print "Creating $::intranetdir/cgi-bin...\n"; ! mkdir ("$::intranetdir/cgi-bin", oct(750)); ! print "Creating $::intranetdir/modules...\n"; ! mkdir ("$::intranetdir/modules", oct(750)); ! print "Creating $::intranetdir/scripts...\n"; ! mkdir ("$::intranetdir/scripts", oct(750)); ! chmod (oct(770), "$::opacdir"); ! print "Creating $::opacdir/htdocs...\n"; ! mkdir ("$::opacdir/htdocs", oct(750)); ! print "Creating $::opacdir/cgi-bin...\n"; ! mkdir ("$::opacdir/cgi-bin", oct(750)); ! ! my $httpduser; ! my $realhttpdconf; ! ! foreach my $httpdconf (qw(/usr/local/apache/conf/httpd.conf ! /usr/local/etc/apache/httpd.conf ! /usr/local/etc/apache/apache.conf ! /var/www/conf/httpd.conf ! /etc/apache/conf/httpd.conf ! /etc/apache/conf/apache.conf ! /etc/apache-ssl/conf/apache.conf ! /etc/httpd/conf/httpd.conf ! /etc/httpd/conf/commonhttpd.conf ! /etc/httpd/httpd.conf)) { ! if ( -f $httpdconf ) { ! $realhttpdconf=$httpdconf; ! open (HTTPDCONF, $httpdconf) or warn "Insufficient privileges to open $httpdconf for reading.\n"; ! while () { ! if (/^\s*User\s+"?([-\w]+)"?\s*$/) { ! $httpduser = $1; ! } ! } ! close(HTTPDCONF); ! } ! } ! ! unless ($httpduser) { ! print qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. ! |; ! print "What is your Apache user? "; ! chomp($input = ); ! ! if ($input) { ! $httpduser = $input; ! } else { ! $httpduser='Undetermined'; ! } ! } ! ! print "\n\nINSTALLING KOHA...\n"; ! print "\n\n==================\n"; ! print "Copying intranet-html files to $::intranetdir/htdocs...\n"; ! system("cp -R intranet-html/* $::intranetdir/htdocs/"); ! print "Copying intranet-cgi files to $::intranetdir/cgi-bin...\n"; ! system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/"); ! print "Copying script files to $::intranetdir/scripts...\n"; ! system("cp -R scripts/* $::intranetdir/scripts/"); ! print "Copying module files to $::intranetdir/modules...\n"; ! system("cp -R modules/* $::intranetdir/modules/"); ! print "Copying opac-html files to $::opacdir/htdocs...\n"; ! system("cp -R opac-html/* $::opacdir/htdocs/"); ! print "Copying opac-cgi files to $::opacdir/cgi-bin...\n"; ! system("cp -R opac-cgi/* $::opacdir/cgi-bin/"); ! system("touch $::opacdir/cgi-bin/opac"); ! ! system("chown -R root:$httpduser $::opacdir"); ! system("chown -R root:$httpduser $::intranetdir"); ! ! ! # Copy custom templates and reports back in ! ! opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! my @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::intranetdir/htdocs/$_"); ! print "Restoring custom intranet templates $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! } ! ! opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::opacdir/htdocs/$_"); ! print "Restoring custom opac template $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! } ! ! ! ! ! ! unless ($::kohalogdir && -e $::kohalogdir) { ! $::kohalogdir='/var/log/koha'; ! print "\n\nDirectory for logging by Z39.50 daemon [$::kohalogdir]: "; ! chomp($input = ); ! if ($input) { ! $::kohalogdir=$input; ! } ! } ! ! unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; ! if ($result==0) { ! my @dirs = split(m#/#, $::kohalogdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/processz3950queue"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $::intranetdir/scripts/z3950daemon/processz3950queue: $!"; ! ! ! ! my $kccontents='';open (KC, "/etc/koha.conf"); ! my $kc; ! while () { ! if (/^\s*includes\s*=/) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! $kc->{'includes'}=1; ! } elsif (/^\s*httpduser\s*=/) { ! $kccontents.="httpduser=$httpduser\n"; ! $kc->{'httpduser'}=1; ! } elsif (/^\s*kohaversion\s*=/) { ! $kccontents.="kohaversion=$::newversion\n"; ! $kc->{'kohaversion'}=1; ! } elsif (/^\s*kohalogdir\s*=/) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! $kc->{'kohalogdir'}=1; ! } elsif (/^\s*intranetdir\s*=/) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! $kc->{'intranetdir'}=1; ! } elsif (/^\s*opacdir\s*=/) { ! $kccontents.="opacdir=$::opacdir\n"; ! $kc->{'opacdir'}=1; ! } else { ! $kccontents.="$_"; ! } ! } ! ! unless (defined($kc->{'kohaversion'})) { ! $kccontents.="kohaversion=$::newversion\n"; ! } ! unless (defined($kc->{'includes'})) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! } ! unless (defined($kc->{'httpduser'})) { ! $kccontents.="httpduser=$httpduser\n"; ! } ! unless (defined($kc->{'intranetdir'})) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! } ! unless (defined($kc->{'opacdir'})) { ! $kccontents.="opacdir=$::opacdir\n"; ! } ! unless (defined($kc->{'kohalogdir'})) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! } ! ! ! system("mv /etc/koha.conf /etc/koha.conf.backup"); ! ! open (KC, ">/etc/koha.conf") || warn "Couldn't open /etc/koha.conf for writing."; ! print KC $kccontents; ! close KC; ! ! ! print qq| ! ! Upgrading Database ! ================== ! |; ! system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase"); ! ! ! print qq| ! ! ================== ! = Authentication = ! ================== ! ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the ! "Members" module to add passwords for other accounts and set their permissions. ! |; ! print "Press the key to continue: "; ! ; ! ! ! ! print qq| ! ! ========================== ! = Koha Upgrade Completed = ! ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha ! prior to 1.2.1, it is likely that you will have to modify your Apache ! configuration to point it to the new files. ! ! In your INTRANET VirtualHost section you should have: ! DocumentRoot $::intranetdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! In the OPAC VirtualHost section you should have: ! DocumentRoot $::opacdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! You may also need to uncomment a "LoadModules env_module ... " line and restart ! Apache. ! If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. ! To populate it : ! * launch Koha ! * Go to Parameters >> Marc structure option and Koha-MARC links option. ! * Modify default MARC structure to fit your needs. ! * open a console ! * type: ! cd /path/to/koha/misc ! export PERL5LIB=/path/to/koha ! ./koha2marc.pl ! the old DB is "copied" in the new MARC one. ! Koha 2.0.0 is ready :-) ! ! Please report any problems you encounter through http://bugs.koha.org/ ! |; my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); --- 33,69 ---- checkperlmodules(); ! backupkoha(); ! getapacheinfo(); ! installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} ! updatedatabase(); ! finalizeconfigfile(); + showmessage(getmessage('UpgradeCompleted'),'PressEnter'); my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); From kb2qzv at users.sourceforge.net Sun Oct 26 23:54:56 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 14:54:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.3,1.4 opac-detail.tmpl,1.3,1.4 opac-moredetail.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26051 Modified Files: opac-reserve.tmpl opac-detail.tmpl opac-moredetail.tmpl Log Message: translation improvements, typos corrected. Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 24,28 ****

      Strona rezerwacji dla pozycji: ( )

      Złożono już zamówień na tę pozycję.

      !

      Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji,która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana.

      --- 24,28 ----

      Strona rezerwacji dla pozycji: ( )

      Złożono już zamówień na tę pozycję.

      !

      Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji, która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 1,5 **** !

      Zalogowany jako: [Strony Członkowskie][Wyloguj się]

      --- 1,5 ---- !

      Zalogowany jako: [Strony Członkowskie][Wyloguj się]

      *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! OPIS BIBLIO ! ! !
      ! ! Podtytuł:
      ! Autor:
      ! Przedmiot:
      ! Copyright:
      ! Całkowita liczba pozycji: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDostępna

      --- 16,80 ---- ! ! ! ! ! ! !
      ! OPIS BIBLIO ! !
      ! ! Podtytuł: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez : ! w ! , ! ,
      ! Collection:
      ! Hasło przedmiotowe:
      ! Rok :
      ! Uwagi:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! całkowita liczba pozycji: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDostępna

      Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 78,85 **** Ostatnio zdano:
      Ostatnio pożyczono:
      ! on issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Current Branch:
      Cena wymiany:
      Pozycja zagubiona:
      --- 78,85 ---- Ostatnio zdano:
      Ostatnio pożyczono:
      ! issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Bież±cy oddział:
      Cena wymiany:
      Pozycja zagubiona:
      From kb2qzv at users.sourceforge.net Mon Oct 27 00:39:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 15:39:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1631 Added Files: branchtransfers.tmpl Log Message: first round translation --- NEW FILE ---
      Następny Czytelnik Zwroty

      Wypożyczalnia: Transfery


      Oddział:   Drukarka:
      Zmień ustawienia > >

      /images/background-mem.gif">Wykryto rezerwację
      Zarezerwowano: wykryto rezerwację dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). Pozycja oznaczona czeka:
      Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
      Ustaw rezerwację jako czekaj±c± i transferuj ksi±żke do : Unieważnij rezerwację, następnie spróbuj transferować: value=> value=> value=> > > >
      Unieważnij rezerwację, następnie spróbuj transferować:
      value=> value=> value=> > > > >
      Ignoruj i powróć do transferów:
      > value=> value=> value=>
      /images/background-mem.gif">Wiadomo¶ci
      Rezerwacja unieważniona
       Pozycja powinna teraz czekać w oddziale:
      Brak pozycji o kodzie kreskowym: Proszę zwrócic pozycję do rodzimego oddziału: Pozycja już jest w docelowym oddziale. Pozycję wypożyczył/a " onClick="openWindow(this,'Member', 480, 640); return false;"> i została zwrócona.
      /images/holder.gif" width=24 height=24>

      /images/background-mem.gif"> Wybierz oddział
      Oddział docelowy:
      /images/holder.gif" width=24 height=50 align=left>
      /images/background-mem.gif"> WprowadĽ kod kreskowy ksi±żki
      Kod kreskowy pozycji:
      > value=> value=> value=>

      /images/background-mem.gif">Pozycje transferowane
      Kod kreskowyTytułAutorTypOdDo
      align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center> align=center> align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:10:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:10:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ circulation.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv7322 Added Files: circulation.tmpl Log Message: first round translation --- NEW FILE ---
      &branch=&printer=&print=yes> Następny czytelnik  Zwroty  Transfery

      Wypożyczalnia: wypożyczenia


      Oddział:
      Drukarka:
      Zmień ustawienia > >

      Zwroty   Transfery

      Wypożyczalnia: wypożyczenia


      Oddział:
      Drukarka:
      Zmień ustawienia > >

      /images/background-mem.gif"> Issuing Question
      Próba wypożyczenia autorstwa dla .

      > > > > > > > > > " value="">
      > > > > > > > > > " value="">
      Bł±d przy wypożyczeniu
      /images/background-mem.gif">Wiadomo¶ć

      > >
      /images/background-mem.gif"> Wybierz czytelnika

      /images/background-mem.gif"> WprowadĽ numer karty czytelnika
      lub fragment nazwiska
      > >
      /images/background-mem.gif"> WprowadĽ kod kreskowy ksi±żki
      Kod kreskowy pozycji:
      > Sticky Due Date
      > > > >
      Dane czytelnika
      " onClick="openWindow(this,'Member', 480, 640)">
      Kategoria:
      OBCIˇŻENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      OBCIˇŻENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CZEKA &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      Zaległo¶ciTak, patrz niżej
      UWAGI



      /images/background-mem.gif"> Wypożyczenia dzi¶
      Termin zwrotuKod kreskowyTytułAutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      /images/background-mem.gif"> Poprzednie wypożyczenia
      Termin zwrotuKod kreskowyTytułAutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:41:21 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:41:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ returns.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv12425 Added Files: returns.tmpl Log Message: first round translation --- NEW FILE ---
      Wypożyczenia  Transfery

      Cyrkulacja: Zwroty


      Oddział:   Drukarka:
      Zmień ustawienia > >

      ! !
      /images/background-mem.gif">Wykryto rezerwację
      Pozycja oznakowana Czeka:
      Pozycja ()
      jest oznaczona oczekuje w dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Pozycja oznakowana Czeka:
      Pozycja: ()
      ma być transferowana do
      do odebrania przez (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Wykryto rezerwację: Pozycja: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) do odebrania w .
      Zmień status na oczekuj±ca i drukujwykaz?:
      value=> value=> value=> > > > POZYCJA ZAREZERWOWANA: () Kod kreskowy: itemtype: ODBIÓR W: CZYTELNIK: Numer karty: Tel.: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ">
      /images/background-mem.gif"> WprowadĽ kod kreskowy
      Kod kreskowy pozycji:
      value=> value=> value=>
      /images/background-mem.gif">Messages
      Brak pozycji z kodem: Proszę wróć do Nie w obiegu. Pozycja zagubiona, nie odnaleziona. pozycja unieważniona
      /images/background-mem.gif"> Dane zwróconej pozycji
      Tytuł:
      /images/background-mem.gif"> Dane czytelnika
      " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ,
      /images/background-mem.gif" colspan=2> Flagi
      >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Płatno¶ć
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      >
      /images/background-mem.gif"> Zwrócona pozycja
      Termin zwrotuKod kreskowyTytułAutorTypCzytelnik
      > // Nie w obiegu. > align=center> &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> > > align=center> > " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;">
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:49:14 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:49:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv13308 Added Files: selectbranchprinter.tmpl Log Message: first round translation --- NEW FILE ---

      Cyrkulacja: Ustawienia wyboru drukarki i oddziału


      align=center background=> Proszę wybrać drukarkę i oddział
      Oddział:
      		Drukarka:
      From kb2qzv at users.sourceforge.net Mon Oct 27 02:13:39 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 17:13:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv16738 Added Files: breeding.tmpl Log Message: first round translation --- NEW FILE ---

      System akwizycji MARC

      Importuj do hurtowni opisów

      Import wyniki :

        rekordy importowano

        nie importowano ponieważ już s± w bazie

        nie importowano ponieważ już s± w hurtowni

        nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

        rekordów przeczytanych

        Powrót

      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w farmie.
      • Je¶li ISBN już w farmie istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
      " enctype="multipart/form-data">
      Wybierz plik do importu :
      Nazwa tego importu :
      Character encoding (USMARC or UNIMARC)
      Je¶li ISBN już jest w hurtowni: Ignoruj ten, zatrzymaj istniej±cy
      Nadpisz istniej±cy obecnym
       
      From kb2qzv at users.sourceforge.net Mon Oct 27 15:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:34:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes members-bottom.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3725 Modified Files: members-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: members-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- members-bottom.inc 27 Oct 2003 14:34:15 -0000 1.2 *************** *** 5,22 **** ! !
      ! ! Pocz±tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc !
      --- 5,21 ---- !
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc !
      From kb2qzv at users.sourceforge.net Mon Oct 27 16:07:27 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:07:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue MARCdetail.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv10294 Modified Files: MARCdetail.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/MARCdetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MARCdetail.tmpl 9 Feb 2003 09:47:22 -0000 1.2 --- MARCdetail.tmpl 27 Oct 2003 15:07:25 -0000 1.3 *************** *** 1,11 **** - ! ! ! ! +
      Opis MARC:
      --- 1,28 ---- ! ! !
      + + +
      + + /images/background-mem.gif"> + + +
      + + + + + + +
      ">//images/fileopen.png">">NormalOpis MARC :
      +
      *************** *** 20,40 **** !
      8
      9
      Pozycja
      !
      ! ! ! --- 37,67 ---- !
       
      8
      9
      Pozycja
      +       		+ + + class="button">Zamów + +
      !
      ! /images/background-mem.gif"> ! ! + *************** *** 43,56 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 70,84 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 59,72 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 87,101 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 75,88 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 104,118 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 91,104 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 121,135 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 107,120 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 138,152 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 123,136 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 155,169 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 139,152 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 172,186 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 155,168 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 189,203 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 171,184 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 206,220 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 187,193 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! --- 223,229 ---- !
      ! /images/background-mem.gif"> *************** *** 209,213 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 245,249 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 220,222 **** - --- 256,257 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 15:57:16 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/export marc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export In directory sc8-pr-cvs1:/tmp/cvs-serv8118 Modified Files: marc.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: marc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export/marc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marc.tmpl 9 Jan 2003 11:39:26 -0000 1.1 --- marc.tmpl 27 Oct 2003 14:57:13 -0000 1.2 *************** *** 1,12 **** ! ! ! !

      Zalogowano jako: [Wyloguj]

      ! !

      Zaloguj się do Koha

      !
      ! Administracja systemu Koha


      ! Eksportuj następuj±ce opisy w formacie MARC:

      od opisu numer : --- 1,7 ---- ! !

      !

      Eksportowanie opisu MARC




      ! Eksportuj następuj±ce opisy w formacie MARC :

      od opisu numer : From kb2qzv at users.sourceforge.net Mon Oct 27 16:41:30 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:41:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detail.tmpl,1.2,1.3 searchresults.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv16926 Modified Files: detail.tmpl searchresults.tmpl subject.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 --- detail.tmpl 27 Oct 2003 15:41:27 -0000 1.3 *************** *** 23,50 ****

      ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      ! !
      ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło:
      ! Copyright:
      ! Uwagi:
      ! Tytuł ujednol.:
      ! Seria:
      ! Całkowita liczba pozycji:

      --- 23,44 ----

      !
      " class="button">MARC

      ! Podtytuł: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez: ! w ! , ! ,
      ! Kolekcja:
      ! Hasło przedm:
      ! Rok:
      ! Uwagi:
      ! Ujednolicony:
      ! Serial:
      ! Dewey:
      ! URL:
      ! W sumie pozycji:

      Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchresults.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 6,69 ****

      - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       - ! Szukano ! Nie podałe¶ żadnego kryterium wyszukiwania
       znalezionych trafień

      ! ! ! ! ! &&type=opacintra> ! ! ! ! ! -highlight.gif> ! &&type=opacintra>.gif border=0> ! ! ! ! &&type=opacintra> ! ! !

      ! ! ! - ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! --- 6,52 ----
      ! Szukałe¶ ! Nie podałe¶ kryteriów wyszukiwania
       znalezionych trafień

      ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! /images/numbers/-highlight.gif> ! &=&type=opacintra>/images/numbers/.gif border=0> + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

      !

      TytułAutor©Ilo¶ć pozycjiLokalizacja  
      ?type=opacintra&bib=> &type=opacintra>
      ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! *************** *** 72,109 **** ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
      TytułAutor©Ilo¶ćLokalizacja  
      ?type=opacintra&bib=> &type=opacintra> >Rezerwacja
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
      ! &&type=opacintra>Previous Records   ! ! &&type=opacintra>Next Records   !
      !
      ! !
      ! Trafienia od do z rekordów. !

      ! Spróbuj nowej kwerendy ! Spróbuj nowej kwerendy --- 55,95 ---- !
      		>Request
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! &=&type=opacintra>Previous Records   ! ! &=&type=opacintra>Next Records   !
      !
      ! !
      ! Wyniki do z trafień. !
      ! Jeszcze jedno wyszukiwanie ! Jeszcze jedno wyszukiwanie Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- subject.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 6,15 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       -
      --- 5,8 ---- *************** *** 40,43 **** ! ! \ No newline at end of file --- 33,35 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:29 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport AcceptBiblioitem.tmpl,1.1,1.2 AcceptMarcUpload.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29351 Modified Files: AcceptBiblioitem.tmpl AcceptMarcUpload.tmpl Log Message: small corrections Index: AcceptBiblioitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptBiblioitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptBiblioitem.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptBiblioitem.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -
      --- 1,2 ---- Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptMarcUpload.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptMarcUpload.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -

      >Menu główne

      --- 1,2 ---- *************** *** 41,43 **** - \ No newline at end of file --- 40,41 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport ListFileRecords.tmpl,1.1,1.2 uploadmarc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29274 Modified Files: ListFileRecords.tmpl uploadmarc.tmpl Log Message: small corrections Index: ListFileRecords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/ListFileRecords.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ListFileRecords.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- ListFileRecords.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 28,32 **** > " ! [Przęgl±danie do z rekordów] |
      --- 28,32 ---- > " ! [Przęgl±danie od do z rekordów] |
      Index: uploadmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/uploadmarc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** uploadmarc.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- uploadmarc.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 1,3 **** -

      >Menu główne

      --- 1,2 ---- From slef at users.sourceforge.net Mon Oct 27 18:13:09 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:13:09 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.58,1.59 koha.upgrade,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv5026 Modified Files: Install.pm koha.upgrade Log Message: Old files warning and MARC upgrade fix Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** Install.pm 26 Oct 2003 13:21:19 -0000 1.58 --- Install.pm 27 Oct 2003 17:13:06 -0000 1.59 *************** *** 78,82 **** ); ! use vars qw( $kohaversion ); # set in installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl --- 78,82 ---- ); ! use vars qw( $kohaversion $newversion ); # set in loadconfigfile and installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl *************** *** 91,96 **** use vars qw( $dbname $hostname $user $pass ); # virtual hosting - use vars qw( $newversion ); # XXX this seems to be unused - =item heading --- 91,94 ---- *************** *** 381,385 **** sub setkohaversion ($) { ! ($kohaversion) = @_; } --- 379,383 ---- sub setkohaversion ($) { ! ($newversion) = @_; } *************** *** 1472,1475 **** --- 1470,1483 ---- |; + $messages->{'OldFiles'}->{en} = heading('OLD FILES') . qq| + Any files from the previous edition of Koha have been + copied to a dated backup directory alongside the new + installation. You should move any custom files that you + want to keep (such as your site templates) into the new + directories and then move the backup off of the live + server. + + Press ENTER to continue:|; + $messages->{'CopyingFiles'}->{en}="Copying %s to %s.\n"; *************** *** 1527,1531 **** opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$kohaversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl --- 1535,1539 ---- opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$newversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl *************** *** 1552,1555 **** --- 1560,1565 ---- chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $intranetdir/scripts/z3950daemon/processz3950queue: $!"; } #MJR: FIXME: Should report that we haven't chown()d. + + showmessage(getmessage('OldFiles'),'PressEnter'); } *************** *** 1730,1745 **** } ! #FIXME: do not ask if we are upgrading from a MARC-ready system ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); } - delete($ENV{"KOHA_CONF"}); print RESET."\n\nFinished updating of database. Press to continue..."; --- 1740,1756 ---- } ! if ($kohaversion =~ /^1\.[012]\./) { ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! delete($ENV{"KOHA_CONF"}); } print RESET."\n\nFinished updating of database. Press to continue..."; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 --- koha.upgrade 27 Oct 2003 17:13:06 -0000 1.10 *************** *** 32,65 **** }; checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} ! # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} updatedatabase(); finalizeconfigfile(); --- 32,41 ---- }; + setkohaversion($::newversion); checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! # custom templates warning added to installfiles(); updatedatabase(); finalizeconfigfile(); From slef at users.sourceforge.net Mon Oct 27 18:36:19 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:36:19 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv8869/misc Modified Files: Install.pm Log Message: Added getmysqldir function Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** Install.pm 27 Oct 2003 17:13:06 -0000 1.59 --- Install.pm 27 Oct 2003 17:36:17 -0000 1.60 *************** *** 959,963 **** --- 959,994 ---- } + =item getmysqldir + getmysqldir; + + Get the MySQL database server installation directory, automatically if possible. + + =cut + + $messages->{'WhereIsMySQL'}->{en} = heading('MYSQL LOCATION').qq| + Koha can't find MySQL. If you compiled mysql yourself, + please give the value of --prefix when you ran configure. + The file mysqladmin should be in bin/mysqladmin under the directory that you give here. + + MySQL installation directory: |; + + sub getmysqldir { + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + for (;;) { + $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); + last if -f "$mysqldir/bin/mysqladmin"; + } + } + return($mysqldir); + } =item getdatabaseinfo *************** *** 1628,1658 **** $mysqluser = 'root'; $mysqlpass = ''; - foreach my $mysql (qw(/usr/local/mysql - /opt/mysql - /usr - )) { - if ( -d $mysql && -f "$mysql/bin/mysqladmin") { - $mysqldir=$mysql; - } - } - if (!$mysqldir){ - print "I don't see mysql in the usual places.\n"; - for (;;) { - print "Where have you installed mysql? "; - chomp($mysqldir = ); - last if -f "$mysqldir/bin/mysqladmin"; - print <{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! Apache needs to be restarted to load the new configuration for Koha. ! This requires the root password. Would you like to try to restart Apache now? [Y]/N: |; --- 1835,1843 ---- wants so. =cut $messages->{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! The web server daemon needs to be restarted to load the new configuration for Koha. ! The installer can do this if you are using Apache and give the root password. Would you like to try to restart Apache now? [Y]/N: |; *************** *** 1845,1850 **** my $response=showmessage(getmessage('RestartApache'), 'yn', 'y'); - - unless ($response=~/^n/i) { startsysout(); --- 1847,1850 ---- *************** *** 1869,1883 **** =cut #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! if ($answer) { ! $backupdir=$answer; ! } if (! -e $backupdir) { --- 1869,1897 ---- =cut + $messages->{'BackupDir'}->{en} = heading('BACKUP STORAGE').qq| + The upgrader will now try to backup your old files. + + Please specify a directory to store the backup in [%s]: |; + + $messages->{'BackupSummary'}->{en} = heading('BACKUP SUMMARY').qq| + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + %s + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): |; + #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=$ENV{'prefix'}.'/backups'; ! $answer = showmessage(getmessage('BackupDir',[$backupdir]),'free',$backupdir); if (! -e $backupdir) { *************** *** 1900,1934 **** # # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <; ! chomp $answer; if ($answer=~/^n/i) { --- 1943,1947 ---- my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; ! $answer = showmessage(getmessage('BackupSummary',[$bibliocounter, $biblioitemcounter, $itemcounter, $membercounter, $filels]),'yn'); if ($answer=~/^n/i) { From slef at users.sourceforge.net Mon Oct 27 18:39:43 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:39:43 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv9359/misc Modified Files: Install.pm Log Message: Timed backups in installfiles Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** Install.pm 27 Oct 2003 17:36:17 -0000 1.60 --- Install.pm 27 Oct 2003 17:39:41 -0000 1.61 *************** *** 1519,1523 **** #MJR: preserve old files, just in case - #FIXME: use dated backups sub neatcopy { my $desc = shift; --- 1519,1522 ---- *************** *** 1525,1531 **** my $tgt = shift; ! if (-d $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.".old"]); ! startsysout; system("mv ".$tgt." ".$tgt.".old"); } --- 1524,1530 ---- my $tgt = shift; ! if (-e $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]); ! startsysout(); system("mv ".$tgt." ".$tgt.".old"); } From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:52 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30638 Modified Files: member.tmpl Log Message: small corrections Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/member.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** member.tmpl 25 Jan 2003 19:23:37 -0000 1.2 --- member.tmpl 27 Oct 2003 21:59:50 -0000 1.3 *************** *** 13,28 **** ! ! ! ! ! ! ! ! ! --- 13,28 ----
      KartaNazwiskoImięKategoriaAdresZaległe pozycjeOpłatyUwagi
      ! ! ! ! ! ! ! ! ! *************** *** 42,52 ****
      !
      ! Osoba Organizacja - - - - --- 42,48 ----
      ! ! Dorosły Organizacja From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members imemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30534 Modified Files: imemberentry.tmpl Log Message: small corrections Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/imemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** imemberentry.tmpl 9 Jan 2003 13:31:31 -0000 1.1 --- imemberentry.tmpl 27 Oct 2003 21:59:15 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !
      ! Dodaj now± instytucję
      --- 1,10 ---- !
      ! !

      Edytuj instytucję


      ! !

      Dodaj now± instytucję


      !       *************** *** 28,34 ****
      ! --- 22,28 ---- ! *************** *** 36,91 **** ! ! ! - ! - ! ! ! ! - ! ! ! - ! --- 30,70 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,123 **** - - - - - ! ! ! ! ! - ! --- 72,100 ---- ! + ! + + + + + ! ! *************** *** 125,133 **** ! ! --- 102,113 ---- ! + + + ! *************** *** 135,144 **** - - - - --- 115,120 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 23:00:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 14:00:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members memberentry.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30746 Modified Files: memberentry.tmpl Log Message: small corrections Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/memberentry.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** memberentry.tmpl 25 Jan 2003 19:31:09 -0000 1.2 --- memberentry.tmpl 27 Oct 2003 22:00:19 -0000 1.3 *************** *** 1,7 **** ! ! ! !
      --- 1,5 ---- ! !


      *************** *** 15,28 ****       ! ! ! ! --- 13,26 ---- ! ! ! ! *************** *** 30,39 **** ! --- 28,47 ---- ! ! ! ! ! ! ! ! *************** *** 44,59 **** ! ! ! ! ! - - - + ! ! ! ! ! ! ! *************** *** 70,146 **** - - - - - - - - - - - ! ! ! - - - - - - - ! ! - ! ! - ! - ! ! ! ! - ! --- 80,159 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + + + + + + + ! ! ! ! ! + + + + + *************** *** 155,183 **** ! ! ! ! ! ! ! ! ! - ! ! - - --- 168,185 ---- ! ! ! *************** *** 185,190 **** ! --- 187,192 ---- ! *************** *** 192,201 **** ! ! ! ! !
      /images/background-mem.gif">Karta/images/background-mem.gif">Nazwisko/images/background-mem.gif">Imię/images/background-mem.gif">Kategoria/images/background-mem.gif">Adres/images/background-mem.gif">Zaległe pozycje/images/background-mem.gif">Opłaty/images/background-mem.gif">Uwagi
      ! Czytelnik# , Numer Karty*
      ! Czytelnik# , Numer karty* >
      ! SZCZEGÓŁY INSTYTUCJI
      Nazwa instytucji
       
      ! Adres Instytucji
      ! !
      Adres pocztowy*Miasto*Rejon
       
      Dane kontaktowe
      /images/background-mem.gif"> ! DANE INSTYTUCJI /images/background-mem.gif">
      Nazwa instytucji
      ">
       
      /images/background-mem.gif"> ! ADRES INSTYTUCJI
      Adres pocztowy*Kod / Miasto*Area
      ">">
      ">      		 ! !
       
      /images/background-mem.gif"> Dane kontaktowe
      Nazwisko osoby kontaktowej*
      Tel. (w dzień) Fax Email
       
      Uwagi
      Nazwisko osoby kontaktowej*
      ">
      Tel. (dzienny) Fax Email
      ">">">
       
      Uwagi
      Na użytek biblioteki
      /images/background-mem.gif">DO UŻYTKU BIBLIOTEKI
      Uwagi
      Uwagi
      !
      !
      Czytelnik# , Numer Karty*
      DANE PERSONALNE CZYTELNIKA* ! zaznaczono>F ! zaznaczono> !     Data ur. (dd/mm/rr)
      Czytelnik# , Numer karty*
      /images/background-mem.gif">DANE OSOBOWE CZYTELNIKA/images/background-mem.gif">* ! checked>F ! checked> M !     Data urodzenia ()
      !
      tytułInicjałyImiona*Nazwisko*Preferowane imię
      !
      TytułInicjałyImiona*Nazwisko*Preferowane imię
       
      Etniczno¶ćUwagi etniczne  Kategoria członkowstwa*
      + +
      Etniczno¶ćUwagi dot. etniczno¶ci  Kategoria członkowstwa*
       
      Adres czetylnika
      !
      Adres pocztowy*Miasto*Kod
       
      Ulica, je¶li innaMiasto
       
      DANE KONTAKTOWE CZYTELNIKA
      Tel. (dom)Tel. (praca)FaxEmail
       
      Alternatywne dane kontaktowe
      /images/background-mem.gif">ADRES CZYTELNIKA
      Pocztowy adres*Kod / Miasto*Oddział zapisu
      ! ">
      ! !       		!
      Adres zamieszkania je¶li innyKod / Miasto
      ! ">
      !
      /images/background-mem.gif">DANE KONTAKTOWE CZYTELNIKA
      Phone (Home)FaxEmailText Messaging
      Phone (Daytime)
      /images/background-mem.gif">ALTERNATE CONTACT DETAILS
      Name*PhoneRelationship*
      Nazwisko*Tel.Pokrewieństwo*
       
      Uwagi
       
      NA UŻYTEK BIBLIOTEKI
      Uwagi
       
      FLAGS
      Notes
      /images/background-mem.gif">LIBRARY USE
      Notes
      FLAGS
      >Tak ! >Nie
      >Yes ! >No
      --- 194,204 ----       +
      ! > ! //images/2rightarrow.png" ALT="Add New Member" border=0 > !
      *************** *** 203,207 **** - - - --- 206,207 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:35 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members jmemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30583 Modified Files: jmemberentry.tmpl Log Message: small corrections Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/jmemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** jmemberentry.tmpl 9 Jan 2003 13:29:25 -0000 1.1 --- jmemberentry.tmpl 27 Oct 2003 21:59:33 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !

      ! ! Dodaj nowego młodocianego czytelnika
      - ! ! ! ! !
      ! ! ! !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,128 ---- ! ! ! ! WELCOME TO THE KOHA INTRANET ! ! ! ! ! ! !
      !
      ! Koha: Horowhenua Library Trust      		 ! !
      ! Type in the box and press the enter key.
      ! ! ! -Advanced Search (More Options)
       !
      ! !
      ! !
      ! Type in the box and press the enter key.
      !

      !
      ! ! !
      /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 151,186 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 130,158 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 189,193 ****
      /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
      /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Catalogue Search" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
      ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">      		   ! !
      ! Type in the box and press the enter key.
      ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
       ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
        ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Member Search" name="member" hspace="0" vspace="0" border="0">
        
      ! !
      ! Type in the box and press the enter key.
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
           /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

      !

      !
           /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts and Reports" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
          /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parameters" border="0">
      + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
      - --- 161,164 ---- From rangi at users.sourceforge.net Fri Oct 31 22:02:18 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Fri, 31 Oct 2003 13:02:18 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1758/circ Modified Files: circulation.pl Log Message: Fix for bug 592 Re-issuing book does not renew correctly Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 --- circulation.pl 31 Oct 2003 21:02:16 -0000 1.63 *************** *** 314,318 **** todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray ); --- 314,322 ---- todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray, ! month=>$month, ! day=>$day, ! year=>$year ! ); From kb2qzv at users.sourceforge.net Mon Oct 27 15:33:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:33:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 common-style.css,NONE,1.1 parameters-bottom.inc,NONE,1.1 acquisitions-bottom.inc,1.1,1.2 acquisitions-top.inc,1.2,1.3 cat-bottom.inc,1.1,1.2 cat-top.inc,1.2,1.3 circulation-bottom.inc,1.1,1.2 circulation-top.inc,1.2,1.3 issues-bottom.inc,1.1,1.2 members-top.inc,1.2,1.3 parameters-top.inc,1.1,1.2 reports-bottom.inc,1.1,1.2 reports-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3589 Modified Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc members-top.inc parameters-top.inc reports-bottom.inc reports-top.inc Added Files: about-bottom.inc about-top.inc common-style.css parameters-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . --- NEW FILE ---

       

      Pocz±tek || Katalog || Członkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      --- NEW FILE --- KOHA: INTRANET: Parametry /includes/common-style.css">

      Zalogowany jako: [Log Out]

      Zaloguj się do Koha

       --- NEW FILE --- .button { text-align: center; font: 1.2em sans-serif; padding: 10px 15px; border-style: solid; border-width: 2px; border-color: black; text-decoration: none; color: black; border-radius: 6px; -moz-border-radius: 6px; background-color:#FFFFFF; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } #problem { color: red; font-weight:bold; } #menubar { border-top:1px solid #666666; font: 1.2em sans-serif; background-color:#DDDDDD; } #submenu { font: 0.5em sans-serif; background-color:#EEEEEE; border-left:1px solid #000000; } a.submenu { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#EEEEEE; padding:4px; font-weight: bold; margin:0; } a.submenu2 { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#CCCCCC; padding:4px; font-weight: bold; margin:0; } .koha { text-align:center; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.home:hover { background-color: #339933; color: #000000; text-decoration: none; font-weight: normal; font-weight: bold; } a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; margin:0; } a.catalogue:hover { font-weight: normal; text-decoration: none; cursor: hand; background-color:#ad11ad; color:#FFFFFF; font-weight: bold; } a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.members:hover { background-color: #86c268; color: #000000; text-decoration: none; font-weight: bold; } a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.acquisition:hover { background-color: #ffdf61; color: #000000; text-decoration: normal; font-weight: bold; } a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.reports:hover { background-color: #6b7cbe; color: #000000; text-decoration: normal; font-weight: bold; } a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.circulation:hover { background-color: #be6170; color: #000000; text-decoration: normal; font-weight: bold; } a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.parameters:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.about:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } --- NEW FILE ---

       

      Pocz±tek || Katalog || Członkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- acquisitions-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,22 **** - -

       

      - ! !
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || ! Akwizycja || ! Reporty || ! Admin || ! Pomoc
      --- 1,19 ----

       

      !
      Pocz±tek || ! Katalog || ! Członkowie || ! Akwizycje || ! Cyrkulacja || ! Reporty || ! Parametry || ! About || ! Pomoc
      *************** *** 24,26 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** acquisitions-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- acquisitions-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,150 **** - - - - KOHA: INTRANET: Akwizycje ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,76 ---- KOHA: INTRANET: Akwizycje ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- cat-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cat-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- cat-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,120 **** ! ! ! ! ! KOHA: INTRANET: Katalog ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! ! !
      !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! Circulation ! ! Home ! ! ! ! ! !
      --- 1,108 ---- ! ! ! KOHA: INTRANET: Katalog ! ! ! ! /includes/common-style.css"> ! ! ! ! ! ! ! ! ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! !
      opcje >>   ! Szybkie wyszukiwanie ! ! szukaj MARC ! ! Dodaj opis ! ! Zarz±dzaj kat. !
      !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj się]

      ! !

      Zaloguj się do Koha

      !       Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- circulation-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 2,20 ****

       

      -
      ! !
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 2,19 ----

       

      !
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz±tek
      Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** circulation-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- circulation-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,131 **** - - - - - ! KOHA: INTRANET: Wypożyczalnia ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! ! Circulation ! ! ! Home ! ! ! ! ! !
      --- 1,104 ---- ! KOHA: INTRANET: Cyrkulacja ! + /includes/common-style.css"> + ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      opcje >>   ! "Wypożyczenia ! ! Zwroty ! ! Transfery biblioteczne !
      ! !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj się]

      ! !

      Zaloguj się do Koha

      !       Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/issues-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- issues-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,21 ****
      - -
      - -
      Pocz±tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz±tek
      Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- members-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,107 **** - - - - - ! KOHA: INTRANET: Czytelnicy ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,91 ---- ! KOHA: INTRANET: Członkowie ! /includes/common-style.css"> ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      options >>   ! Strona domowa ! ! Nowy członek ! ! Nowa oraganizacja !
      !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/parameters-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** parameters-top.inc 3 Feb 2003 02:16:00 -0000 1.1 --- parameters-top.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,120 **** - - ! KOHA: INTRANET: Parameters ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - - -
      ! ! ! ! !

      ! KOHA: Main Menu
      !
      		! ! ! !
      !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - - - -
      --- 1,97 ---- ! KOHA: INTRANET: Parametry ! /includes/common-style.css"> ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! ! !
      options >>   ! Fundusze ! ! Auth value ! ! Tesaurus ! ! Waluty ! ! Drukarki !
      !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- reports-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** reports-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- reports-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,105 **** ! ! ! ! KOHA: INTRANET: Reporty ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Katalog - - Czytelnicy - - Akwizycje - - Reporty - - Wypożyczalnia - - Pocz±tek - - - -
      --- 1,76 ---- ! KOHA: INTRANET: Reporty ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       From kb2qzv at users.sourceforge.net Wed Oct 1 14:47:01 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 05:47:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.1,1.2 opac-account.tmpl,1.1,1.2 opac-auth.tmpl,1.3,1.4 opac-detail.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 opac-moredetail.tmpl,1.2,1.3 opac-reserve.tmpl,1.1,1.2 opac-search.tmpl,1.2,1.3 opac-searchresults.tmpl,1.1,1.2 opac-user.tmpl,1.2,1.3 opac-userupdate.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1984 Modified Files: kohaerror.tmpl opac-account.tmpl opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-search.tmpl opac-searchresults.tmpl opac-user.tmpl opac-userupdate.tmpl subject.tmpl Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** kohaerror.tmpl 28 Sep 2003 08:31:24 -0000 1.1 --- kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 6,10 ****
      !
      Wystąpił błąd
      --- 6,10 ----
      !
      Wyst±pił bł±d
      Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-account.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** Konto dla ! [Pocz±tek][Wyloguj]

      --- 3,7 ---- Konto dla ! [ Pocz±tek][Wyloguj]

      *************** *** 37,39 **** ! --- 37,39 ---- ! \ No newline at end of file Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-auth.tmpl 29 Jan 2003 23:42:30 -0000 1.3 --- opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 *************** *** 1,22 **** - - !

      Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

      !

      Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

      !

      Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

      !

      Wprowadziłeś niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

      --- 1,20 ---- !

      Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

      !

      Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

      !

      Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

      !

      Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

      *************** *** 31,50 ****
      - ! !
      Koha - Wstęp
      NumerKarty:
      Hasło:
      		 - -
      - - --- 29,45 ---- +
      ! !
      Koha - Wstęp
      NumerKarty:
      Hasło:
      + Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-detail.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 2,6 **** !

      Zalogowany jako: [Strony Członkowskie][Log Out]

      Zaloguj się do Koha

      --- 2,6 ---- !

      Zalogowany jako: [Strony Członkowskie][Wyloguj się]

      Zaloguj się do Koha

      Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 134,135 **** --- 134,138 ----

      + ±ż¶Ľęćńół + ˇŻ¦¬ĘĆŃÓŁ + Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-moredetail.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,5 **** - -
      --- 1,3 ---- *************** *** 13,24 **** ! ! ! &type=intra> ()

      ! ! --- 11,23 ---- ! ! &type=intra> ()

      ! > ! >

      *************** *** 67,73 ****
      ! ! ! --- 66,72 ---- ! > ! > ! > *************** *** 112,115 **** - - --- 111,112 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-reserve.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,8 ****
      ! !

      Zalogowano jako: [Strony członkowskie][Wyloguj]

      Zaloguj się do Koha

      --- 3,8 ----
      ! !

      Zalogowano jako: [Strony członkowskie][Wyloguj się]

      Zaloguj się do Koha

      *************** *** 10,130 **** ! ! !
      ! Przepraszamy, nie wolno ci złożyć zamówienia ponieważ zalegasz na . ! Przepraszamy, nie możesz złożyć więcej jak rezerwacji. ! Złożyłe¶/a¶ juz zamówienie na tę pozycję. ! Musisz wybrać przynajmniej jeden typ pozycji! !

      - - ! ! !

      ! Strona rezerwacji dla pozycji: ( ) !

      !

      Złożono już zamówień na tę pozycję.

      !

      ! Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji, ! która stanie się dostępna a należy do jednego z tych typów ! zostanie dla Ciebie zatrzymana. !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      ZamówienieTyp PozycjiEgzemplarze
      Rezerwacja nie możliwa
      !

      ! Prosimy wybrać oddział, z którego chcesz odebrać pozycję: !
      ! !

      ! ! ! !
      Rezerwacja tego dnia:: ! ! ! ! ! ! ! !
      Koniec rezerwacji tego dnia: ! ! ! ! ! ! ! !
      ! !

      ! ! ! ! ! - ! !

      ! Prosimy potwierdzić, że chcesz zamówić pozycję typu: !

      ! !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ Pozycji
      ! ! Która ma być podjęta z .
      ! ! ! !
      Uwaga, bedzie pobrana opłata w wysoko¶ci PLN
      !       ! ! ! !
      !       --- 10,113 ---- ! ! !
      ! Przepraszamy, nie możesz złozyć zamówienia ponieważ zalegasz na . ! Przepraszamy, nie możesz złożyć więcej jak rezerwacji. ! Złożyłe¶/a¶ już zamówienie na tę pozycję. ! Musisz wybrać przynajmniej jeden typ pozycji! ! Musisz podać oddział do odbioru! !

      ! !

      Strona rezerwacji dla pozycji: ( )

      !

      Złożono już zamówień na tę pozycję.

      !

      Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji,która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana. ! !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      ZamówienieTyp PozycjiEgzemplarze
      Rezerwacja nie możliwa
      !

      ! Prosimy wybrać oddział, z którego chcesz odebrać pozycję: !
      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Rezerwacja tego dnia: ! ! ! ! ! !
      Koniec rezerwacji tego dnia: ! ! ! ! ! !
      !

      ! !

      ! !

      Prosimy potwierdzić, że chcesz zamówić pozycję typu:

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ Pozycji
      ! która ma być podjęta .
      ! ! !
      Uwaga, będzie pobrana opłata w wysoko¶ci PLN
      !       ! !
      Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.2 --- opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,69 **** ! !

      Zalogowano jako: [Strony członkowskie][Wyloguj]

      !

      Zaloguj się do Koha

      !       ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      !
      Słowo kluczowe
      Tytuł ZwykłeDokładne
      Autor
      Ilustrator
      Przedmiot
      Klasa ! !
      Barcode
      !
      !
      !
      ! ! ! --- 1,92 ---- ! !

      Zalogowano jako: [Strony członkowskie][Wyloguj]

      !

      Zaloguj się do Koha

      !       ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! +
      Słowa kluczowe
      LUB :
      Przedmiot
      LUB jedno albo więcej z :
      TytułNormalnePrecyzyjne
      Autor
      Ilustrator
      Klasa ! !
      Kod kreskowy
      Zauważ, że je¶li wpiszesz jak±¶ warto¶ć do Słowa kluczowe, oraz inn± gdzie indziej to użyta zostanie jedynie warto¶ć Słowa kluczowego
      + +
      +
      + + + Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-searchresults.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 ****
      !

      Zalogowano jako: [Strony członkowskie][Wyloguj się]

      --- 3,7 ----
      !

      Zalogowano jako: [Strony członkowskie][Wyloguj się]

      Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 7 Jan 2003 17:13:21 -0000 1.2 --- opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 17,24 ****

      ! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadzałe¶/a¶ się, zmieniłe¶/a¶ numer telefonu lub adres e-mail? !

      ! Zaktualizuj Dane

      --- 16,22 ----

      ! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadzałe¶/a¶ się, zmieniłe¶/a¶ numer telefonu lub adres e-mail?

      ! Zaktualizuj dane

      *************** *** 26,30 **** - Witaj [Wyloguj się]

      --- 24,27 ---- *************** *** 43,47 **** -
      Masz niezapłacone należno¶ci i kary w wysoko¶ci
      --- 40,43 ---- *************** *** 51,55 **** -
      Posiadasz kredyt na
      --- 47,50 ---- *************** *** 74,88 **** ! Obecnie masz wypożyczonych pozycji.
      ! ! ! --- 69,83 ---- ! Obecnie masz wypożyczonych pozycji
      Tytuł Autor Do zwrotuTyp Pozycji OpłatyStatus
      ! ! ! *************** *** 94,99 **** ! ! --- 89,94 ---- ! ! *************** *** 134,136 **** --- 129,132 ---- + Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-userupdate.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 1,54 **** ! !

      Zalogowano jako: [Wyloguj się]

      !

      Zaloguj się do Koha

      !       ! ! ! !
      !
      !
      tytuł Autor Do zwrotuTyp pozycji OpłatyBież±cy Status
      TakNieTakNie
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Nazwisko
      Tytuł
      Imię
      Ulica
      Miasto
      Tel. domowy
      Tel./Fax w pracy
      Email
      !
      ! ! ! ! ! --- 1,56 ---- ! !

      Zalogowano jako: [Wyloguj się]

      !

      Zaloguj się do Koha

      ! ! ! Proszę nanie¶ć potrzebne zmiany. Biblioteka otrzyma wiadomo¶ć e-mailem.
      ! Zmiany te nie ukaż± się dopóki biblioteka ich nie zatwierdzi..

      ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Nazwisko
      Tytuł
      Imię
      Ulica
      Miasto
      Tel. domowy
      Tel./Fax w pracy
      Email
      !
      !
      !
      ! !       ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** !

      Logged in as: [Wyloguj się]

      Zaloguj się do Koha

      --- 3,7 ---- !

      Zalogowano jako: [Wyloguj się]

      Zaloguj się do Koha

      *************** *** 22,26 ****

      ! trafienia od do z recordów.
      --- 22,26 ----
      ! Trafienia od do z rekordów.
      *************** *** 48,50 **** - --- 48,49 ---- From tipaul at users.sourceforge.net Wed Oct 1 15:25:51 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:25:51 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv11361/C4 Modified Files: Biblio.pm Log Message: seems a char encoding problem modified something in char_decode sub... changing back to something that works... Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** Biblio.pm 17 Sep 2003 14:21:13 -0000 1.62 --- Biblio.pm 1 Oct 2003 13:25:49 -0000 1.63 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.63 2003/10/01 13:25:49 tipaul + # seems a char encoding problem modified something in char_decode sub... changing back to something that works... + # # Revision 1.62 2003/09/17 14:21:13 tipaul # fixing bug that makes a MARC biblio disappear when using full acquisition (order => recieve ==> MARC editor). *************** *** 684,688 **** my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table --- 687,691 ---- my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table *************** *** 2299,2418 **** # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/€/gm ; ! s/\xe2/€/gm ; ! s/\xe9/€/gm ; ! s/\xec/€/gm ; ! s/\xf1/€/gm ; ! s/\xf3/€/gm ; ! s/\xf9/€/gm ; ! s/\xfb/€/gm ; ! s/\xc1\x61/€/gm ; ! s/\xc1\x65/€/gm ; ! s/\xc1\x69/€/gm ; ! s/\xc1\x6f/€/gm ; ! s/\xc1\x75/€/gm ; ! s/\xc1\x41/€/gm ; ! s/\xc1\x45/€/gm ; ! s/\xc1\x49/€/gm ; ! s/\xc1\x4f/€/gm ; ! s/\xc1\x55/€/gm ; ! s/\xc2\x41/€/gm ; ! s/\xc2\x45/€/gm ; ! s/\xc2\x49/€/gm ; ! s/\xc2\x4f/€/gm ; ! s/\xc2\x55/€/gm ; ! s/\xc2\x59/€/gm ; ! s/\xc2\x61/€/gm ; ! s/\xc2\x65/€/gm ; ! s/\xc2\x69/€/gm ; ! s/\xc2\x6f/€/gm ; ! s/\xc2\x75/€/gm ; ! s/\xc2\x79/€/gm ; ! s/\xc3\x41/€/gm ; ! s/\xc3\x45/€/gm ; ! s/\xc3\x49/€/gm ; ! s/\xc3\x4f/€/gm ; ! s/\xc3\x55/€/gm ; ! s/\xc3\x61/€/gm ; ! s/\xc3\x65/€/gm ; ! s/\xc3\x69/€/gm ; ! s/\xc3\x6f/€/gm ; ! s/\xc3\x75/€/gm ; ! s/\xc4\x41/€/gm ; ! s/\xc4\x4e/€/gm ; ! s/\xc4\x4f/€/gm ; ! s/\xc4\x61/€/gm ; ! s/\xc4\x6e/€/gm ; ! s/\xc4\x6f/€/gm ; ! s/\xc8\x45/€/gm ; ! s/\xc8\x49/€/gm ; ! s/\xc8\x65/€/gm ; ! s/\xc8\x69/€/gm ; ! s/\xc8\x76/€/gm ; ! s/\xc9\x41/€/gm ; ! s/\xc9\x4f/€/gm ; ! s/\xc9\x55/€/gm ; ! s/\xc9\x61/€/gm ; ! s/\xc9\x6f/€/gm ; ! s/\xc9\x75/€/gm ; ! s/\xca\x41/€/gm ; ! s/\xca\x61/€/gm ; ! s/\xd0\x43/€/gm ; ! s/\xd0\x63/€/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/€/gm ; ! s/\xe1\x65/€/gm ; ! s/\xe1\x69/€/gm ; ! s/\xe1\x6f/€/gm ; ! s/\xe1\x75/€/gm ; ! s/\xe1\x41/€/gm ; ! s/\xe1\x45/€/gm ; ! s/\xe1\x49/€/gm ; ! s/\xe1\x4f/€/gm ; ! s/\xe1\x55/€/gm ; ! s/\xe2\x41/€/gm ; ! s/\xe2\x45/€/gm ; ! s/\xe2\x49/€/gm ; ! s/\xe2\x4f/€/gm ; ! s/\xe2\x55/€/gm ; ! s/\xe2\x59/€/gm ; ! s/\xe2\x61/€/gm ; ! s/\xe2\x65/€/gm ; ! s/\xe2\x69/€/gm ; ! s/\xe2\x6f/€/gm ; ! s/\xe2\x75/€/gm ; ! s/\xe2\x79/€/gm ; ! s/\xe3\x41/€/gm ; ! s/\xe3\x45/€/gm ; ! s/\xe3\x49/€/gm ; ! s/\xe3\x4f/€/gm ; ! s/\xe3\x55/€/gm ; ! s/\xe3\x61/€/gm ; ! s/\xe3\x65/€/gm ; ! s/\xe3\x69/€/gm ; ! s/\xe3\x6f/€/gm ; ! s/\xe3\x75/€/gm ; ! s/\xe4\x41/€/gm ; ! s/\xe4\x4e/€/gm ; ! s/\xe4\x4f/€/gm ; ! s/\xe4\x61/€/gm ; ! s/\xe4\x6e/€/gm ; ! s/\xe4\x6f/€/gm ; ! s/\xe8\x45/€/gm ; ! s/\xe8\x49/€/gm ; ! s/\xe8\x65/€/gm ; ! s/\xe8\x69/€/gm ; ! s/\xe8\x76/€/gm ; ! s/\xe9\x41/€/gm ; ! s/\xe9\x4f/€/gm ; ! s/\xe9\x55/€/gm ; ! s/\xe9\x61/€/gm ; ! s/\xe9\x6f/€/gm ; ! s/\xe9\x75/€/gm ; ! s/\xea\x41/€/gm ; ! s/\xea\x61/€/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; --- 2302,2421 ---- # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/Ć/gm ; ! s/\xe2/Đ/gm ; ! s/\xe9/Ř/gm ; ! s/\xec/ţ/gm ; ! s/\xf1/ć/gm ; ! s/\xf3/đ/gm ; ! s/\xf9/ř/gm ; ! s/\xfb/ß/gm ; ! s/\xc1\x61/ŕ/gm ; ! s/\xc1\x65/č/gm ; ! s/\xc1\x69/ě/gm ; ! s/\xc1\x6f/ň/gm ; ! s/\xc1\x75/ů/gm ; ! s/\xc1\x41/Ŕ/gm ; ! s/\xc1\x45/Č/gm ; ! s/\xc1\x49/Ě/gm ; ! s/\xc1\x4f/Ň/gm ; ! s/\xc1\x55/Ů/gm ; ! s/\xc2\x41/Á/gm ; ! s/\xc2\x45/É/gm ; ! s/\xc2\x49/Í/gm ; ! s/\xc2\x4f/Ó/gm ; ! s/\xc2\x55/Ú/gm ; ! s/\xc2\x59/Ý/gm ; ! s/\xc2\x61/á/gm ; ! s/\xc2\x65/é/gm ; ! s/\xc2\x69/í/gm ; ! s/\xc2\x6f/ó/gm ; ! s/\xc2\x75/ú/gm ; ! s/\xc2\x79/ý/gm ; ! s/\xc3\x41/Â/gm ; ! s/\xc3\x45/Ę/gm ; ! s/\xc3\x49/Î/gm ; ! s/\xc3\x4f/Ô/gm ; ! s/\xc3\x55/Ű/gm ; ! s/\xc3\x61/â/gm ; ! s/\xc3\x65/ę/gm ; ! s/\xc3\x69/î/gm ; ! s/\xc3\x6f/ô/gm ; ! s/\xc3\x75/ű/gm ; ! s/\xc4\x41/Ă/gm ; ! s/\xc4\x4e/Ń/gm ; ! s/\xc4\x4f/Ő/gm ; ! s/\xc4\x61/ă/gm ; ! s/\xc4\x6e/ń/gm ; ! s/\xc4\x6f/ő/gm ; ! s/\xc8\x45/Ë/gm ; ! s/\xc8\x49/Ď/gm ; ! s/\xc8\x65/ë/gm ; ! s/\xc8\x69/ď/gm ; ! s/\xc8\x76/˙/gm ; ! s/\xc9\x41/Ä/gm ; ! s/\xc9\x4f/Ö/gm ; ! s/\xc9\x55/Ü/gm ; ! s/\xc9\x61/ä/gm ; ! s/\xc9\x6f/ö/gm ; ! s/\xc9\x75/ü/gm ; ! s/\xca\x41/Ĺ/gm ; ! s/\xca\x61/ĺ/gm ; ! s/\xd0\x43/Ç/gm ; ! s/\xd0\x63/ç/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC" || $encoding eq "MARC21") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/ŕ/gm ; ! s/\xe1\x65/č/gm ; ! s/\xe1\x69/ě/gm ; ! s/\xe1\x6f/ň/gm ; ! s/\xe1\x75/ů/gm ; ! s/\xe1\x41/Ŕ/gm ; ! s/\xe1\x45/Č/gm ; ! s/\xe1\x49/Ě/gm ; ! s/\xe1\x4f/Ň/gm ; ! s/\xe1\x55/Ů/gm ; ! s/\xe2\x41/Á/gm ; ! s/\xe2\x45/É/gm ; ! s/\xe2\x49/Í/gm ; ! s/\xe2\x4f/Ó/gm ; ! s/\xe2\x55/Ú/gm ; ! s/\xe2\x59/Ý/gm ; ! s/\xe2\x61/á/gm ; ! s/\xe2\x65/é/gm ; ! s/\xe2\x69/í/gm ; ! s/\xe2\x6f/ó/gm ; ! s/\xe2\x75/ú/gm ; ! s/\xe2\x79/ý/gm ; ! s/\xe3\x41/Â/gm ; ! s/\xe3\x45/Ę/gm ; ! s/\xe3\x49/Î/gm ; ! s/\xe3\x4f/Ô/gm ; ! s/\xe3\x55/Ű/gm ; ! s/\xe3\x61/â/gm ; ! s/\xe3\x65/ę/gm ; ! s/\xe3\x69/î/gm ; ! s/\xe3\x6f/ô/gm ; ! s/\xe3\x75/ű/gm ; ! s/\xe4\x41/Ă/gm ; ! s/\xe4\x4e/Ń/gm ; ! s/\xe4\x4f/Ő/gm ; ! s/\xe4\x61/ă/gm ; ! s/\xe4\x6e/ń/gm ; ! s/\xe4\x6f/ő/gm ; ! s/\xe8\x45/Ë/gm ; ! s/\xe8\x49/Ď/gm ; ! s/\xe8\x65/ë/gm ; ! s/\xe8\x69/ď/gm ; ! s/\xe8\x76/˙/gm ; ! s/\xe9\x41/Ä/gm ; ! s/\xe9\x4f/Ö/gm ; ! s/\xe9\x55/Ü/gm ; ! s/\xe9\x61/ä/gm ; ! s/\xe9\x6f/ö/gm ; ! s/\xe9\x75/ü/gm ; ! s/\xea\x41/Ĺ/gm ; ! s/\xea\x61/ĺ/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; From tipaul at users.sourceforge.net Wed Oct 1 15:43:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:43:50 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv16353/updater Modified Files: updatedatabase Log Message: fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** updatedatabase 30 Sep 2003 16:22:05 -0000 1.59 --- updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => '', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', *************** *** 796,799 **** --- 796,802 ---- $dbh->do("ALTER TABLE `items` CHANGE `barcode` `barcode` VARCHAR( 20 )") unless ($nullenabled{barcode} eq 'YES'); + # changing z3950daemon field to NULL in marc_breeding + $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 915,918 **** --- 918,924 ---- # $Log$ + # Revision 1.60 2003/10/01 13:43:48 tipaul + # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". + # # Revision 1.59 2003/09/30 16:22:05 tipaul # adding barcode NOT mandatory feature. Just run updatedatabase to get it. From tipaul at users.sourceforge.net Wed Oct 1 17:03:47 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:03:47 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv32687/updater Modified Files: updatedatabase Log Message: oups... typo fix in z3950random field definition Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 --- updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'NULL', key => '', default => '', *************** *** 918,923 **** # $Log$ ! # Revision 1.60 2003/10/01 13:43:48 tipaul ! # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". # # Revision 1.59 2003/09/30 16:22:05 tipaul --- 918,923 ---- # $Log$ ! # Revision 1.61 2003/10/01 15:03:45 tipaul ! # oups... typo fix in z3950random field definition # # Revision 1.59 2003/09/30 16:22:05 tipaul From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/C4 Z3950.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/C4 Modified Files: Z3950.pm Log Message: fix fog bug #622 : processz3950queue fails Index: Z3950.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Z3950.pm 29 Apr 2003 16:50:51 -0000 1.9 --- Z3950.pm 1 Oct 2003 15:08:14 -0000 1.10 *************** *** 215,219 **** my $serverlist=''; ! $serverlist = join(" ", @serverlist); # chop $serverlist; --- 215,219 ---- my $serverlist=''; ! $serverlist = join("|", @serverlist); # chop $serverlist; *************** *** 307,310 **** --- 307,313 ---- #-------------------------------------- # $Log$ + # Revision 1.10 2003/10/01 15:08:14 tipaul + # fix fog bug #622 : processz3950queue fails + # # Revision 1.9 2003/04/29 16:50:51 tipaul # really proud of this commit :-) From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/z3950 Modified Files: processz3950queue Log Message: fix fog bug #622 : processz3950queue fails Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** processz3950queue 5 Sep 2003 11:30:22 -0000 1.6 --- processz3950queue 1 Oct 2003 15:08:14 -0000 1.7 *************** *** 97,101 **** my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\s+/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; --- 97,101 ---- my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; From kb2qzv at users.sourceforge.net Wed Oct 1 17:14:34 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 08:14:34 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes join-top.inc,1.2,1.3 members-top.inc,1.2,1.3 opac-bottom.inc,1.1,1.2 opac-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv2606 Modified Files: join-top.inc members-top.inc opac-bottom.inc opac-top.inc Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: join-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/join-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** join-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- join-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,69 **** ! ! KOHA: Zostań członkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Zostań członkiemSzukaj ! ! ! Zapisy ! ! Pocz±tek
      KOHA
      ! ! ! ! !
      ! --- 1,67 ---- + ! ! KOHA: Zostań członkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Zostań członkiem/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">Szukaj ! ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-join.gif" ! width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home">
      /images/inside-koha-bottom.gif" ! width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" ! width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" >
      ! ! ! ! !
      ! ±ż¶Ľęćńół ! ˇŻ¦¬ĘĆŃÓŁ \ No newline at end of file Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- members-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 35,42 **** src="/images/menu-search.gif" width=71 height=30 alt="Szukaj" hspace=0 vspace=0 border=0 name="menu-search"> - - Zapisy
      ! !

       

      !
      !
      ! ! Przeszukiwanie Katalogu || ! ! Zostań członkiem || ! Pocz±tek ! ! !
      ! ! --- 1,32 ----
      ! ! ! !

       

      ! !
      ! !
      ! ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz±tek ! ! ! ! ! !
      ! ! ! ! ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,73 **** ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Przeszukiwanie KataloguSearch ! ! ! Zapisy ! ! Pocz±tek
      KOHA
      ! ! ! ! !
      --- 1,70 ---- ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Przeszukiwanie KataloguSearch ! ! Zapisy ! ! Pocz±tek
      KOHA
      ! ! ! ! !
      From kb2qzv at users.sourceforge.net Fri Oct 3 22:04:20 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Fri, 03 Oct 2003 13:04:20 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.4,1.5 opac-detail.tmpl,1.2,1.3 opac-main.tmpl,1.3,1.4 opac-reserve.tmpl,1.2,1.3 opac-user.tmpl,1.3,1.4 opac-userupdate.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27293 Modified Files: opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-reserve.tmpl opac-user.tmpl opac-userupdate.tmpl Log Message: minor translation improvements Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 --- opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + *************** *** 29,35 **** -
      --- 30,36 ----
      Koha - Wstęp
      + *************** *** 39,45 ****
      Koha - Wstęp
      - --- 40,49 ----
      + + + +       Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 65,69 **** Witryna Online ! Dostępn --- 65,69 ---- Witryna Online ! Dostępna *************** *** 76,78 ****

      - --- 76,77 ---- Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 134,138 ****

      - ±ż¶Ľęćńół - ˇŻ¦¬ĘĆŃÓŁ - --- 134,135 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 35,40 **** Egzemplarze ! ! --- 35,40 ---- Egzemplarze ! ! *************** *** 53,57 **** - - --- 64,67 ---- *************** *** 87,90 **** --- 85,89 ----

      Prosimy potwierdzić, że chcesz zamówić pozycję typu:

      +
      Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 130,132 **** - --- 130,131 ---- Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 44,48 ****

      ! --- 44,48 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 10:26:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:26:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv23506/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:27:41 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:27:41 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv23662/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv23760/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:40 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:40 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv23803/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:37:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:37:22 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv24872 Added Files: about.tmpl Log Message: first translation --- NEW FILE ---

      Dane o bież±cej wersji Koha w celu zgłaszania błędów (lub dla informacji ogólnej).

      Rezerwacja tego dnia: --- 53,56 ---- *************** *** 65,69 ****
      Koniec rezerwacji tego dnia:
      Wersja Koha:
      Wersja OS (przez 'uname -a'):
      Wersja Perl:
      Wersja MySQL:
      Wersja Apache:
      From kb2qzv at users.sourceforge.net Sat Oct 4 10:43:12 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:43:12 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl auth.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv25416 Modified Files: auth.tmpl Log Message: corrections of closing tag

Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/auth.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** auth.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- auth.tmpl 4 Oct 2003 08:43:10 -0000 1.3 *************** *** 3,22 **** !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

!

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

!

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

!

Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

--- 3,22 ---- !

Przepraszamy, system KOHA uważa, że nie masz uprawnień do tej strony.

 !

Przepraszamy, twoja sesja wygasła, prosimy zalogować się ponownie.

 !

Twój dostęp dokonuje się z innego adresu IP! Prosimy zalogować się ponownie.

 !

Wprowadziłe¶ niepoprawne hasło lub nazwę, prosimy spróbować ponownie.

 From kb2qzv at users.sourceforge.net Sat Oct 4 10:48:37 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:48:37 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl bookcount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26009 Modified Files: bookcount.tmpl Log Message: latest code update Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/bookcount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** bookcount.tmpl 7 Jan 2003 16:45:50 -0000 1.2 --- bookcount.tmpl 4 Oct 2003 08:48:35 -0000 1.3 *************** *** 2,9 ****

! ! &type="intra"> ()

- --- 2,8 ----

!

! &type="intra"> ()

From kb2qzv at users.sourceforge.net Sat Oct 4 11:00:33 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:00:33 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl boraccount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27387 Modified Files: boraccount.tmpl Log Message: latest code update Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/boraccount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** boraccount.tmpl 25 Jan 2003 20:05:47 -0000 1.2 --- boraccount.tmpl 4 Oct 2003 09:00:30 -0000 1.3 *************** *** 3,10 **** ! Konto dla

!   !

--- 3,10 ---- !

Konto dla ">

! Generuj rachunek   ! Generuj kredyt

*************** *** 15,21 ****

! ! ! --- 15,21 ---- ! ! ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,50 **** - - - --- 45,47 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 11:15:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:15:07 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl intranet-main.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv28840 Modified Files: intranet-main.tmpl Log Message: latest code update Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/intranet-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- intranet-main.tmpl 4 Oct 2003 09:15:04 -0000 1.3 *************** *** 15,27 **** if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> --- 15,27 ---- if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> *************** *** 45,72 **** ! ! ! --- 8,16 ---- ! ! *************** *** 19,62 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KARY I OPŁATYKWOTADO ZAPŁATY
/images/background-mem.gif" colspan=2>KARY I OPŁATY/images/background-mem.gif" colspan=1>KWOTA/images/background-mem.gif" colspan=1>DO ZAPŁATY
RAZEM DO ZAPŁATY
Razem do zapłaty
! ! ! ! ! ! ! ! ! ! --- 45,72 ---- ! !
! ! ! ! ! ! ! ! ! ! *************** *** 75,108 **** ! ! ! - - --- 75,112 ---- ! ! ! ! *************** *** 112,117 **** --- 116,121 ---- *************** *** 127,131 ****
WprowadĽ wyrażenie i naci¶nij kalwisz enter.
! --- 131,135 ----
WprowadĽ wyrażenie i naci¶nij kalwisz enter.
! *************** *** 139,143 **** ! ! ! ! ! --- 170,176 ---- ! *************** *** 178,182 **** ! --- 182,186 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 11:21:03 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:21:03 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl mancredit.tmpl,1.2,1.3 maninvoice.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv29571 Modified Files: mancredit.tmpl maninvoice.tmpl Log Message: latest code update Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** mancredit.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 *************** *** 21,23 **** - --- 21,22 ---- Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 7 Jan 2003 19:52:00 -0000 1.1 --- maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 *************** *** 1,4 **** - - --- 1,2 ---- *************** *** 21,28 **** !
!
! Koha: Horowhenua Library Trust
WprowadĽ wyrażenie i naci¶nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (więcej opcji)
!
!
! Koha: Horowhenua Library Trust		 + +
+ +
WprowadĽ wyrażenie i naci¶nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (więcej opcji)
! !
! ! ! !




!
!
Opis
Kwota
! ! \ No newline at end of file --- 19,25 ----
Opis
Kwota
! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 11:25:46 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:25:46 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv30220 Added Files: member-flags.tmpl Log Message: first upload --- NEW FILE ---

,

>
FLAGI
>

From kb2qzv at users.sourceforge.net Sat Oct 4 11:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:34:17 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbib.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv32526 Modified Files: modbib.tmpl Log Message: latest code update Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbib.tmpl 7 Jan 2003 20:13:24 -0000 1.1 --- modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 *************** *** 8,16 ****
Autor">
Tytuł">
Autor">
Tytuł">
Subject - ...
Data Copyright">
Tytuł Serii">
Autor dodatkowy">
Podtytuł">
Ujednolicony">
Notatki
Seria">
Analytic Author
Analytic Title
--- 19,53 ---- ! Przedmiot ! Data Copyright'u ! "> Tytuł Serii ! "> Autor dodatkowy ! "> Podtytuł ! "> Ujednolicony ! "> Notatki ! Seria ! "> From kb2qzv at users.sourceforge.net Sat Oct 4 11:52:38 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:52:38 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbibitem.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2303 Modified Files: modbibitem.tmpl Log Message: latest code update Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbibitem.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 *************** *** 1,7 **** ! !

! "&type=intra> ()
! Modyfikuj Grupę -
--- 1,5 ---- !

"&type=intra> ()
! Modyfikuj Grupę -


*************** *** 70,75 **** ! ZMIANY DOTYCZˇCE TYCH KODÓW KRESKOWYCH
! Zaznacz te kody kreskowe, których zmiany maj± dotyczyć. Te nie-zaznaczone zachowaj± swoj± oryginaln± grupę. --- 68,73 ---- ! ZMIANY MAJˇCE DOTYCZYĆ TYCH KODÓW KRESKOWYCH
! Zaznacz TE kody kreskowe, których zmiany maj± dotyczyć. Wszystkie nie-zaznaczone zachowaj± swoj± oryginaln± grupę. *************** *** 101,110 **** ! POMOC: Musisz klikn±ć w żadane kółko wyboru (na zielonym tle), i albo przypisać pozycję/e do istniej±cego już w systemie rekordu, ! albo zmodyfikować ten rekord. JE¦LI zmiany maj± dotyczyć jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich ! automatycznie osobny rekord grupowy.

 

- --- 99,106 ---- ! POMOC: Musisz klikn±ć w ż±dane kółko wyboru (na zielonym tle), następnie albo przypisać pozycję/e do istniej±cego już w systemie rekordu, ! albo zmodyfikować ten rekord. JE¦LI zmiany maj± dotyczyć jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

 

From kb2qzv at users.sourceforge.net Sat Oct 4 11:59:51 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:59:51 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3204 Modified Files: moditem.tmpl Log Message: latest code update Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** moditem.tmpl 26 Jan 2003 03:36:37 -0000 1.3 --- moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 *************** *** 1,5 **** ! ()
--- 38,42 ----
--- 1,5 ---- !

()


! ! --- 19,34 ---- ! ! *************** *** 38,43 ****
*************** *** 19,34 **** Zagubiona ! zaznaczono > ! Tak ! zaznaczono > ! Nie
Anulowana zaznaczono > ! Tak ! zaznaczono > ! Nie
Zagubiona ! checked > ! Yes ! checked > ! No
Cancelled checked > ! Yes ! checked > ! No
!
! //images/filesave.png border=0>
*************** *** 45,48 **** ! ! --- 44,46 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 12:03:06 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:03:06 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modwebsites.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3938 Modified Files: modwebsites.tmpl Log Message: latest code update Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modwebsites.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 *************** *** 2,6 ****

">Powrót do strony szczegółów ! EOF --- 2,6 ----

">Powrót do strony szczegółów ! *************** *** 47,51 **** ! EOF --- 47,51 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 12:07:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:07:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newimember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv4513 Modified Files: newimember.tmpl Log Message: latest code update Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 *************** *** 7,15 **** Nieważny numer karty.

" value=""> !
--- 7,16 ---- Nieważny numer karty.

+ Warto¶ci zgodne. Kliknij OK, by potwierdzić nowego czytelnika

" value=""> !
*************** *** 17,19 **** - --- 18,19 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 12:10:45 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:10:45 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv7558 Modified Files: newjmember.tmpl Log Message: latest code update Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newjmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 *************** *** 5,9 ****

'PotwierdĽ Wpis'

! --- 5,9 ----

'PotwierdĽ Wpis'

!
*************** *** 13,17 **** --- 13,17 ---- *************** *** 29,33 **** --- 29,33 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 14:53:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:53:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl request.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1364 Added Files: request.tmpl stats.tmpl Log Message: first upload --- NEW FILE ---
/images/place-request.gif" align=right > "> ">

Zamawienie: >

! &nbpsq;
!  
! &nbpsq;
!  
/images/background-mem.gif">Ranga /images/background-mem.gif">Numer Członka /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbiór /images/background-mem.gif">Zamówienie
Kolejna dostępna,
(lub wybierz z listy poniżej)
/images/background-mem.gif">Zamówienie /images/background-mem.gif">Typ pozycji /images/background-mem.gif">Klasyfikacja /images/background-mem.gif">Tom /images/background-mem.gif">Data publikacji /images/background-mem.gif">Egzemplarze
Nie może być wybrana > >

 

action=modrequest.pl method=post>
/images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJˇCE ZAMÓWIENIA
/images/background-mem.gif">Ranga /images/background-mem.gif">Członek /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbiór /images/background-mem.gif">Zamówienie
> > > Oczekuj±ca pozycja w > &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> Kolejna dostępna Tylko ten typ :
Wymaż rezerwację wybieraj±c "del" z listy ranga. //images/2rightarrow.png">


--- NEW FILE ---
Nazwa Typ Data/czas Kwota Odział

Zapłacono w sumie:
Odpisano w sumie:

From kb2qzv at users.sourceforge.net Sat Oct 4 14:58:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:58:43 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newmember.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 overdue.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.2,1.3 updatebiblio.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2725 Modified Files: newmember.tmpl opac-main.tmpl overdue.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: latest code update Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,13 **** -

PotwierdĽ Wpis

" > ! ! --- 1,10 ---- +

PotwierdĽ Wpis

"> ! NOWY CZYTELNIK ! !  
" > ! *************** *** 21,30 **** " > ! - --- 18,24 ---- " > ! *************** *** 49,61 **** ! ! ! ! --- 43,47 ---- *************** *** 70,74 **** " > ! - - - - - --- 75,85 ---- " > ! *************** *** 125,134 **** " > ! - --- 100,106 ---- " > ! *************** *** 149,158 **** " > ! - --- 121,127 ---- " > ! *************** *** 188,197 **** ! " > ! --- 157,171 ---- ! ! ! ! " > ! *************** *** 229,238 **** " > ! - --- 203,209 ---- " > ! *************** *** 252,256 **** ! --- 223,249 ---- !

BŁˇD

!

Następuj±ce pola s± Ľle wypełnione. Wróć do poprzedniej strony i spróbuj raz jeszcze:

! ! Cardnumber
! ! ! Invalid_cardnumber
! ! ! Gender
! ! ! Given Names
! ! ! Surname
! ! ! Postal Street Address
! ! ! Postal city
! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,135 **** ! WITAMY W KATALOGU KOHA
/images/background-mem.gif"> ! NOWY CZŁONEK
"> SZCZEGÓŁY CZŁONKOWSKIE -   -
/images/background-mem.gif"> SZCZEGÓŁY CZŁONKOWSKIE
! !
! Area ! !
!
! Data Zapisu --- 56,60 ----
! Data zapisu *************** *** 89,110 **** !
"> DANE PERSONALNE -   -
- Etniczno¶ć - - -
!
/images/background-mem.gif"> DANE PERSONALNE
"> ADRES CZYTELNIKA -   -
/images/background-mem.gif"> ADRES CZYTELNIKA
"> DANE OSOBY KONTAKTOWEJ -   -
/images/background-mem.gif"> DANE OSOBY KONTAKTOWEJ
"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ !  
! Text messaging ! !
/images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
"> NOTATKI -   -
/images/background-mem.gif"> NOTATKI

Koha: Katalog i usługi dla czytelników		 Szukaj w katalogu
   

WprowadĽ wyrażenie i naci¶nij klawisz enter.
-Wyszukiwanie zaawansowane (więcej opcji)

Zalogowano jako: [Wyloguj]

Zaloguj się do Koha

! --- 1,269 ---- ! + WITAMY W KATALOGU KOHA + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ Koha: Katalog i usługi dla czytelników		Szukaj w katalogu
   
+ +
+ + WprowadĽ wyrażenie i naci¶nij klawisz enter.
+ + + -Wyszukiwanie zaawansowane (więcej opcji)
+ + +

+ +

Zalogowano jako: [Wyloguj]

+ +

Zaloguj się do Koha

+ +
+ +
+

+

! Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,10 **** ! ! ! ! ! ! Pozycje zaległe w dniu

--- 1,6 ---- ! !

Pozycje zaległe w dniu


*************** *** 34,39 **** ! ! ! ! --- 30,32 ---- ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** thesaurus_popup.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,16 **** ! ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!

"> ! "> ! "> ! ! ! --- 1,18 ---- ! ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!
!

! "> ! "> ! "> ! ! !

*************** *** 24,33 **** !
"> "> wprowadĽ now± authority : ! ! ! --- 40,43 ---- } ! ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** updatebiblio.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 3,9 **** !

Kliknij "Wy¶lij", by wymusić hasło przedmiotowe
!

--- 3,9 ---- !

Kliknij "Prze¶lij..", by wymusić przedmiot
!

*************** *** 17,19 **** - --- 17,18 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 21:46:31 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:46:31 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25169 Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: first translation and upload --- NEW FILE ---

Akwizycje


SKŁADANIE ZAMÓWIENIA, ODBIÓR LUB MODYFIKACJA
Nazwa dostawcy
ODBIÓR LUB MODYFIKACJA ZAMÓWIEŃ REGULARNYCH
Wyszukiwanie tytułowe

KURSY WYMIANY
" value=>
BUDŻET ORAZ WYDATKI KSIĘGARSKIE
Budżet Suma Wydano Alokowano Dostępne
Total

Zastosuj kombinację klawiszy [ctrl + r] aby wy¶wietlić uaktualnione cyfry. Podane cyfry s± przybliżone, gdyż kurs wymiany wpływa na kwotę faktycznie zapłacon±.

POMOC zamówienia:

    By rozpocz±ć akwizycję, niezależnie czy jest to zamówienie, zakup własny czy darowizna najpierw wyszukaj dostawcę, dodaj go je¶li potrzeba.
    Następnie wybierz poprzedni koszyk lub utwórz nowy. Uwaga, koszyk będzie należał do nazwy użytkownika z jak± się zalogowałe¶/a¶.
    Aby złozyć zamówienie należy ustalić czy istnieje już opis dla pozycji, następnie albo dodać pozycję albo wstawić nowy opis i dodać pozycję.

W celu zamknięcia koszyka kliknij na "zobacz koszyki" lub szukaj powyżej, a następnie naci¶nij "zatwierdĽ koszyk".

--- NEW FILE ---

Rachunek:
Otrzymany przez:

Receipt Summary for: Invoice,

- Odbiór zamówienia


Koszyk dla:
Zamówienie złożone:

/images/background-mem.gif" colspan=2> SZCZEGÓŁY KATALOGU
Tytuł * " >
Autor " >
Data Copyright " >
Format
ISBN ">
Series ">
Oddział
Kod kreskowy pozycji * ">
Informacje tomowe (for serials) *
> > > "> "> "> /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0>
DETALE KSIĘGOWO-FINANSOWE
Bookfund *
Ilo¶ć zamówiona ">
Ilo¶ć odebrana * ">
Koszt wymiany ">
Budgeted Cost ">
Faktyczny koszt * ">
Numer rachunku ">
Uwagi ">

 


Koszyk ISBN TYTUŁ AUTOR Ilo¶ć Otrzymano
&biblio=&invoice=&freight=&gst=&id=>
--- NEW FILE ---

Koszyk dla >


(Our Reference: , #, zatwierdzone przez: )

"> > ">
Zamówienie Isbn Tytuł Autor $ rrp $est Ilo¶ć Suma
&id=&basket=">
POMOC
W celu zmiany informacji dotycz±cej katalogu lub zaksięgowania danego zamówienia nalezy klikn±ć w tytuł.
 SubTotal
GST
TOTAL
"> "> Dodaj zamówienie : wprowadĽ hasło lub tytuł:

--- NEW FILE ---

Koszyk dla


(Our Reference: , #, zatwierdzone przez: )
Tel: , Fax:
,
,

"> "> Wyszukaj hasło lub tytuł:
>
Zamówienie Isbn Tytuł Autor Ilo¶ć
--- NEW FILE ---
"> "> "> "> "> "> "> "> "> "> " value=""> Obejrzyj koszyk

- Szczegóły zamówienia


Koszyk dla:

SZCZEGÓŁY KATALOGU
TYTUŁ * ">
Autor " >
Data Copyright ">
Format
ISBN ">
Series ">
Oddział
/images/holder.gif" width=32 height=250 align=left>
DETALE KSIĘGOWO-FINANSOWE
Ilo¶ć " onchange='update(this.form)' >
Bookfund
Cena dostawcy " onchange='update(this.form)'>
Koszt wymiany
" onchange='update(this.form)'>
Budgeted Cost
(ex GST, inc discount) 		" onchange='update(this.form)'>
Budgeted GST
BUDGETED TOTAL
Koszt faktyczny
Numer rachunku *
Uwagi ">
//images/2rightarrow.png" border=0 align=right>
HELP
  • Tłuste pola s± obowiazkowe dla stworzenia nowego opisu i pozycji.

  • Zacienione pola mog± być użyte w celu "szybkiego" odbioru zamówienia, gdy pozycje były kupione lokalnie lub darowane. W tym wypadku ilo¶ć "zamówiona" zostanie wprowadzona do bazy jako ilo¶ć otrzymana.

 

--- NEW FILE ---

Wyniki wyszukiwania dostawców


Szukano dostawcy , znaleziono rezultat(y)(ów)

>
Zamów Odbierz Podmiot
Koszyk Pozycje Pracownik Data
/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
">


Dodaj dostawcę --- NEW FILE ---
Rachunek:
Otrzymany przez:

Receipt Summary for : , Rachunek

"> "> "> "> Szukaj ISBN lub tytuł:

">
KOSZYK ISBN TYTUŁ AUTOR FAKTYCZNY P&P IL SUMA
&biblio=&invoice=&gst=&freight=&id="> $ $
SUBTOTALS $ $
POMOC
The total at the bottom of the page should be within a few cents of the total for the invoice.

When you have finished this invoice save the changes.

GST $
TOTAL $
--- NEW FILE ---

Odbiór zamówień od dostawcy ">

>

INFORMACJE O RACHUNKU DOSTAWCY
Numer rachunku dostawcy
GST
Za przesyłkę
/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>

--- NEW FILE --- >

Uaktualnienie:

Dodaj dostawcę

Szczegóły podmiotu
Nazwa podmiotu ">
Adres pocztowy
Adres fizyczny
Telefon ">
Fax ">
Witryna ">
Dane kontaktowe
Nazwisko ">
Stanowisko ">
Telefon ">
Inny telefon ">
Fax ">
E-mail ">
Uwagi
/images/filesave.png" border=0 title="save" alt="save">
BIEŻˇCY STATUS
Dostawca jest checked>Active checked>Inactive
DANE O ZAMÓWIENIACH
Publishers and Imprints
List Prices are
Invoice Prices are
GST Registered checked>Yes checked>No
List Item Price Includes GST checked>Yes checked>No
Invoice Item Price Includes GST checked>Yes checked>No
Rabat > %
From kb2qzv at users.sourceforge.net Sat Oct 4 21:47:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:47:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25270 Modified Files: newbasket2.tmpl Log Message: minor corrections Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket2.tmpl 10 Jan 2003 22:04:42 -0000 1.1 --- newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 *************** *** 1,5 **** !

Nowy koszyk dla:

--- 1,5 ---- !

Koszyk dla:

From kb2qzv at users.sourceforge.net Sun Oct 5 20:51:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:51:48 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple isbnsearch.tmpl,1.3,1.4 marcimport.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4163 Modified Files: isbnsearch.tmpl marcimport.tmpl Log Message: update of code and translation Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** isbnsearch.tmpl 3 Feb 2003 05:36:43 -0000 1.3 --- isbnsearch.tmpl 5 Oct 2003 18:51:46 -0000 1.4 *************** *** 1,44 **** ! ! Rezultaty wyszukiwania opisu
! Szukano ISBN
! Trafienia od do wy¶wietlono -

! ! ! ! ! ! ! ! ! "> ! -
TYTUŁAUTOR©Pozycje
">Edycja...

- - &offset=&num="> - -

- Trafienia według stron: - &offset=&num=5">5 - &offset=&num=10">10 - &offset=&num=20">20 - &offset=&num=50">50 -

-
-

 

--- 1,104 ---- ! Rezultaty wyszukiwania opisu
! Szukałe¶ ISBN tytuł
! znaleziono
! Trafienia z wy¶wietlono

! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! ! !
Opisy w koha
! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! !
TytułAutor© 
">Dodaj pozycję">Edytuj...
Nic nie znaleziono
!
! ! ! ! !
Opisy w hurtowni opisów
! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
TytułAutorISBNpochodz±cy z  
! ">Dodaj opis
Nic nie znaleziono
    ">Dodaj nowy opis">Dodaj nowy opis
+
Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marcimport.tmpl 9 Jan 2003 11:27:22 -0000 1.1 --- marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 *************** *** 1,3 **** -

System akwizycji MARC

--- 1,2 ---- *************** *** 5,18 **** !
Importuj do farmy hodowlanej
!

Importuj wyniki :

    rekordy importowano

    nie importowano ponieważ już s± w bazie

    !

    nie importowano ponieważ już s± w farmie

    nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

    rekordów przeczytanych

    --- 4,17 ---- !
    Importuj do hurtowni opisów
    !

    Import wyniki :

      rekordy importowano

      nie importowano ponieważ już s± w bazie

      !

      nie importowano ponieważ już s± w hurtowni

      nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

      rekordów przeczytanych

      *************** *** 21,31 ****
        ! Wybierz plik, by importować go do farmy hodowlanej. Będzie przeczytany i dla każdego znalezionego numeru ISBN ! utworzone zostanie nowe "ciel±tko" w farmie. Je¶li ISBN już w farmie istnieje można zdecydować czy nowe ! powinno być zignorowane czy też stare nadpisane nowym.
        ! Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c ! pochodzenie sugerowanych danych MARC !
        ! Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha. !
      " enctype="multipart/form-data"> --- 20,28 ----
        !
      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w hurtowni.
        • !
      • Je¶li ISBN już w hurtowni istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
        • !
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
        • !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
        • !
      " enctype="multipart/form-data">
      *************** *** 43,47 **** ! --- 40,44 ---- ! From kb2qzv at users.sourceforge.net Sun Oct 5 20:57:18 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:57:18 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple marcimport.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4985 Modified Files: marcimport.tmpl Log Message: update of code and translation Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 --- marcimport.tmpl 5 Oct 2003 18:57:16 -0000 1.3 *************** *** 20,25 ****
        !
      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w hurtowni.
        • !
      • Je¶li ISBN już w hurtowni istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
        • --- 20,25 ----
          !
        • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w farmie.
          • !
        • Je¶li ISBN już w farmie istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
        • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
        • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
          • *************** *** 40,46 ****
      ! ! --- 40,52 ---- ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Oct 5 21:20:44 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 12:20:44 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv8858 Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl Log Message: first upload --- NEW FILE --- Dodaj nowy opis bibliograficzny
      Je¶li ISBN już jest w farmie : Odrzuć ten, zatrzymaj istniej±cy
      Zast±p istniej±cy nowym
      Je¶li ISBN już jest w hurtowni : Odrzuć ten, zatrzymaj istniej±cy
      Zast±p istniej±cy nowym
      Je¶li ISBN już jest w hurtowni : Odrzuć ten, zatrzymaj istniej±cy
      ! Zast±p istniej±cy nowym
      Character encoding (USMARC or UNIMARC) !
      !
      Je¶li ISBN już jest w hurtowni: Ignoruj to, zatrzymaj istniej±ce
      ! Nadpisz istniej±ce obecnym
      Sekcja Pierwsza: Informacje Copyright

      Proszę okre¶lić tytuł
      Tytuł: *
      Podtytuł:
      Autor:
      Tytuł serii:
      (je¶li dotyczy)
      Data Copyright:
      Abstract:
      Uwagi:
      * Wymagane pola --- NEW FILE --- test

      Musisz nadać pozycji kod kreskowy

      Musisz otworzyć now± grupę, do której dodana zostanie pozycja

      Niestety, ten kod jest już w użyciu

      REKORD BIBLIOGRAFICZNY
      Autor:
      Copyright:
      Tytuł serii:
      Uwagi:
      GRUPA -
      URL:
      Data:
      Uwagi:
      GRUPA -
      ISBN:
      Dewey:
      Wydawca:
      Miejsce:
      Data:
      Pozycja:
      Odział własny:
      Uwagi:

      ">
      DODAJ NOWˇ POZYCJĘ:
      Dla witryny dodaj tylko grupę
      Kod kreskowy pozycji:
      Oddział:
      Cena wymiany:
      Uwagi:
      Dodaj do istniej±cej grupy:
      Grupa:
      LUB dodaj do nowej grupy:
      Format:
      ISBN:
      Wydawca:
      Rok publikacji:
      Miejsce publikacji:
      Ilustrator:
      Dodatkowi autorzy:
      Każdy autor w osobnej linii
      Subject Headings:
      One Subject per line
      Witryna URL:
      Dewey:
      Dewey Subclass:
      ISSN:
      LCCN:
      Tom:
      Numer:
      Volume Description:
      Strony:
      Wymiary:
      Uwagi:
      From slef at users.sourceforge.net Sun Oct 5 23:27:08 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 05 Oct 2003 14:27:08 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.51,1.52 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv30966 Modified Files: Install.pm Log Message: add locale test (Closes: 576) and remove crap underlining Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** Install.pm 8 Sep 2003 13:36:00 -0000 1.51 --- Install.pm 5 Oct 2003 21:27:06 -0000 1.52 *************** *** 231,239 **** access some of the features of the intranet. ! IMPORTANT : ! ! ============ ! ! You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. --- 231,235 ---- access some of the features of the intranet. ! IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. *************** *** 719,722 **** --- 715,721 ---- if (@missing > 0) { my $missing=''; + if (POSIX::setlocale(LC_ALL) != "C") { + $missing.=" export LC_ALL=C\n"; + } foreach my $module (@missing) { $missing.=" perl -MCPAN -e 'install \"$module\"'\n"; *************** *** 878,886 **** Please provide a good password for the user %s. ! IMPORTANT : ! ! ============ - You can log in using this userid and password at any time. Password for database user %s: |; --- 877,882 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; From kb2qzv at users.sourceforge.net Mon Oct 6 00:44:04 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 15:44:04 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue catalogue-home.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv11000 Modified Files: catalogue-home.tmpl detail-opac.tmpl detail.tmpl Log Message: no message Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- catalogue-home.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 5,42 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -
      ! Wyszukiwanie w katalogu -
      - - -
      ! ! ! ! ! ! ! ! ! !
      Numer pozycji     OR
       
      HELP
      ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

      ! Catalogue ! Maintenance: To add a new biblio or item go to ! acquisitions.

      ! To request, modify or delete a biblio or item first search for it here.

      --- 5,33 ---- !

      Przeszukiwanie katalogu

      ! ! ! ! ! ! ! ! ! !
      Kod kreskowy     LUB
       
      ! ! POMOC
      ! Wyszukiwanie: Wypełnienie kilku pól w kwerendzie (np. Słowo kluczowe + autor + klasa) spowoduje wolniejsze wyszukiwanie.

      ! !

      *************** *** 44,64 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Słowa kluczowe
      Tytuł ZwykłeDokładne
      Autor
      Ilustrator
      Dewey
      Class ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Słowo kluczowe
      Tytuł ! Zwykłe ! Precyzyjne !
      Autor
      Ilustrator
      Dewey
      Class
      OR
      S
      ! ! ! !
      ! !

      ! Półki wirtualne ! ! --- 68,110 ----

      LUB
      Hasło przedm.
      ! ! ! ! ! ! !
      ! ! //images/2rightarrow.png" BORDER=0 > ! ! ! ! Półki wirtualne !
      !
      ! !

      !

      Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail-opac.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,13 **** - - - - -

      Zalogowany jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       - --- 1,4 ---- *************** *** 28,32 ****
      ! Podtytuł:
      Autor:
      --- 19,23 ----
      ! Podtytuł:
      Autor:
      *************** *** 40,44 **** W sumie pozycji:

      ! --- 31,35 ---- W sumie pozycji:

      ! *************** *** 51,55 **** Lokalizacja Termin zwrotu ! Wypożyczono? --- 42,46 ---- Lokalizacja Termin zwrotu ! Wypożyczono Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,69 **** - - ! ! ! ! ! ! > ! ! ! () !

      ! ! ! ! ! ! ! ! ! ! !
      ! REKORD BIBLIO ! ! ! ! ! !
      !
      ! "> ! ! !
      !
      ! ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło przedmiotowe:
      ! Copyright:
      ! Uwagi:
      ! Ujednolicony:
      ! Seria:
      ! W sumie pozycji: !

      ! !

      ! ! ! REKORD BIBLIO ! ! ! ! !

      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło:
      ! Copyright:
      ! Uwagi:
      ! Tytuł ujednol.:
      ! Seria:
      ! Całkowita liczba pozycji: !

      ! ! ! !

      ! /images/background-mem.gif"> *************** *** 28,33 **** --- 28,35 ---- *************** *** 36,48 ****
      Opis MARC :
      9
      		 "> !
      9
      		 + "> ! ! wyszukiwarka z3950
      !
      ! !
      ">"> -
        --- 38,52 ----
      !
      ! ! /images/background-mem.gif"> ! ! *************** *** 58,70 **** !
      ">"> - )">+
        * *************** *** 50,53 **** --- 54,58 ---- "> "> + "> ">
      ! ! --- 19,38 ---- From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail.tmpl 18 Sep 2003 13:28:59 -0000 1.5 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 *************** *** 19,59 ****

      ">"> -
        --- 63,77 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Sous-titre:
      ! Autres auteurs:
      ! Editeur
      ! Année:
      ! Périodique:
      ! URL :
      !
      ! Résumé:
      !
      ! Sujet:
      !
      ! Nombre d'exemplaires: !

      !

      ! Sous-titre: ! Auteur:
      ! Autre Auteur:
       ! Publié par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! Côte dewey :
      ! URL :
      ! Nbre d'exemplaires:
      ! ! ! ! ! ! ! !
      ! Notice biblio N° !
      !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">" class="button">MARC
      !
      !
      ! ! Sous-titre:
      ! Auteur: >
      ! Autre Auteur:
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre unique:
      ! Périodique:
      ! URL :
      ! Nbre total d'exemplaires: !

      !

      --- 19,52 ----

      ! ! ! ! ! ! !
      ! Notice N° !
      !
      " class="button">MARC

      ! ! Sous-titre: ! Auteur: >
      ! Autre Auteur:
       ! Publié par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! Côte dewey :
      ! URL :
      ! Nbre total d'exemplaires: !

      ! !

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** detail.tmpl 18 Sep 2003 07:38:22 -0000 1.7 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.8 *************** *** 23,50 **** !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! Subtitle:
      ! Author: >
      ! Additional Author:
      ! Series Title:
      ! Subject:
      ! Copyright:
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Total Number of Items:

      --- 23,44 ---- !
      " class="button">MARC

      ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items:

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.tmpl 8 May 2003 12:26:14 -0000 1.8 --- opac-detail.tmpl 14 Oct 2003 11:37:47 -0000 1.9 *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! BIBLIO RECORD ! ! !
      ! ! Subtitle:
      ! Author:
      ! Subject:
      ! Copyright:
      ! Total Number of Items: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      --- 16,80 ---- ! ! ! ! ! ! !
      ! BIBLIO RECORD ! !
      ! ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      From tipaul at users.sourceforge.net Tue Oct 14 14:36:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 05:36:38 -0700 Subject: [Koha-cvs] CVS: koha/misc cleanmarcdb.pl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25755/misc Added Files: cleanmarcdb.pl Log Message: script to clean MARC DB when a subfield is removed from the MARC editor : the subfield is NOT removed from DB (to avoid stupid loss of data). This script forever removes unused subfields from the DB. Quite fast script. --- NEW FILE --- #!/usr/bin/perl # small script that rebuilds the non-MARC DB use strict; # Koha modules used # use MARC::File::USMARC; use MARC::Record; use MARC::Batch; use C4::Context; use C4::Biblio; use Time::HiRes qw(gettimeofday); use Getopt::Long; my ( $input_marc_file, $number) = ('',0); my ($version, $confirm,$test_parameter); GetOptions( 'c' => \$confirm, 'h' => \$version, 't' => \$test_parameter, ); if ($version || (!$confirm)) { print < shows this screen) \t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long) \t-t => test only, change nothing in DB EOF ;#' die; } my $dbh = C4::Context->dbh; my $i=0; my $starttime = gettimeofday; my $cleansubfield = $dbh->prepare("delete from marc_subfield_table where tag=? and subfieldcode=?"); my $cleanword = $dbh->prepare("delete from marc_word where tag=? and subfieldid=?"); # get tags structure my $tags = MARCgettagslib($dbh,1); foreach my $tag (sort keys(%{$tags})) { foreach my $subfield (sort keys(%{$tags->{$tag}})) { next if $subfield eq "lib"; next if $subfield eq "mandatory"; next if $subfield eq "tab"; # DO NOT drop biblionumber, biblioitemnumber and itemnumber. # they are stored internally, and are mapped to tab -1. This script must keep them or it will completly break Koha DB !!! next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblio.biblionumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblioitems.biblioitemnumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "items.itemnumber"); # now, test => if field is ignored (in tab -1 or '') => drop everything in the MARC table ! if ($tags->{$tag}->{$subfield}->{tab} eq -1 || $tags->{$tag}->{$subfield}->{tab} eq '') { print "dropping $tag \$ $subfield\n"; $cleansubfield->execute($tag,$subfield) unless $test_parameter; $cleanword->execute($tag,$subfield) unless $test_parameter; print "TEST " if $test_parameter; print "done\n"; } } } my $timeneeded = gettimeofday - $starttime; print "done in $timeneeded seconds\n"; From rangi at users.sourceforge.net Thu Oct 16 22:36:28 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:28 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** circulation.tmpl 7 Aug 2003 12:41:59 -0000 1.9 --- circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 *************** *** 164,173 **** ! ! ! ! ! !

      --- 164,170 ---- !
      ! ! +
      *************** *** 222,226 **** --- 219,263 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Patron information
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Catégorie: +
      CHARGES> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CHARGES onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      WAITING + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      ODUESYes, See below
      NOTES
      + +



      From rangi at users.sourceforge.net Thu Oct 16 22:36:27 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:27 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/circ Modified Files: circulation.pl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** circulation.pl 24 Jul 2003 08:33:35 -0000 1.60 --- circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 *************** *** 297,300 **** --- 297,301 ---- firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, + categorycode => $borrower->{'categorycode'}, question => $question, barcode => $barcode, *************** *** 309,317 **** CGIselectborrower => $CGIselectborrower, - patrontable => $patrontable, - flaginfotable => $flaginfotable, - CHARGES => $flags->{'CHARGES'}, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); --- 310,315 ---- CGIselectborrower => $CGIselectborrower, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); *************** *** 367,425 **** my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; ! } } else { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag $flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } elsif ($flag eq 'WAITING') { ! my $itemswaiting=''; ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'} $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})
      \n"; } ! $flaginfotext.="$flag$itemswaiting\n"; ! } elsif ($flag eq 'ODUES') { ! my $items=$flags->{$flag}->{'itemlist'}; ! my $itemswaiting="\n"; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="\n"; ! } } ! $itemswaiting.="
      $iteminformation->{'date_due'}{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}$iteminformation->{'title'}
      \n"; ! if ($query->param('module') ne 'returns'){ ! $flaginfotext.="$flag$flags->{$flag}->{'message'}, See below\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; } - } else { - $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; - } } } - ($flaginfotext) && ($flaginfotext="Flags$flaginfotext\n"); - $flaginfotext.=""; - my $patrontable= << "EOF"; -

      - - - - EOF return($patrontable, $flaginfotext); } --- 365,436 ---- my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext; ! #my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { + warn $flag; + my @itemswaiting=''; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! $template->param( ! noissues => 'true', ! color => $color, ! ); ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); ! } } else { ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); } ! if ($flag eq 'WAITING') { ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'}; ! push @itemswaiting, $iteminformation; ! } ! $template->param( ! waiting => 'true', ! waitingmsg => $flags->{'WAITING'}->{'message'}, ! itemswaiting => \@itemswaiting, ! ); } ! if ($flag eq 'ODUES') { ! $template->param( ! odues => 'true', ! oduesmsg => $flags->{'ODUES'}->{'message'} ! ); ! ! my $items=$flags->{$flag}->{'itemlist'}; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! push @itemswaiting, $iteminformation; ! } ! } ! if ($query->param('module') ne 'returns'){ ! $template->param( nonreturns => 'true' ); ! } ! } ! if ($flag eq 'NOTES') { ! $template->param( ! notes => 'true', ! notesmsg => $flags->{'NOTES'}->{'message'} ! ); } } } return($patrontable, $flaginfotext); } From tipaul at users.sourceforge.net Fri Oct 17 12:02:59 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 17 Oct 2003 03:02:59 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.65,1.66 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv26914/C4 Modified Files: Biblio.pm Log Message: Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** Biblio.pm 14 Oct 2003 09:45:29 -0000 1.65 --- Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.66 2003/10/17 10:02:56 tipaul + # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. + # # Revision 1.65 2003/10/14 09:45:29 tipaul # adding rebuildnonmarc.pl script : run this script when you change a link between marc and non MARC DB. It rebuilds the non-MARC DB (long operation) *************** *** 1193,1197 **** foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>1 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { --- 1196,1200 ---- foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>2 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { From cauchoip at users.sourceforge.net Fri Oct 17 13:10:59 2003 From: cauchoip at users.sourceforge.net (Pierre Cauchois) Date: Fri, 17 Oct 2003 04:10:59 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3396 Modified Files: circulation.tmpl Log Message: fix for #436 on french default template Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** circulation.tmpl 22 Sep 2003 13:05:17 -0000 1.5 --- circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 *************** *** 163,172 **** ! ! ! ! ! !
      Patron Information
      - {'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}
      $borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'}
      --- 163,169 ---- !
      ! ! +
      *************** *** 221,225 **** --- 218,262 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Informations lecteur
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Catégorie: +
      Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
      Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      En attente + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      RetardsOui, voir ci-dessous
      Notes
      + +



      *************** *** 228,236 **** /images/background-mem.gif"> ! Todays Issues ! Due DateBar CodeTitleAuthorClass --- 265,273 ---- /images/background-mem.gif"> ! Emprunts du jour ! Retour pour leCode barreTitreAuteurClasse From tipaul at users.sourceforge.net Mon Oct 20 16:25:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 07:25:38 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.53,1.54 koha.upgrade,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7969/misc Modified Files: Install.pm koha.upgrade Log Message: koha.upgrade bugfixes. Should work... Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Install.pm 6 Oct 2003 09:10:39 -0000 1.53 --- Install.pm 20 Oct 2003 14:25:36 -0000 1.54 *************** *** 1772,1776 **** my %configfile; ! open (KC, "<$etcdir/koha.conf"); while () { chomp; --- 1772,1776 ---- my %configfile; ! open (KC, ") { chomp; *************** *** 1788,1799 **** } ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } --- 1788,1799 ---- } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** koha.upgrade 22 Jan 2003 03:45:39 -0000 1.4 --- koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 *************** *** 8,27 **** if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; - - loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } --- 8,24 ---- if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } *************** *** 37,41 **** This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? ([Y]/N): |; --- 34,38 ---- This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? (Y/[N]): |; *************** *** 43,64 **** chomp $answer; ! if ($answer =~/n/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; - - checkperlmodules(); - - my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; --- 40,57 ---- chomp $answer; ! unless ($answer =~/y/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; checkperlmodules(); my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; *************** *** 66,84 **** if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } } - } } --- 59,77 ---- if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } } } *************** *** 92,106 **** foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! )) { ! if ( -d $mysql ) { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! $mysqldir='/usr'; ! } my ($sec, $min, $hr, $day, $month, $year) = (localtime(time))[0,1,2,3,4,5]; --- 85,115 ---- foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <) { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } --- 128,136 ---- while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } *************** *** 129,133 **** close MD; - my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; --- 138,141 ---- *************** *** 194,198 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 202,206 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; *************** *** 272,275 **** --- 280,284 ---- /etc/apache-ssl/conf/apache.conf /etc/httpd/conf/httpd.conf + /etc/httpd/conf/commonhttpd.conf /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { *************** *** 362,366 **** unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); --- 371,375 ---- unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); *************** *** 382,387 **** ! open (KC, "/etc/koha.conf"); ! my $kccontents=''; my $kc; while () { --- 391,396 ---- ! ! my $kccontents='';open (KC, "/etc/koha.conf"); my $kc; while () { *************** *** 455,461 **** and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. - - [NOTE PERMISSIONS ARE NOT COMPLETED AS OF 1.2.3RC1. Do not give passwords to - any patrons unless you want them to have full access to your intranet.] |; print "Press the key to continue: "; --- 464,467 ---- *************** *** 469,473 **** = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. --- 475,480 ---- = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. From tipaul at users.sourceforge.net Mon Oct 20 17:45:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:45:00 -0700 Subject: [Koha-cvs] CVS: koha/marc deletemarc,1.1,NONE koha2marc,1.6,NONE marcschema.sql,1.16,NONE perlmarcstructure,1.4,NONE updatedb2marc.pl,1.6,NONE Message-ID: Update of /cvsroot/koha/koha/marc In directory sc8-pr-cvs1:/tmp/cvs-serv28788/marc Removed Files: deletemarc koha2marc marcschema.sql perlmarcstructure updatedb2marc.pl Log Message: removing outdated scripts. --- deletemarc DELETED --- --- koha2marc DELETED --- --- marcschema.sql DELETED --- --- perlmarcstructure DELETED --- --- updatedb2marc.pl DELETED --- From slef at users.sourceforge.net Mon Oct 20 18:13:03 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:13:03 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv4145 Modified Files: updatedatabase Log Message: Omitted annotation added. Closes: 624 Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 --- updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 *************** *** 646,649 **** --- 646,650 ---- } unless ( $existingtables{'z3950servers'} ) { + #MJR: added syntax entries to close bug 624 print "Adding z3950servers table...\n"; my $sti = $dbh->prepare( "create table z3950servers ( *************** *** 919,922 **** --- 920,926 ---- # $Log$ + # Revision 1.63 2003/10/20 16:13:01 slef + # Omitted annotation added. Closes: 624 + # # Revision 1.62 2003/10/20 16:10:19 slef # Adding USMARC to LOC z3950 entry From tipaul at users.sourceforge.net Mon Oct 20 18:27:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:27:00 -0700 Subject: [Koha-cvs] CVS: koha release_notes_200RC1.txt,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv6776 Added Files: release_notes_200RC1.txt Log Message: 1st draft of release notes for next public release --- NEW FILE --- RELEASE NOTES ============= this version of Koha is the 1st one of the 2.0.0 series in the "stable" tree. IT DOES NOT MEAN IT HAS NO BUGS. It means that at least 5 libraries are using it and they don't encounter unsolvable problems. If you want to adopt Koha, you're welcomed, but you're warned that this version still has some bugs and missing features. INSTALLATION ========== * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./installer.pl * follow the instructions. UPGRADE from previous 2.0.0preX version ======= * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. UPGRADE from previous 1.2.x version ======= This upgrade is possible with this release for the 1st time. EXPECT IT TO HAVE SOME BUGS SOMEWHERE. USE IT ONLY IF YOU KNOW HOW TO GO BACK TO PREVIOUS SITUATION. Otherwise, WAIT for 2.0.0RC2 or so. * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. * launch Koha * Go to Parameters >> Marc structure option and Koha-MARC links option. * Modify default MARC structure to fit your needs. * open a console/term * Enter : cd /path/to/koha/misc export PERL5LIB=/path/to/koha ./koha2marc.pl the old DB is "copied" in the new MARC one. Koha 2.0.0RC1 is ready. BUGFIXES/IMPROVEMENTS ======= BUGS FIXED : +++++++++ 619 : Visiting selectbranchprinter.pl automatically resets branch 618 : Add member process does not check for duplicate barcode 532 : Can't assign new password without changing UserID 599 : edited items are stored incorrectly in old Koha DB (aka : barcode non mandatory bug) 616 : MARCgetbiblio doesn't create leader 500 : [INTRANET]Only 21 items are displayed in the search result 595 : 'Add field' link in /acqui.simple/addbiblio.pl adds incorrect field. 622 : processz3950queue fails 576 : add install locale test 39 : Update Dirs in z3950 scripts 536 : bulkmarcimport.pl generates subtitle error 436 : circulation.pl only partially templated (this bug is partially fixed) IMPROVEMENTS +++++++++ * Polish version of Koha (courtesy of Benedykt) * some useful tools in misc directory to manage the DB * adding "fines" entry in parameters section : to manage fees when a book is returned too late * From tipaul at users.sourceforge.net Mon Oct 20 18:28:01 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:28:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import In directory sc8-pr-cvs1:/tmp/cvs-serv6956/koha-tmpl/intranet-tmpl/default/fr/import Modified Files: breeding.tmpl Log Message: Index: breeding.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** breeding.tmpl 4 Jun 2003 13:46:24 -0000 1.1 --- breeding.tmpl 20 Oct 2003 16:27:59 -0000 1.2 *************** *** 37,40 **** --- 37,46 ---- + encodage (MARC21 or UNIMARC) + +
      + + + Si l'ISBN existe déjà dans le réservoir : Ignorer celui-ci, conserver celui qui existe déjà
      From tipaul at users.sourceforge.net Mon Oct 20 17:42:45 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:42:45 -0700 Subject: [Koha-cvs] CVS: koha/misc koha2marc.pl,NONE,1.1 dumpmarc.pl,1.2,1.3 koha.upgrade,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv28325/misc Modified Files: dumpmarc.pl koha.upgrade Added Files: koha2marc.pl Log Message: Upgrade script : the koha2marc.pl copies the old DB into the new MARC one. This script must be executed when migrating from 1.2.x to 2.0.x. --- NEW FILE --- #!/usr/bin/perl use C4::Context; use CGI; use DBI; #use strict; use C4::Biblio; use C4::Output; use Getopt::Long; my ( $confirm,$delete); GetOptions( 'c' => \$confirm, 'd' => \$delete, ); my $dbh = C4::Context->dbh; if ($delete) { print "deleting MARC tables\n"; $dbh->do("delete from marc_biblio"); $dbh->do("delete from marc_subfield_table"); $dbh->do("delete from marc_blob_subfield"); $dbh->do("delete from marc_word"); } my $userid=$ENV{'REMOTE_USER'}; my $sthbiblioitem = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); my $sthitems = $dbh->prepare("select itemnumber from items where biblionumber=?"); my $sth=$dbh->prepare("select biblionumber from biblio"); $sth->execute; my $env; $env->{'marconly'}=1; my ($MARC, $biblionumber,$biblioitemnumber,$bibid); while (($biblionumber) = $sth->fetchrow) { print "Processing $biblionumber\n"; $sthbiblioitem->execute($biblionumber); ($biblioitemnumber) = $sthbiblioitem->fetchrow; $MARC = &MARCkoha2marcBiblio($dbh,$biblionumber,$biblioitemnumber); $bibid = &MARCaddbiblio($dbh,$MARC,$biblionumber); # now, search items, and add them... $sthitems->execute($biblionumber); while (($itemnumber) = $sthitems->fetchrow) { $MARC = &MARCkoha2marcItem($dbh,$biblionumber,$itemnumber); &MARCadditem($dbh,$MARC,$biblionumber); } } Index: dumpmarc.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/dumpmarc.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dumpmarc.pl 21 May 2003 14:19:32 -0000 1.2 --- dumpmarc.pl 20 Oct 2003 15:42:43 -0000 1.3 *************** *** 40,41 **** --- 40,42 ---- $i++; } + print "\n==================\n$i record parsed\n"; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 --- koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 *************** *** 492,495 **** --- 492,507 ---- You may also need to uncomment a "LoadModules env_module ... " line and restart Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) Please report any problems you encounter through http://bugs.koha.org/ From slef at users.sourceforge.net Mon Oct 20 18:10:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:10:21 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv3778 Modified Files: updatedatabase Log Message: Adding USMARC to LOC z3950 entry Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 --- updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 *************** *** 656,660 **** id int, checked smallint, ! rank int)" ); $sti->execute; --- 656,661 ---- id int, checked smallint, ! rank int, ! syntax char(80))" ); $sti->execute; *************** *** 665,669 **** '', '', 'Library of Congress', ! 1, 1, 1)" ); $sti->execute; --- 666,670 ---- '', '', 'Library of Congress', ! 1, 1, 1, 'USMARC')" ); $sti->execute; *************** *** 918,921 **** --- 919,925 ---- # $Log$ + # Revision 1.62 2003/10/20 16:10:19 slef + # Adding USMARC to LOC z3950 entry + # # Revision 1.61 2003/10/01 15:03:45 tipaul # oups... typo fix in z3950random field definition From slef at users.sourceforge.net Mon Oct 20 21:16:52 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:52 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.54,1.55 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7426/misc Modified Files: Install.pm Log Message: Work on install bugs (see bug 632) Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** Install.pm 20 Oct 2003 14:25:36 -0000 1.54 --- Install.pm 20 Oct 2003 19:16:50 -0000 1.55 *************** *** 958,965 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on %s/koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. Enter the Apache userid: |; --- 958,966 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; *************** *** 978,982 **** /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf --- 979,983 ---- /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache2.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf *************** *** 1068,1072 **** NOTE: You will need to add lines to your main httpd.conf to ! Include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). --- 1069,1073 ---- NOTE: You will need to add lines to your main httpd.conf to ! include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). *************** *** 1192,1196 **** startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf"`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; --- 1193,1197 ---- startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf" 2>/dev/null`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; *************** *** 1418,1422 **** #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\n"; close(FILE); --- 1419,1423 ---- #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf"; close(FILE); *************** *** 1772,1776 **** my %configfile; ! open (KC, ") { chomp; --- 1773,1778 ---- my %configfile; ! #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. ! open (KC, "<$etcdir/koha.conf"); while () { chomp; From slef at users.sourceforge.net Mon Oct 20 21:16:53 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:53 -0700 Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-shell.sh,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv7426/z3950 Modified Files: z3950-daemon-shell.sh Log Message: Work on install bugs (see bug 632) Index: z3950-daemon-shell.sh =================================================================== RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-shell.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** z3950-daemon-shell.sh 6 Oct 2003 09:10:39 -0000 1.3 --- z3950-daemon-shell.sh 20 Oct 2003 19:16:50 -0000 1.4 *************** *** 35,42 **** --- 35,48 ---- export PERL5LIB + KOHA_CONF=$KohaConf + export KOHA_CONF + exec $KohaZ3950Script $LogDir >>$LOGFILE 2>&1 #------------------- # $Log$ + # Revision 1.4 2003/10/20 19:16:50 slef + # Work on install bugs (see bug 632) + # # Revision 1.3 2003/10/06 09:10:39 slef # Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.15,1.16 marctagstructure.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** authorised_values.tmpl 4 Jul 2003 14:03:44 -0000 1.15 --- authorised_values.tmpl 21 Oct 2003 15:47:07 -0000 1.16 *************** *** 76,90 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 76,96 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.18 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.19 *************** *** 132,137 **** ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> --- 132,149 ---- ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/admin authorised_values.pl,1.10,1.11 marctagstructure.pl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv22352/admin Modified Files: authorised_values.pl marctagstructure.pl Log Message: fix for #577 Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** authorised_values.pl 24 Jun 2003 10:26:17 -0000 1.10 --- authorised_values.pl 21 Oct 2003 15:47:07 -0000 1.11 *************** *** 66,70 **** debug => 1, }); ! my $pagesize=20; my $op = $input->param('op'); --- 66,70 ---- debug => 1, }); ! my $pagesize=5; my $op = $input->param('op'); *************** *** 188,198 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => ""); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => ""); ! ! } } #---- END $OP eq DEFAULT --- 188,203 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT Index: marctagstructure.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** marctagstructure.pl 1 Aug 2003 14:23:52 -0000 1.16 --- marctagstructure.pl 21 Oct 2003 15:47:07 -0000 1.17 *************** *** 193,201 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => "'); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => "'); } } #---- END $OP eq DEFAULT --- 193,208 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters authorised_values.tmpl,1.5,1.6 marctagstructure.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** authorised_values.tmpl 4 Jul 2003 14:04:02 -0000 1.5 --- authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 *************** *** 81,95 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 81,101 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.6 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 *************** *** 154,159 **** //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! //images/1leftarrow.png" title="Prec" ALT="Prec" BORDER=0 >       ! //images/1rightarrow.png" title="Suivant" ALT="Suivant" BORDER=0> --- 154,171 ---- //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From rangi at users.sourceforge.net Wed Oct 22 22:20:50 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:20:50 -0700 Subject: [Koha-cvs] CVS: koha updatebibitem.pl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv23486 Modified Files: updatebibitem.pl Log Message: Fix for bug 591 Index: updatebibitem.pl =================================================================== RCS file: /cvsroot/koha/koha/updatebibitem.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** updatebibitem.pl 13 Oct 2002 07:35:50 -0000 1.11 --- updatebibitem.pl 22 Oct 2003 20:20:48 -0000 1.12 *************** *** 22,26 **** use CGI; use strict; ! use C4::Acquisitions; use C4::Output; use C4::Search; --- 22,26 ---- use CGI; use strict; ! use C4::Biblio; use C4::Output; use C4::Search; From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/circ Modified Files: circulation.pl Log Message: moving more html out of the script Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 --- circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 *************** *** 156,162 **** # HTML code.... ! my $responsesform = ''; foreach (keys %responses) { ! $responsesform.="\n"; } my $questionform; --- 156,166 ---- # HTML code.... ! my %responseform; ! my @responsearray; foreach (keys %responses) { ! # $responsesform.="\n"; ! $responseform{'name'}=$_; ! $responseform{'value'}=$responses{$_}; ! push @responsearray,\%responseform; } my $questionform; *************** *** 290,294 **** printername => $printers->{$printer}->{'printername'}, allowborrow =>$allowborrow, - #question form question => $question, --- 294,297 ---- *************** *** 305,316 **** yearoptions => $yearoptions, stickyduedate => $stickyduedate, - responseform => $responsesform, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, - amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues ); --- 308,318 ---- yearoptions => $yearoptions, stickyduedate => $stickyduedate, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues, ! responseloop => \@responsearray ); From slef at users.sourceforge.net Wed Oct 22 16:48:10 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Wed, 22 Oct 2003 07:48:10 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.55,1.56 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25043 Modified Files: Install.pm Log Message: A lot of wording rewritten Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** Install.pm 20 Oct 2003 19:16:50 -0000 1.55 --- Install.pm 22 Oct 2003 14:48:08 -0000 1.56 *************** *** 122,151 **** my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing setup.\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! Welcome to the Koha install script! This script will prompt you for some ! basic information about your desired setup, then install Koha for you. ! ! If you want to install the Koha configuration file somewhere other than /etc ! (eg for non-root installation, or multiple Koha versions on one system), you ! should set the etcdir and prefix environment variables. If this is your ! only koha installation on this machine and you are running this as root, the ! default should be OK. ! ! To accept the default value for any question, simply hit Enter at the prompt. ! ! Please be sure to read the documentation, or visit the Koha website at ! http://www.koha.org for more information. Are you ready to begin the installation? ([Y]/N): |; $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING WARNING WARNING WARNING WARNING ! ! You are about to install Koha version %s. This version of Koha is a ! release candidate. It is not intended to be installed on production systems. It is being released so that users can test it before we release a final ! version. Are you sure you want to install Koha %s? (Y/[N]): |; --- 122,153 ---- my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing...\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! This program will ask some questions and try to install koha for you. ! You need to know: where most koha files should be stored (you can set ! the prefix environment variable for this); the username and password of ! a mysql superuser; and details of your library setup. You may also need ! to know details of your Apache setup. ! ! If you want to install the Koha configuration files somewhere other than ! /etc (for multiple Koha versions on one system, for example), you should ! set the etcdir environment variable. Please look at your manuals for ! details of how to set that. ! ! Recommended answers are given in brackets after each question. To accept ! the default value for any question (indicated by []), simply hit Enter ! at the prompt. Are you ready to begin the installation? ([Y]/N): |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING: You are about to install Koha version %s. This is a ! release candidate, not intended for production systems. It is being released so that users can test it before we release a final ! version and report bugs to us. ! ! Most people should answer Yes here. Are you sure you want to install Koha %s? (Y/[N]): |; *************** *** 168,182 **** perl -MCPAN -e 'install Net::Z3950' ! IMPORTANT NOTE : If you use PERL5.8.0 (RedHat 8.0 or Mandrake 9.x), you MUST install ! manually the Net::Z3950 and edit Makefile.PL and yazwrap/Makefile.PL to include: 'DEFINE' => '-D_GNU_SOURCE', Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting the following line in yazwrap/ywpriv.h : ! #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL & MODULES') . qq| Checking perl modules ... |; --- 170,187 ---- perl -MCPAN -e 'install Net::Z3950' ! ...or by installing packages for your distribution, if available. ! ! IMPORTANT NOTE : If you use Perl 5.8.0, you might need to ! edit NET::Z3950's Makefile.PL and yazwrap/Makefile.PL to include: ! 'DEFINE' => '-D_GNU_SOURCE', + Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting in yazwrap/ywpriv.h a line saying #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL MODULES') . qq| Checking perl modules ... |; *************** *** 187,191 **** You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They can be installed by running (as root) the following: %s --- 192,196 ---- You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They may be installed by running (as root) the following: %s *************** *** 193,197 **** $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('ALL PERL MODULES INSTALLED') . qq| All mandatory perl modules are installed. --- 198,202 ---- $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('PERL MODULES AVAILABLE') . qq| All mandatory perl modules are installed. *************** *** 201,206 **** $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists ! already). If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. --- 206,211 ---- $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists). ! If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. *************** *** 215,240 **** $messages->{'GetIntranetDir'}->{en} = ! heading('INTRANET/LIBRARIANS DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Intranet/Librarians files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('KOHA LOG DIRECTORY') . qq| ! Specify a log directory where any Koha daemons can create log files. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" module to add passwords for other accounts and set their permissions. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('KOHA INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! --- 220,245 ---- $messages->{'GetIntranetDir'}->{en} = ! heading('LIBRARIAN DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Librarian interface files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('LOG DIRECTORY') . qq| ! Specify a directory where log files will be written. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. ! You will be required to log in to ! access some features. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" screen to add passwords for other accounts and set their flags. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! *************** *** 242,254 **** http://%s\:%s/ - use mysql login and password to connect to this interface. Then, go to admin page, and create whatever fits your needs. ! and the OPAC interface at : ! http://%s\:%s/ ! Be sure to read the Hints file. ! For more information visit http://www.koha.org Press to exit the installer: |; --- 247,258 ---- http://%s\:%s/ ! use the koha admin mysql login and password to connect to this interface. ! and the OPAC interface at: ! http://%s\:%s/ ! Please read the Hints file and visit http://www.koha.org Press to exit the installer: |; *************** *** 749,764 **** $messages->{'NoUsrBinPerl'}->{en} = ! heading('Perl is not located in /usr/bin/perl') . qq| ! The Koha perl scripts expect to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable: [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! The Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! May I create this symlink? ([Y]/N): ! : |; $messages->{'DirFailed'}->{en} = RED.qq| --- 753,769 ---- $messages->{'NoUsrBinPerl'}->{en} = ! heading('No /usr/bin/perl') . qq| ! Koha expects to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! Some Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! Most users should answer Y here. ! ! May I try to create this symlink? ([Y]/N):|; $messages->{'DirFailed'}->{en} = RED.qq| *************** *** 854,874 **** =cut ! $messages->{'DatabaseName'}->{en} = heading('Name of MySQL database') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the hostname for mysql. Unless the database is located on ! another machine this will be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! Please provide the name of the user who will have full administrative rights ! to the %s database, when authenticating from %s. ! This user will also be used to access Koha's INTRANET interface. Database user [%s]: |; --- 859,882 ---- =cut ! $messages->{'DatabaseName'}->{en} = heading('Database Name') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. + Most users give a short single-word name for their library here. + Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the mysql server name. Unless the database is stored on ! another machine, this should be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! We are going to create a new mysql user for Koha. This user will have full administrative rights ! to the database called %s when they connect from %s. ! This is also the name of the Koha librarian superuser. ! Most users give a single-word name here. Database user [%s]: |; *************** *** 877,881 **** Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; --- 885,889 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this user and password at any time. Password for database user %s: |; *************** *** 937,946 **** $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES') . qq| I found more than one possible Apache configuration file: %s ! Choose the correct file [1]: |; $messages->{'NoApacheConfFiles'}->{en} = --- 945,954 ---- $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES FOUND') . qq| I found more than one possible Apache configuration file: %s ! Enter number of the file to read [1]: |; $messages->{'NoApacheConfFiles'}->{en} = *************** *** 948,954 **** I was not able to find your Apache configuration file. ! The file is usually called httpd.conf or apache.conf. ! Please specify the location of your config file: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| --- 956,962 ---- I was not able to find your Apache configuration file. ! The file is usually called httpd.conf, apache.conf or similar. ! Please enter the full name, starting with /: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| *************** *** 958,970 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of ! %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USERID') . qq| The userid %s is not a valid userid on this system. --- 966,978 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. ! This is used to set up access permissions for ! %s/koha.conf. This user should be set in one of the Apache configuration. ! Please try to find it and enter the user name below. You might find ! that "ps u|grep apache" will tell you. It probably is NOT "root". Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| The userid %s is not a valid userid on this system. *************** *** 1061,1070 **** heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and LIBRARIAN virtual hosts. By default this installer ! will do this by using one ip address and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf detailing ! what these other options are. NOTE: You will need to add lines to your main httpd.conf to --- 1069,1077 ---- heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and Librarian sites. By default this installer ! will do this by using one name and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf about them. NOTE: You will need to add lines to your main httpd.conf to *************** *** 1076,1087 **** $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB SERVER E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for the virtual hosts (this ! address is displayed if any errors are encountered). E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB SERVER HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. --- 1083,1094 ---- $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for Koha. This ! address is displayed if fatal errors are encountered. E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. *************** *** 1089,1102 **** Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC VIRTUAL HOST PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content from this host, you should change it ! to a different port (8000 might be a good choice). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('INTRANET VIRTUAL HOST PORT') . qq| ! Please enter the port for your Intranet interface. This must be different from the OPAC port (%s). --- 1096,1109 ---- Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content with this hostname, you should change it ! to a different port (8000 might be a good choice, but check any firewalls). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('LIBRARIAN PORT') . qq| ! Please enter the port for your Librarian interface. This must be different from the OPAC port (%s). *************** *** 1155,1160 **** heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find statements for them in your config. Please ! make sure that they are enabled for your Koha host. Press to continue: |; --- 1162,1167 ---- heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find them in your config. Please ! make sure that they are enabled for your Koha site. Press to continue: |; *************** *** 1163,1168 **** $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha ! Virtual Hosts. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache --- 1170,1174 ---- $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache *************** *** 1279,1293 **** $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('INTRANET AUTHENTICATION') . qq| ! I can set it up so that the Intranet/Librarian site is password protected using ! Apache's Basic Authorization. ! This is going to be phased out very soon. However, setting this up can provide ! an extra layer of security before the new authentication system is completely ! in place. ! Would you like to do this ([Y]/N): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a userid for intranet access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; --- 1285,1297 ---- $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('LIBRARIAN AUTHENTICATION') . qq| ! The Librarian site can be password protected using ! Apache's Basic Authorization instead of Koha user details. ! This method going to be phased out very soon. Most users should answer N here. ! Would you like to do this (Y/[N]): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a username for librarian access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; *************** *** 1295,1299 **** sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'y'); my $httpdconf = $etcdir."/koha-httpd.conf"; --- 1299,1303 ---- sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'n'); my $httpdconf = $etcdir."/koha-httpd.conf"; *************** *** 1441,1445 **** $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To allow us to create the koha database please enter your mysql server's root user password: --- 1445,1449 ---- $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To create the koha database, please enter your mysql server's root user password: *************** *** 1454,1466 **** heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, I have a batch of sample ! data that you can install now. ! If you are installing Koha with the intention of populating it with your own data, you probably don't want this sample data installed. --- 1458,1470 ---- heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, ! you can install some sample data now. ! If you are installing Koha to use your own data, you probably don't want this sample data installed. *************** *** 1473,1477 **** http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at +irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: --- 1477,1481 ---- http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: *************** *** 1483,1487 **** $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to install an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; --- 1487,1491 ---- $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to describe an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; *************** *** 1564,1569 **** $messages->{'UpdateMarcTables'}->{en} = ! heading('UPDATING MARC FIELD DEFINITION TABLES') . qq| ! You can import marc parameters for : 1 MARC21 --- 1568,1573 ---- $messages->{'UpdateMarcTables'}->{en} = ! heading('MARC FIELD DEFINITIONS') . qq| ! You can import MARC settings for: 1 MARC21 *************** *** 1571,1593 **** N none ! Please choose which parameter you want to install. Note if you choose N, ! nothing will be added, and it can be a BIG job to manually create those tables Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq| This version of koha supports a few languages. - Enter your language preference : either en, fr, es, pl or zh_TW ! Note that the en is always choosen when the system does not finds the ! language you choose in a specific screen. ! fr : all is translated (except pictures) ! es : a few intranet is translated (including pictures) ! pl : OPAC and a few intranet is translated ! zh_TW : partial translation ! Whether you specify a language here, you can always go to the ! intranet interface and change it from the system preferences. Which language do you choose? |; --- 1575,1598 ---- N none ! NOTE: If you choose N, ! nothing will be added, and you must create them all yourself. ! Only choose N if you want to use a MARC format not listed here, ! such as DANMARC. We would like to hear from you if you do. Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGE') . qq| This version of koha supports a few languages. ! en : default language, all pages available ! fr : complete translation (except pictures) ! es : partial librarian site translation (including pictures) ! pl : complete OPAC and partial librarian translation ! zh_TW : partial translation ! en is used when a screen is not available in your language ! If you specify a language here, you can still ! change it from the system preferences screen in the librarian sit. Which language do you choose? |; From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Thu Oct 23 22:33:55 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:33:55 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.63,1.64 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv8901/updater Modified Files: updatedatabase Log Message: Making the borrowenumber an auto_increment field Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -r1.63 -r1.64 *** updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 --- updatedatabase 23 Oct 2003 20:33:53 -0000 1.64 *************** *** 801,804 **** --- 801,807 ---- $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"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 920,923 **** --- 923,929 ---- # $Log$ + # Revision 1.64 2003/10/23 20:33:53 rangi + # Making the borrowenumber an auto_increment field + # # Revision 1.63 2003/10/20 16:13:01 slef # Omitted annotation added. Closes: 624 From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: moving more html out of the script Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 --- circulation.tmpl 22 Oct 2003 20:01:28 -0000 1.11 *************** *** 79,83 **** > > ! --- 79,85 ---- > > ! ! " value=""> ! *************** *** 95,99 **** > > ! --- 97,103 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:18:36 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:18:36 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv29298/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: circulation.tmpl Log Message: syn'ching chris commits Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 --- circulation.tmpl 25 Oct 2003 08:18:34 -0000 1.7 *************** *** 78,82 **** > > ! --- 78,84 ---- > > ! ! " value=""> ! *************** *** 94,98 **** > > ! --- 96,102 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:46:31 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:46:31 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.66,1.67 Breeding.pm,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv32447/C4 Modified Files: Biblio.pm Breeding.pm Log Message: minor fixes for bilbio deletion (still buggy) Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 --- Biblio.pm 25 Oct 2003 08:46:27 -0000 1.67 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.67 2003/10/25 08:46:27 tipaul + # minor fixes for bilbio deletion (still buggy) + # # Revision 1.66 2003/10/17 10:02:56 tipaul # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. *************** *** 1827,1831 **** sub OLDdelbiblio{ my ($dbh,$biblio)=@_; - # my $dbh=C4Connect; my $query="select * from biblio where biblionumber=$biblio"; my $sth=$dbh->prepare($query); --- 1830,1833 ---- *************** *** 1839,1843 **** } $query=~ s/\,$/\)/; - # print $query; $sth=$dbh->prepare($query); $sth->execute; --- 1841,1844 ---- *************** *** 1849,1853 **** } $sth->finish; - # $dbh->disconnect; } --- 1850,1853 ---- *************** *** 2126,2129 **** --- 2126,2131 ---- my $dbh = C4::Context->dbh; &OLDdelbiblio($dbh,$biblio); + my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblio); + &MARCdelbiblio($dbh,$bibid,0); } Index: Breeding.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Breeding.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Breeding.pm 8 Sep 2003 08:42:40 -0000 1.3 --- Breeding.pm 25 Oct 2003 08:46:28 -0000 1.4 *************** *** 72,75 **** --- 72,76 ---- for (my $i=0;$i<=$#marcarray;$i++) { my $marcrecord = MARC::File::USMARC::decode($marcarray[$i]."\x1D"); + my @warnings = $marcrecord->warnings(); if (ref($marcrecord) eq undef) { $notmarcrecord++; From tipaul at users.sourceforge.net Sat Oct 25 10:50:41 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:50:41 -0700 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_700_701_702.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1:/tmp/cvs-serv388/value_builder Modified Files: unimarc_field_700_701_702.pl Log Message: bugfix : use of '$var' instead of ? in sql statement Index: unimarc_field_700_701_702.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_700_701_702.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** unimarc_field_700_701_702.pl 27 Feb 2003 16:58:03 -0000 1.4 --- unimarc_field_700_701_702.pl 25 Oct 2003 08:50:39 -0000 1.5 *************** *** 122,127 **** if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST ('$search_string') and category ='NP'"); ! $sti->execute; while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; --- 122,127 ---- if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST (?) and category ='NP'"); ! $sti->execute($search_string); while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From slef at users.sourceforge.net Sun Oct 26 13:21:16 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 04:21:16 -0800 Subject: [Koha-cvs] CVS: koha/misc koha.upgrade,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv12088 Modified Files: koha.upgrade Log Message: Initial changes so that I can test. /etc still hardcoded. z3950 installation buggy. Really needs merge with Install.pm, which I will nw start on. Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 --- koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 *************** *** 7,15 **** $::language='en'; - if ($<) { - print "\n\nYou must run koha.upgrade as root.\n\n"; - exit; - } - ############################################### # SET THE etcdir ENVIRONMENT VAR INSTEAD # --- 7,10 ---- *************** *** 60,64 **** checkperlmodules(); ! my $backupdir='/usr/local/koha/backups'; print "Please specify a backup directory [$backupdir]: "; --- 55,59 ---- checkperlmodules(); ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; print "Please specify a backup directory [$backupdir]: "; *************** *** 189,193 **** OPAC: $::opacdir ! INTRANET: $::intranetdir --- 184,188 ---- OPAC: $::opacdir ! LIBRARIAN: $::intranetdir *************** *** 210,214 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 205,209 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; $answer = ; *************** *** 306,310 **** I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! /etc/koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; --- 301,305 ---- I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; *************** *** 470,474 **** using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; --- 465,469 ---- using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; From slef at users.sourceforge.net Sun Oct 26 14:21:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 05:21:21 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.57,1.58 koha.upgrade,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv23111 Modified Files: Install.pm koha.upgrade Log Message: first part of upgrade merge: some FIXMEs and testing to do Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** Install.pm 25 Oct 2003 09:53:54 -0000 1.57 --- Install.pm 26 Oct 2003 13:21:19 -0000 1.58 *************** *** 71,74 **** --- 71,75 ---- &populatedatabase &restartapache + &backupkoha &finalizeconfigfile &loadconfigfile *************** *** 142,145 **** --- 143,160 ---- Are you ready to begin the installation? ([Y]/N): |; + $messages->{'WelcomeToUpgrader'}->{en} = + heading('Welcome to the Koha Upgrader') . qq| + You are attempting to upgrade from Koha %s to %s. + + We recommend that you do a complete backup of all your files before upgrading. + This upgrade script will make a backup copy of your files for you. + + Would you like to proceed? (Y/[N]):|; + + $messages->{'AbortingInstall'}->{en} = + heading('ABORTING') . qq| + Aborting as requested. Please rerun when you are ready. + |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| *************** *** 258,261 **** --- 273,312 ---- Press to exit the installer: |; + $messages->{'UpgradeCompleted'}->{en} = heading('UPGRDE COMPLETE') . qq| + Congratulations ... your Koha upgrade is finished! + + If you are upgrading from a version of Koha + prior to 1.2.1, it is likely that you will have to modify your Apache + configuration to point it to the new files. + + In your INTRANET VirtualHost section you should have: + DocumentRoot $::intranetdir/htdocs + ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + In the OPAC VirtualHost section you should have: + DocumentRoot $::opacdir/htdocs + ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + You may also need to uncomment a "LoadModules env_module ... " line and restart + Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) + + Please report any problems you encounter through http://bugs.koha.org/ + + Press to exit the installer: |; + sub releasecandidatewarning { my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]); *************** *** 668,671 **** --- 719,788 ---- } + =item checkpaths + + checkpaths; + + Make sure that we loaded the right dirs from an old koha.conf + + =cut + + #FIXME: update to use Install.pm + sub checkpaths { + if ($opacdir && $intranetdir) { + print qq| + + I believe that your old files are located in: + + OPAC: $opacdir + LIBRARIAN: $intranetdir + + + Does this look right? ([Y]/N): + |; + $answer = ; + chomp $answer; + + if ($answer =~/n/i) { + $intranetdir=''; + $opacdir=''; + } else { + print "Great! continuing upgrade... \n"; + } + } + + if (!$opacdir || !$intranetdir) { + $intranetdir=''; + $opacdir=''; + while (!$intranetdir) { + print "Please specify the location of your LIBRARIAN files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $intranetdir=$answer; + } + if (! -e "$intranetdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $intranetdir=''; + } + } + while (!$opacdir) { + print "Please specify the location of your OPAC files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $opacdir=$answer; + } + if (! -e "$opacdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $opacdir=''; + } + } + } + + } =item checkperlmodules *************** *** 1363,1366 **** --- 1480,1484 ---- #MJR: preserve old files, just in case + #FIXME: use dated backups sub neatcopy { my $desc = shift; *************** *** 1612,1615 **** --- 1730,1734 ---- } + #FIXME: do not ask if we are upgrading from a MARC-ready system my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); *************** *** 1731,1734 **** --- 1850,1987 ---- } + =item backupkoha + + backupkoha; + + This function attempts to back up all koha's details. + + =cut + + #FIXME: rewrite to use Install.pm + sub backupkoha { + my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; + print "Please specify a backup directory [$backupdir]: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $backupdir=$answer; + } + + if (! -e $backupdir) { + my $result=mkdir ($backupdir, oct(770)); + if ($result==0) { + my @dirs = split(m#/#, $backupdir); + my $checkdir=''; + foreach (@dirs) { + $checkdir.="$_/"; + unless (-e "$checkdir") { + mkdir($checkdir, 0775); + } + } + } + } + + chmod 0770, $backupdir; + + # Backup MySql database + # + # + my $mysql; + my $mysqldir; + + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + print "I don't see mysql in the usual places.\n"; + for (;;) { + print "Where have you installed mysql? "; + chomp($mysqldir = ); + last if -f "$mysqldir/bin/mysqladmin"; + print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); + + my $itemcounter=0; + my $bibliocounter=0; + my $biblioitemcounter=0; + my $membercounter=0; + + while () { + (/insert into items /i) && ($itemcounter++); + (/insert into biblioitems /i) && ($biblioitemcounter++); + (/insert into biblio /i) && ($bibliocounter++); + (/insert into borrowers /i) && ($membercounter++); + print BF $_; + } + + close BF; + close MD; + + my $filels=`ls -hl $backupdir/Koha.backup_$date`; + chomp $filels; + printf qq| + + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + $filels + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): + |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; + + $answer = ; + chomp $answer; + + if ($answer=~/^n/i) { + print qq| + + Aborting. The database dump is located in: + + $backupdir/Koha.backup_$date + + |; + exit; + } else { + print "Great! continuing upgrade... \n"; + }; + + + + } =item finalizeconfigfile *************** *** 1775,1778 **** --- 2028,2032 ---- #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. + #FIXME: make a dated backup open (KC, "<$etcdir/koha.conf"); while () { *************** *** 1791,1802 **** } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } --- 2045,2057 ---- } ! #MJR: Reverted this too. You do not mess with my privates. Please ask for new functions if required. ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } *************** *** 1846,1851 **** =head1 SEE ALSO ! buildrelease.pl, installer.pl =cut --- 2101,2107 ---- =head1 SEE ALSO ! buildrelease.pl installer.pl + koha.upgrade =cut Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 --- koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 *************** *** 10,22 **** # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! my $etcdir = $ENV{etcdir}||'/etc'; ! system("mkdir -p $etcdir"); ! ! Install::setetcdir $etcdir; my $input; loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; --- 10,18 ---- # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! Install::setetcdir($ENV{etcdir}||'/etc'); my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; *************** *** 26,51 **** } ! print qq| ! ! ================ ! = Koha Upgrade = ! ================ ! ! You are attempting to upgrade from Koha $::kohaversion to $::newversion. ! ! We recommend that you do a complete backup of all your files before upgrading. ! This upgrade script will make a backup copy of your files for you. ! ! Would you like to proceed? (Y/[N]): ! |; ! ! my $answer = ; ! chomp $answer; unless ($answer =~/y/i) { ! print qq| ! ! Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. ! |; exit; } else { --- 22,30 ---- } ! #FIXME: need kohaversion number ! showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn'); unless ($answer =~/y/i) { ! showmessage(getmessage('AbortingInstall'),'PressEnter'); exit; } else { *************** *** 54,514 **** checkperlmodules(); ! ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $backupdir=$answer; ! } ! ! if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0770, $backupdir; ! ! # Backup MySql database # ! # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); ! ! my $itemcounter=0; ! my $bibliocounter=0; ! my $biblioitemcounter=0; ! my $membercounter=0; ! ! while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; ! } ! ! close BF; ! close MD; ! ! my $filels=`ls -hl $backupdir/Koha.backup_$date`; ! chomp $filels; ! printf qq| ! ! Backed up: ! ! %6d biblio entries ! %6d biblioitems entries ! %6d items entries ! %6d borrowers ! ! File Listing ! --------------------------------------------------------------------- ! $filels ! --------------------------------------------------------------------- ! ! Does this look right? ([Y]/N): ! |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; ! ! $answer = ; ! chomp $answer; ! ! if ($answer=~/^n/i) { ! print qq| ! ! Aborting. The database dump is located in: ! ! $backupdir/Koha.backup_$date ! ! |; ! exit; ! } else { ! print "Great! continuing upgrade... \n"; ! }; ! ! ! ! if ($::opacdir && $::intranetdir) { ! print qq| ! ! I believe that your old files are located in: ! ! OPAC: $::opacdir ! LIBRARIAN: $::intranetdir ! ! ! Does this look right? ([Y]/N): ! |; ! $answer = ; ! chomp $answer; ! ! if ($answer =~/n/i) { ! $::intranetdir=''; ! $::opacdir=''; ! } else { ! print "Great! continuing upgrade... \n"; ! } ! } ! ! ! if (!$::opacdir || !$::intranetdir) { ! $::intranetdir=''; ! $::opacdir=''; ! while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::intranetdir=$answer; ! } ! if (! -e "$::intranetdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::intranetdir=''; ! } ! } ! while (!$::opacdir) { ! print "Please specify the location of your OPAC files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::opacdir=$answer; ! } ! if (! -e "$::opacdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::opacdir=''; ! } ! } ! } ! ! ! ! print "\n\nBacking up old Koha scripts...\n"; ! print "===============================\n\n"; ! ! mkdir "$backupdir/kohafiles-$date", 0770; ! mkdir "$backupdir/kohafiles-$date/intranet", 0770; ! mkdir "$backupdir/kohafiles-$date/opac", 0770; ! ! my $result=system("cp -R $::intranetdir/* $backupdir/kohafiles-$date/intranet/"); ! if ($result) { ! print "Error encounted when copying $::intranetdir to $backupdir/kohafiles-$date/intranet/\n"; ! exit; ! } else { ! system("rm -rf $::intranetdir/*"); ! } ! $result=system("cp -R $::opacdir/* $backupdir/kohafiles-$date/opac/"); ! if ($result) { ! print "Error encounted when copying $::opacdir to $backupdir/kohafiles-$date/opac/\n"; ! exit; ! } else { ! system("rm -rf $::opacdir/*"); ! } ! ! print "Creating $::intranetdir/htdocs...\n"; ! mkdir ("$::intranetdir/htdocs", oct(750)); ! print "Creating $::intranetdir/cgi-bin...\n"; ! mkdir ("$::intranetdir/cgi-bin", oct(750)); ! print "Creating $::intranetdir/modules...\n"; ! mkdir ("$::intranetdir/modules", oct(750)); ! print "Creating $::intranetdir/scripts...\n"; ! mkdir ("$::intranetdir/scripts", oct(750)); ! chmod (oct(770), "$::opacdir"); ! print "Creating $::opacdir/htdocs...\n"; ! mkdir ("$::opacdir/htdocs", oct(750)); ! print "Creating $::opacdir/cgi-bin...\n"; ! mkdir ("$::opacdir/cgi-bin", oct(750)); ! ! my $httpduser; ! my $realhttpdconf; ! ! foreach my $httpdconf (qw(/usr/local/apache/conf/httpd.conf ! /usr/local/etc/apache/httpd.conf ! /usr/local/etc/apache/apache.conf ! /var/www/conf/httpd.conf ! /etc/apache/conf/httpd.conf ! /etc/apache/conf/apache.conf ! /etc/apache-ssl/conf/apache.conf ! /etc/httpd/conf/httpd.conf ! /etc/httpd/conf/commonhttpd.conf ! /etc/httpd/httpd.conf)) { ! if ( -f $httpdconf ) { ! $realhttpdconf=$httpdconf; ! open (HTTPDCONF, $httpdconf) or warn "Insufficient privileges to open $httpdconf for reading.\n"; ! while () { ! if (/^\s*User\s+"?([-\w]+)"?\s*$/) { ! $httpduser = $1; ! } ! } ! close(HTTPDCONF); ! } ! } ! ! unless ($httpduser) { ! print qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. ! |; ! print "What is your Apache user? "; ! chomp($input = ); ! ! if ($input) { ! $httpduser = $input; ! } else { ! $httpduser='Undetermined'; ! } ! } ! ! print "\n\nINSTALLING KOHA...\n"; ! print "\n\n==================\n"; ! print "Copying intranet-html files to $::intranetdir/htdocs...\n"; ! system("cp -R intranet-html/* $::intranetdir/htdocs/"); ! print "Copying intranet-cgi files to $::intranetdir/cgi-bin...\n"; ! system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/"); ! print "Copying script files to $::intranetdir/scripts...\n"; ! system("cp -R scripts/* $::intranetdir/scripts/"); ! print "Copying module files to $::intranetdir/modules...\n"; ! system("cp -R modules/* $::intranetdir/modules/"); ! print "Copying opac-html files to $::opacdir/htdocs...\n"; ! system("cp -R opac-html/* $::opacdir/htdocs/"); ! print "Copying opac-cgi files to $::opacdir/cgi-bin...\n"; ! system("cp -R opac-cgi/* $::opacdir/cgi-bin/"); ! system("touch $::opacdir/cgi-bin/opac"); ! ! system("chown -R root:$httpduser $::opacdir"); ! system("chown -R root:$httpduser $::intranetdir"); ! ! ! # Copy custom templates and reports back in ! ! opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! my @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::intranetdir/htdocs/$_"); ! print "Restoring custom intranet templates $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! } ! ! opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::opacdir/htdocs/$_"); ! print "Restoring custom opac template $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! } ! ! ! ! ! ! unless ($::kohalogdir && -e $::kohalogdir) { ! $::kohalogdir='/var/log/koha'; ! print "\n\nDirectory for logging by Z39.50 daemon [$::kohalogdir]: "; ! chomp($input = ); ! if ($input) { ! $::kohalogdir=$input; ! } ! } ! ! unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; ! if ($result==0) { ! my @dirs = split(m#/#, $::kohalogdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/processz3950queue"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $::intranetdir/scripts/z3950daemon/processz3950queue: $!"; ! ! ! ! my $kccontents='';open (KC, "/etc/koha.conf"); ! my $kc; ! while () { ! if (/^\s*includes\s*=/) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! $kc->{'includes'}=1; ! } elsif (/^\s*httpduser\s*=/) { ! $kccontents.="httpduser=$httpduser\n"; ! $kc->{'httpduser'}=1; ! } elsif (/^\s*kohaversion\s*=/) { ! $kccontents.="kohaversion=$::newversion\n"; ! $kc->{'kohaversion'}=1; ! } elsif (/^\s*kohalogdir\s*=/) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! $kc->{'kohalogdir'}=1; ! } elsif (/^\s*intranetdir\s*=/) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! $kc->{'intranetdir'}=1; ! } elsif (/^\s*opacdir\s*=/) { ! $kccontents.="opacdir=$::opacdir\n"; ! $kc->{'opacdir'}=1; ! } else { ! $kccontents.="$_"; ! } ! } ! ! unless (defined($kc->{'kohaversion'})) { ! $kccontents.="kohaversion=$::newversion\n"; ! } ! unless (defined($kc->{'includes'})) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! } ! unless (defined($kc->{'httpduser'})) { ! $kccontents.="httpduser=$httpduser\n"; ! } ! unless (defined($kc->{'intranetdir'})) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! } ! unless (defined($kc->{'opacdir'})) { ! $kccontents.="opacdir=$::opacdir\n"; ! } ! unless (defined($kc->{'kohalogdir'})) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! } ! ! ! system("mv /etc/koha.conf /etc/koha.conf.backup"); ! ! open (KC, ">/etc/koha.conf") || warn "Couldn't open /etc/koha.conf for writing."; ! print KC $kccontents; ! close KC; ! ! ! print qq| ! ! Upgrading Database ! ================== ! |; ! system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase"); ! ! ! print qq| ! ! ================== ! = Authentication = ! ================== ! ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the ! "Members" module to add passwords for other accounts and set their permissions. ! |; ! print "Press the key to continue: "; ! ; ! ! ! ! print qq| ! ! ========================== ! = Koha Upgrade Completed = ! ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha ! prior to 1.2.1, it is likely that you will have to modify your Apache ! configuration to point it to the new files. ! ! In your INTRANET VirtualHost section you should have: ! DocumentRoot $::intranetdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! In the OPAC VirtualHost section you should have: ! DocumentRoot $::opacdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! You may also need to uncomment a "LoadModules env_module ... " line and restart ! Apache. ! If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. ! To populate it : ! * launch Koha ! * Go to Parameters >> Marc structure option and Koha-MARC links option. ! * Modify default MARC structure to fit your needs. ! * open a console ! * type: ! cd /path/to/koha/misc ! export PERL5LIB=/path/to/koha ! ./koha2marc.pl ! the old DB is "copied" in the new MARC one. ! Koha 2.0.0 is ready :-) ! ! Please report any problems you encounter through http://bugs.koha.org/ ! |; my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); --- 33,69 ---- checkperlmodules(); ! backupkoha(); ! getapacheinfo(); ! installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} ! updatedatabase(); ! finalizeconfigfile(); + showmessage(getmessage('UpgradeCompleted'),'PressEnter'); my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); From kb2qzv at users.sourceforge.net Sun Oct 26 23:54:56 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 14:54:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.3,1.4 opac-detail.tmpl,1.3,1.4 opac-moredetail.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26051 Modified Files: opac-reserve.tmpl opac-detail.tmpl opac-moredetail.tmpl Log Message: translation improvements, typos corrected. Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 24,28 ****

      Strona rezerwacji dla pozycji: ( )

      Złożono już zamówień na tę pozycję.

      !

      Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji,która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana.

      --- 24,28 ----

      Strona rezerwacji dla pozycji: ( )

      Złożono już zamówień na tę pozycję.

      !

      Prosimy wybrać, który typ pozycji Cię interesuje. Pierwsza z pozycji, która stanie się dostępna a należy do jednego z tych typów zostanie dla Ciebie zatrzymana. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 1,5 **** !

      Zalogowany jako: [Strony Członkowskie][Wyloguj się]

      --- 1,5 ---- !

      Zalogowany jako: [Strony Członkowskie][Wyloguj się]

      *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! OPIS BIBLIO ! ! !
      ! ! Podtytuł:
      ! Autor:
      ! Przedmiot:
      ! Copyright:
      ! Całkowita liczba pozycji: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDostępna

      --- 16,80 ---- ! ! ! ! ! ! !
      ! OPIS BIBLIO ! !
      ! ! Podtytuł: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez : ! w ! , ! ,
      ! Collection:
      ! Hasło przedmiotowe:
      ! Rok :
      ! Uwagi:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! całkowita liczba pozycji: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDostępna

      Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 78,85 **** Ostatnio zdano:
      Ostatnio pożyczono:
      ! on issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Current Branch:
      Cena wymiany:
      Pozycja zagubiona:
      --- 78,85 ---- Ostatnio zdano:
      Ostatnio pożyczono:
      ! issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Bież±cy oddział:
      Cena wymiany:
      Pozycja zagubiona:
      From kb2qzv at users.sourceforge.net Mon Oct 27 00:39:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 15:39:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1631 Added Files: branchtransfers.tmpl Log Message: first round translation --- NEW FILE ---
      Następny Czytelnik Zwroty

      Wypożyczalnia: Transfery


      Oddział:   Drukarka:
      Zmień ustawienia > >

      /images/background-mem.gif">Wykryto rezerwację
      Zarezerwowano: wykryto rezerwację dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). Pozycja oznaczona czeka:
      Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
      Ustaw rezerwację jako czekaj±c± i transferuj ksi±żke do : Unieważnij rezerwację, następnie spróbuj transferować: value=> value=> value=> > > >
      Unieważnij rezerwację, następnie spróbuj transferować:
      value=> value=> value=> > > > >
      Ignoruj i powróć do transferów:
      > value=> value=> value=>
      /images/background-mem.gif">Wiadomo¶ci
      Rezerwacja unieważniona
       Pozycja powinna teraz czekać w oddziale:
      Brak pozycji o kodzie kreskowym: Proszę zwrócic pozycję do rodzimego oddziału: Pozycja już jest w docelowym oddziale. Pozycję wypożyczył/a " onClick="openWindow(this,'Member', 480, 640); return false;"> i została zwrócona.
      /images/holder.gif" width=24 height=24>

      /images/background-mem.gif"> Wybierz oddział
      Oddział docelowy:
      /images/holder.gif" width=24 height=50 align=left>
      /images/background-mem.gif"> WprowadĽ kod kreskowy ksi±żki
      Kod kreskowy pozycji:
      > value=> value=> value=>

      /images/background-mem.gif">Pozycje transferowane
      Kod kreskowyTytułAutorTypOdDo
      align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center> align=center> align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:10:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:10:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ circulation.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv7322 Added Files: circulation.tmpl Log Message: first round translation --- NEW FILE ---
      &branch=&printer=&print=yes> Następny czytelnik  Zwroty  Transfery

      Wypożyczalnia: wypożyczenia


      Oddział:
      Drukarka:
      Zmień ustawienia > >

      Zwroty   Transfery

      Wypożyczalnia: wypożyczenia


      Oddział:
      Drukarka:
      Zmień ustawienia > >

      /images/background-mem.gif"> Issuing Question
      Próba wypożyczenia autorstwa dla .

      > > > > > > > > > " value="">
      > > > > > > > > > " value="">
      Bł±d przy wypożyczeniu
      /images/background-mem.gif">Wiadomo¶ć

      > >
      /images/background-mem.gif"> Wybierz czytelnika

      /images/background-mem.gif"> WprowadĽ numer karty czytelnika
      lub fragment nazwiska
      > >
      /images/background-mem.gif"> WprowadĽ kod kreskowy ksi±żki
      Kod kreskowy pozycji:
      > Sticky Due Date
      > > > >
      Dane czytelnika
      " onClick="openWindow(this,'Member', 480, 640)">
      Kategoria:
      OBCIˇŻENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      OBCIˇŻENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CZEKA &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      Zaległo¶ciTak, patrz niżej
      UWAGI



      /images/background-mem.gif"> Wypożyczenia dzi¶
      Termin zwrotuKod kreskowyTytułAutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      /images/background-mem.gif"> Poprzednie wypożyczenia
      Termin zwrotuKod kreskowyTytułAutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:41:21 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:41:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ returns.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv12425 Added Files: returns.tmpl Log Message: first round translation --- NEW FILE ---
      Wypożyczenia  Transfery

      Cyrkulacja: Zwroty


      Oddział:   Drukarka:
      Zmień ustawienia > >

      ! !
      /images/background-mem.gif">Wykryto rezerwację
      Pozycja oznakowana Czeka:
      Pozycja ()
      jest oznaczona oczekuje w dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Pozycja oznakowana Czeka:
      Pozycja: ()
      ma być transferowana do
      do odebrania przez (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Wykryto rezerwację: Pozycja: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) do odebrania w .
      Zmień status na oczekuj±ca i drukujwykaz?:
      value=> value=> value=> > > > POZYCJA ZAREZERWOWANA: () Kod kreskowy: itemtype: ODBIÓR W: CZYTELNIK: Numer karty: Tel.: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ">
      /images/background-mem.gif"> WprowadĽ kod kreskowy
      Kod kreskowy pozycji:
      value=> value=> value=>
      /images/background-mem.gif">Messages
      Brak pozycji z kodem: Proszę wróć do Nie w obiegu. Pozycja zagubiona, nie odnaleziona. pozycja unieważniona
      /images/background-mem.gif"> Dane zwróconej pozycji
      Tytuł:
      /images/background-mem.gif"> Dane czytelnika
      " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ,
      /images/background-mem.gif" colspan=2> Flagi
      >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Płatno¶ć
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      >
      /images/background-mem.gif"> Zwrócona pozycja
      Termin zwrotuKod kreskowyTytułAutorTypCzytelnik
      > // Nie w obiegu. > align=center> &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> > > align=center> > " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;">
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:49:14 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:49:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv13308 Added Files: selectbranchprinter.tmpl Log Message: first round translation --- NEW FILE ---

      Cyrkulacja: Ustawienia wyboru drukarki i oddziału


      align=center background=> Proszę wybrać drukarkę i oddział
      Oddział:
      		Drukarka:
      From kb2qzv at users.sourceforge.net Mon Oct 27 02:13:39 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 17:13:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv16738 Added Files: breeding.tmpl Log Message: first round translation --- NEW FILE ---

      System akwizycji MARC

      Importuj do hurtowni opisów

      Import wyniki :

        rekordy importowano

        nie importowano ponieważ już s± w bazie

        nie importowano ponieważ już s± w hurtowni

        nie importowano ponieważ nie wygl±daj± na będ±ce w formacie MARC (lub brakuje ISBN/ISSN) !

        rekordów przeczytanych

        Powrót

      • Wybierz plik, by importować go do hurtowni opisów. Będzie przeczytany i dla każdego znalezionego numeru ISBN utworzone zostanie nowe "ciel±tko" w farmie.
      • Je¶li ISBN już w farmie istnieje można zdecydować czy nowe powinno być zignorowane czy też stare nadpisane nowym.
      • Można nadać nazwę dla tego importu. Może się przydać przy tworzeniu opisu bibliograficznego wskazuj±c pochodzenie sugerowanych danych MARC !
      • Oczywi¶cie opis będzie ignorowany je¶li numer ISBN istnieje już w aktywnej bazie Koha.
      " enctype="multipart/form-data">
      Wybierz plik do importu :
      Nazwa tego importu :
      Character encoding (USMARC or UNIMARC)
      Je¶li ISBN już jest w hurtowni: Ignoruj ten, zatrzymaj istniej±cy
      Nadpisz istniej±cy obecnym
       
      From kb2qzv at users.sourceforge.net Mon Oct 27 15:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:34:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes members-bottom.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3725 Modified Files: members-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: members-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- members-bottom.inc 27 Oct 2003 14:34:15 -0000 1.2 *************** *** 5,22 **** ! !
      ! ! Pocz±tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc !
      --- 5,21 ---- !
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc !
      From kb2qzv at users.sourceforge.net Mon Oct 27 16:07:27 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:07:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue MARCdetail.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv10294 Modified Files: MARCdetail.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/MARCdetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MARCdetail.tmpl 9 Feb 2003 09:47:22 -0000 1.2 --- MARCdetail.tmpl 27 Oct 2003 15:07:25 -0000 1.3 *************** *** 1,11 **** - ! ! ! ! +
      Opis MARC:
      --- 1,28 ---- ! ! !
      + + +
      + + /images/background-mem.gif"> + + +
      + + + + + + +
      ">//images/fileopen.png">">NormalOpis MARC :
      +
      *************** *** 20,40 **** !
      8
      9
      Pozycja
      !
      ! ! ! --- 37,67 ---- !
       
      8
      9
      Pozycja
      +       		+ + + class="button">Zamów + +
      !
      ! /images/background-mem.gif"> ! ! + *************** *** 43,56 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 70,84 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 59,72 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 87,101 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 75,88 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 104,118 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 91,104 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 121,135 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 107,120 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 138,152 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 123,136 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 155,169 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 139,152 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 172,186 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 155,168 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 189,203 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 171,184 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 206,220 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 187,193 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! --- 223,229 ---- !
      ! /images/background-mem.gif"> *************** *** 209,213 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 245,249 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 220,222 **** - --- 256,257 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 15:57:16 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/export marc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export In directory sc8-pr-cvs1:/tmp/cvs-serv8118 Modified Files: marc.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: marc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export/marc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marc.tmpl 9 Jan 2003 11:39:26 -0000 1.1 --- marc.tmpl 27 Oct 2003 14:57:13 -0000 1.2 *************** *** 1,12 **** ! ! ! !

      Zalogowano jako: [Wyloguj]

      ! !

      Zaloguj się do Koha

      !
      ! Administracja systemu Koha


      ! Eksportuj następuj±ce opisy w formacie MARC:

      od opisu numer : --- 1,7 ---- ! !

      !

      Eksportowanie opisu MARC




      ! Eksportuj następuj±ce opisy w formacie MARC :

      od opisu numer : From kb2qzv at users.sourceforge.net Mon Oct 27 16:41:30 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:41:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detail.tmpl,1.2,1.3 searchresults.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv16926 Modified Files: detail.tmpl searchresults.tmpl subject.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 --- detail.tmpl 27 Oct 2003 15:41:27 -0000 1.3 *************** *** 23,50 ****

      ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      ! !
      ! Podtytuł:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytuł serii:
      ! Hasło:
      ! Copyright:
      ! Uwagi:
      ! Tytuł ujednol.:
      ! Seria:
      ! Całkowita liczba pozycji:

      --- 23,44 ----

      !
      " class="button">MARC

      ! Podtytuł: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez: ! w ! , ! ,
      ! Kolekcja:
      ! Hasło przedm:
      ! Rok:
      ! Uwagi:
      ! Ujednolicony:
      ! Serial:
      ! Dewey:
      ! URL:
      ! W sumie pozycji:

      Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchresults.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 6,69 ****

      - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       - ! Szukano ! Nie podałe¶ żadnego kryterium wyszukiwania
       znalezionych trafień

      ! ! ! ! ! &&type=opacintra> ! ! ! ! ! -highlight.gif> ! &&type=opacintra>.gif border=0> ! ! ! ! &&type=opacintra> ! ! !

      ! ! ! - ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! --- 6,52 ----
      ! Szukałe¶ ! Nie podałe¶ kryteriów wyszukiwania
       znalezionych trafień

      ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! /images/numbers/-highlight.gif> ! &=&type=opacintra>/images/numbers/.gif border=0> + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

      !

      TytułAutor©Ilo¶ć pozycjiLokalizacja  
      ?type=opacintra&bib=> &type=opacintra>
      ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! *************** *** 72,109 **** ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
      TytułAutor©Ilo¶ćLokalizacja  
      ?type=opacintra&bib=> &type=opacintra> >Rezerwacja
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
      ! &&type=opacintra>Previous Records   ! ! &&type=opacintra>Next Records   !
      !
      ! !
      ! Trafienia od do z rekordów. !

      ! Spróbuj nowej kwerendy ! Spróbuj nowej kwerendy --- 55,95 ---- !
      		>Request
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! &=&type=opacintra>Previous Records   ! ! &=&type=opacintra>Next Records   !
      !
      ! !
      ! Wyniki do z trafień. !
      ! Jeszcze jedno wyszukiwanie ! Jeszcze jedno wyszukiwanie Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- subject.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 6,15 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj się do Koha

      -       -
      --- 5,8 ---- *************** *** 40,43 **** ! ! \ No newline at end of file --- 33,35 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:29 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport AcceptBiblioitem.tmpl,1.1,1.2 AcceptMarcUpload.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29351 Modified Files: AcceptBiblioitem.tmpl AcceptMarcUpload.tmpl Log Message: small corrections Index: AcceptBiblioitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptBiblioitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptBiblioitem.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptBiblioitem.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -
      --- 1,2 ---- Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptMarcUpload.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptMarcUpload.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -

      >Menu główne

      --- 1,2 ---- *************** *** 41,43 **** - \ No newline at end of file --- 40,41 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport ListFileRecords.tmpl,1.1,1.2 uploadmarc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29274 Modified Files: ListFileRecords.tmpl uploadmarc.tmpl Log Message: small corrections Index: ListFileRecords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/ListFileRecords.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ListFileRecords.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- ListFileRecords.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 28,32 **** > " ! [Przęgl±danie do z rekordów] |
      --- 28,32 ---- > " ! [Przęgl±danie od do z rekordów] |
      Index: uploadmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/uploadmarc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** uploadmarc.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- uploadmarc.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 1,3 **** -

      >Menu główne

      --- 1,2 ---- From slef at users.sourceforge.net Mon Oct 27 18:13:09 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:13:09 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.58,1.59 koha.upgrade,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv5026 Modified Files: Install.pm koha.upgrade Log Message: Old files warning and MARC upgrade fix Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** Install.pm 26 Oct 2003 13:21:19 -0000 1.58 --- Install.pm 27 Oct 2003 17:13:06 -0000 1.59 *************** *** 78,82 **** ); ! use vars qw( $kohaversion ); # set in installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl --- 78,82 ---- ); ! use vars qw( $kohaversion $newversion ); # set in loadconfigfile and installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl *************** *** 91,96 **** use vars qw( $dbname $hostname $user $pass ); # virtual hosting - use vars qw( $newversion ); # XXX this seems to be unused - =item heading --- 91,94 ---- *************** *** 381,385 **** sub setkohaversion ($) { ! ($kohaversion) = @_; } --- 379,383 ---- sub setkohaversion ($) { ! ($newversion) = @_; } *************** *** 1472,1475 **** --- 1470,1483 ---- |; + $messages->{'OldFiles'}->{en} = heading('OLD FILES') . qq| + Any files from the previous edition of Koha have been + copied to a dated backup directory alongside the new + installation. You should move any custom files that you + want to keep (such as your site templates) into the new + directories and then move the backup off of the live + server. + + Press ENTER to continue:|; + $messages->{'CopyingFiles'}->{en}="Copying %s to %s.\n"; *************** *** 1527,1531 **** opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$kohaversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl --- 1535,1539 ---- opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$newversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl *************** *** 1552,1555 **** --- 1560,1565 ---- chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $intranetdir/scripts/z3950daemon/processz3950queue: $!"; } #MJR: FIXME: Should report that we haven't chown()d. + + showmessage(getmessage('OldFiles'),'PressEnter'); } *************** *** 1730,1745 **** } ! #FIXME: do not ask if we are upgrading from a MARC-ready system ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); } - delete($ENV{"KOHA_CONF"}); print RESET."\n\nFinished updating of database. Press to continue..."; --- 1740,1756 ---- } ! if ($kohaversion =~ /^1\.[012]\./) { ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! delete($ENV{"KOHA_CONF"}); } print RESET."\n\nFinished updating of database. Press to continue..."; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 --- koha.upgrade 27 Oct 2003 17:13:06 -0000 1.10 *************** *** 32,65 **** }; checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} ! # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} updatedatabase(); finalizeconfigfile(); --- 32,41 ---- }; + setkohaversion($::newversion); checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! # custom templates warning added to installfiles(); updatedatabase(); finalizeconfigfile(); From slef at users.sourceforge.net Mon Oct 27 18:36:19 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:36:19 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv8869/misc Modified Files: Install.pm Log Message: Added getmysqldir function Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** Install.pm 27 Oct 2003 17:13:06 -0000 1.59 --- Install.pm 27 Oct 2003 17:36:17 -0000 1.60 *************** *** 959,963 **** --- 959,994 ---- } + =item getmysqldir + getmysqldir; + + Get the MySQL database server installation directory, automatically if possible. + + =cut + + $messages->{'WhereIsMySQL'}->{en} = heading('MYSQL LOCATION').qq| + Koha can't find MySQL. If you compiled mysql yourself, + please give the value of --prefix when you ran configure. + The file mysqladmin should be in bin/mysqladmin under the directory that you give here. + + MySQL installation directory: |; + + sub getmysqldir { + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + for (;;) { + $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); + last if -f "$mysqldir/bin/mysqladmin"; + } + } + return($mysqldir); + } =item getdatabaseinfo *************** *** 1628,1658 **** $mysqluser = 'root'; $mysqlpass = ''; - foreach my $mysql (qw(/usr/local/mysql - /opt/mysql - /usr - )) { - if ( -d $mysql && -f "$mysql/bin/mysqladmin") { - $mysqldir=$mysql; - } - } - if (!$mysqldir){ - print "I don't see mysql in the usual places.\n"; - for (;;) { - print "Where have you installed mysql? "; - chomp($mysqldir = ); - last if -f "$mysqldir/bin/mysqladmin"; - print <{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! Apache needs to be restarted to load the new configuration for Koha. ! This requires the root password. Would you like to try to restart Apache now? [Y]/N: |; --- 1835,1843 ---- wants so. =cut $messages->{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! The web server daemon needs to be restarted to load the new configuration for Koha. ! The installer can do this if you are using Apache and give the root password. Would you like to try to restart Apache now? [Y]/N: |; *************** *** 1845,1850 **** my $response=showmessage(getmessage('RestartApache'), 'yn', 'y'); - - unless ($response=~/^n/i) { startsysout(); --- 1847,1850 ---- *************** *** 1869,1883 **** =cut #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! if ($answer) { ! $backupdir=$answer; ! } if (! -e $backupdir) { --- 1869,1897 ---- =cut + $messages->{'BackupDir'}->{en} = heading('BACKUP STORAGE').qq| + The upgrader will now try to backup your old files. + + Please specify a directory to store the backup in [%s]: |; + + $messages->{'BackupSummary'}->{en} = heading('BACKUP SUMMARY').qq| + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + %s + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): |; + #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=$ENV{'prefix'}.'/backups'; ! $answer = showmessage(getmessage('BackupDir',[$backupdir]),'free',$backupdir); if (! -e $backupdir) { *************** *** 1900,1934 **** # # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <; ! chomp $answer; if ($answer=~/^n/i) { --- 1943,1947 ---- my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; ! $answer = showmessage(getmessage('BackupSummary',[$bibliocounter, $biblioitemcounter, $itemcounter, $membercounter, $filels]),'yn'); if ($answer=~/^n/i) { From slef at users.sourceforge.net Mon Oct 27 18:39:43 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:39:43 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv9359/misc Modified Files: Install.pm Log Message: Timed backups in installfiles Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** Install.pm 27 Oct 2003 17:36:17 -0000 1.60 --- Install.pm 27 Oct 2003 17:39:41 -0000 1.61 *************** *** 1519,1523 **** #MJR: preserve old files, just in case - #FIXME: use dated backups sub neatcopy { my $desc = shift; --- 1519,1522 ---- *************** *** 1525,1531 **** my $tgt = shift; ! if (-d $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.".old"]); ! startsysout; system("mv ".$tgt." ".$tgt.".old"); } --- 1524,1530 ---- my $tgt = shift; ! if (-e $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]); ! startsysout(); system("mv ".$tgt." ".$tgt.".old"); } From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:52 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30638 Modified Files: member.tmpl Log Message: small corrections Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/member.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** member.tmpl 25 Jan 2003 19:23:37 -0000 1.2 --- member.tmpl 27 Oct 2003 21:59:50 -0000 1.3 *************** *** 13,28 **** ! ! ! ! ! ! ! ! ! --- 13,28 ----
      KartaNazwiskoImięKategoriaAdresZaległe pozycjeOpłatyUwagi
      ! ! ! ! ! ! ! ! ! *************** *** 42,52 ****
      !
      ! Osoba Organizacja - - - - --- 42,48 ----
      ! ! Dorosły Organizacja From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members imemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30534 Modified Files: imemberentry.tmpl Log Message: small corrections Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/imemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** imemberentry.tmpl 9 Jan 2003 13:31:31 -0000 1.1 --- imemberentry.tmpl 27 Oct 2003 21:59:15 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !
      ! Dodaj now± instytucję
      --- 1,10 ---- !
      ! !

      Edytuj instytucję


      ! !

      Dodaj now± instytucję


      !       *************** *** 28,34 ****
      ! --- 22,28 ---- ! *************** *** 36,91 **** ! ! ! - ! - ! ! ! ! - ! ! ! - ! --- 30,70 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,123 **** - - - - - ! ! ! ! ! - ! --- 72,100 ---- ! + ! + + + + + ! ! *************** *** 125,133 **** ! ! --- 102,113 ---- ! + + + ! *************** *** 135,144 **** - - - - --- 115,120 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 23:00:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 14:00:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members memberentry.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30746 Modified Files: memberentry.tmpl Log Message: small corrections Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/memberentry.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** memberentry.tmpl 25 Jan 2003 19:31:09 -0000 1.2 --- memberentry.tmpl 27 Oct 2003 22:00:19 -0000 1.3 *************** *** 1,7 **** ! ! ! !
      --- 1,5 ---- ! !


      *************** *** 15,28 ****       ! ! ! ! --- 13,26 ---- ! ! ! ! *************** *** 30,39 **** ! --- 28,47 ---- ! ! ! ! ! ! ! ! *************** *** 44,59 **** ! ! ! ! ! - - - + ! ! ! ! ! ! ! *************** *** 70,146 **** - - - - - - - - - - - ! ! ! - - - - - - - ! ! - ! ! - ! - ! ! ! ! - ! --- 80,159 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + + + + + + + ! ! ! ! ! + + + + + *************** *** 155,183 **** ! ! ! ! ! ! ! ! ! - ! ! - - --- 168,185 ---- ! ! ! *************** *** 185,190 **** ! --- 187,192 ---- ! *************** *** 192,201 **** ! ! ! ! !
      /images/background-mem.gif">Karta/images/background-mem.gif">Nazwisko/images/background-mem.gif">Imię/images/background-mem.gif">Kategoria/images/background-mem.gif">Adres/images/background-mem.gif">Zaległe pozycje/images/background-mem.gif">Opłaty/images/background-mem.gif">Uwagi
      ! Czytelnik# , Numer Karty*
      ! Czytelnik# , Numer karty* >
      ! SZCZEGÓŁY INSTYTUCJI
      Nazwa instytucji
       
      ! Adres Instytucji
      ! !
      Adres pocztowy*Miasto*Rejon
       
      Dane kontaktowe
      /images/background-mem.gif"> ! DANE INSTYTUCJI /images/background-mem.gif">
      Nazwa instytucji
      ">
       
      /images/background-mem.gif"> ! ADRES INSTYTUCJI
      Adres pocztowy*Kod / Miasto*Area
      ">">
      ">      		 ! !
       
      /images/background-mem.gif"> Dane kontaktowe
      Nazwisko osoby kontaktowej*
      Tel. (w dzień) Fax Email
       
      Uwagi
      Nazwisko osoby kontaktowej*
      ">
      Tel. (dzienny) Fax Email
      ">">">
       
      Uwagi
      Na użytek biblioteki
      /images/background-mem.gif">DO UŻYTKU BIBLIOTEKI
      Uwagi
      Uwagi
      !
      !
      Czytelnik# , Numer Karty*
      DANE PERSONALNE CZYTELNIKA* ! zaznaczono>F ! zaznaczono> !     Data ur. (dd/mm/rr)
      Czytelnik# , Numer karty*
      /images/background-mem.gif">DANE OSOBOWE CZYTELNIKA/images/background-mem.gif">* ! checked>F ! checked> M !     Data urodzenia ()
      !
      tytułInicjałyImiona*Nazwisko*Preferowane imię
      !
      TytułInicjałyImiona*Nazwisko*Preferowane imię
       
      Etniczno¶ćUwagi etniczne  Kategoria członkowstwa*
      + +
      Etniczno¶ćUwagi dot. etniczno¶ci  Kategoria członkowstwa*
       
      Adres czetylnika
      !
      Adres pocztowy*Miasto*Kod
       
      Ulica, je¶li innaMiasto
       
      DANE KONTAKTOWE CZYTELNIKA
      Tel. (dom)Tel. (praca)FaxEmail
       
      Alternatywne dane kontaktowe
      /images/background-mem.gif">ADRES CZYTELNIKA
      Pocztowy adres*Kod / Miasto*Oddział zapisu
      ! ">
      ! !       		!
      Adres zamieszkania je¶li innyKod / Miasto
      ! ">
      !
      /images/background-mem.gif">DANE KONTAKTOWE CZYTELNIKA
      Phone (Home)FaxEmailText Messaging
      Phone (Daytime)
      /images/background-mem.gif">ALTERNATE CONTACT DETAILS
      Name*PhoneRelationship*
      Nazwisko*Tel.Pokrewieństwo*
       
      Uwagi
       
      NA UŻYTEK BIBLIOTEKI
      Uwagi
       
      FLAGS
      Notes
      /images/background-mem.gif">LIBRARY USE
      Notes
      FLAGS
      >Tak ! >Nie
      >Yes ! >No
      --- 194,204 ----       +
      ! > ! //images/2rightarrow.png" ALT="Add New Member" border=0 > !
      *************** *** 203,207 **** - - - --- 206,207 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:35 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members jmemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30583 Modified Files: jmemberentry.tmpl Log Message: small corrections Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/jmemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** jmemberentry.tmpl 9 Jan 2003 13:29:25 -0000 1.1 --- jmemberentry.tmpl 27 Oct 2003 21:59:33 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !

      ! ! Dodaj nowego młodocianego czytelnika
      - ! ! ! ! !
      ! ! ! !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,128 ---- ! ! ! ! WELCOME TO THE KOHA INTRANET ! ! ! ! ! ! !
      !
      ! Koha: Horowhenua Library Trust      		 ! !
      ! Type in the box and press the enter key.
      ! ! ! -Advanced Search (More Options)
       !
      ! !
      ! !
      ! Type in the box and press the enter key.
      !

      !
      ! ! !
      /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 151,186 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 130,158 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 189,193 ****
      /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
      /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Catalogue Search" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
      ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">      		   ! !
      ! Type in the box and press the enter key.
      ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
       ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
        ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Member Search" name="member" hspace="0" vspace="0" border="0">
        
      ! !
      ! Type in the box and press the enter key.
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
           /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

      !

      !
           /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts and Reports" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
          /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parameters" border="0">
      + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
      - --- 161,164 ---- From rangi at users.sourceforge.net Fri Oct 31 22:02:18 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Fri, 31 Oct 2003 13:02:18 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1758/circ Modified Files: circulation.pl Log Message: Fix for bug 592 Re-issuing book does not renew correctly Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 --- circulation.pl 31 Oct 2003 21:02:16 -0000 1.63 *************** *** 314,318 **** todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray ); --- 314,322 ---- todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray, ! month=>$month, ! day=>$day, ! year=>$year ! ); From kb2qzv at users.sourceforge.net Mon Oct 27 15:33:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:33:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 common-style.css,NONE,1.1 parameters-bottom.inc,NONE,1.1 acquisitions-bottom.inc,1.1,1.2 acquisitions-top.inc,1.2,1.3 cat-bottom.inc,1.1,1.2 cat-top.inc,1.2,1.3 circulation-bottom.inc,1.1,1.2 circulation-top.inc,1.2,1.3 issues-bottom.inc,1.1,1.2 members-top.inc,1.2,1.3 parameters-top.inc,1.1,1.2 reports-bottom.inc,1.1,1.2 reports-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3589 Modified Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc members-top.inc parameters-top.inc reports-bottom.inc reports-top.inc Added Files: about-bottom.inc about-top.inc common-style.css parameters-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . --- NEW FILE ---

       

      Pocz±tek || Katalog || Członkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      --- NEW FILE --- KOHA: INTRANET: Parametry /includes/common-style.css">

      Zalogowany jako: [Log Out]

      Zaloguj się do Koha

       --- NEW FILE --- .button { text-align: center; font: 1.2em sans-serif; padding: 10px 15px; border-style: solid; border-width: 2px; border-color: black; text-decoration: none; color: black; border-radius: 6px; -moz-border-radius: 6px; background-color:#FFFFFF; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } #problem { color: red; font-weight:bold; } #menubar { border-top:1px solid #666666; font: 1.2em sans-serif; background-color:#DDDDDD; } #submenu { font: 0.5em sans-serif; background-color:#EEEEEE; border-left:1px solid #000000; } a.submenu { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#EEEEEE; padding:4px; font-weight: bold; margin:0; } a.submenu2 { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#CCCCCC; padding:4px; font-weight: bold; margin:0; } .koha { text-align:center; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.home:hover { background-color: #339933; color: #000000; text-decoration: none; font-weight: normal; font-weight: bold; } a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; margin:0; } a.catalogue:hover { font-weight: normal; text-decoration: none; cursor: hand; background-color:#ad11ad; color:#FFFFFF; font-weight: bold; } a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.members:hover { background-color: #86c268; color: #000000; text-decoration: none; font-weight: bold; } a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.acquisition:hover { background-color: #ffdf61; color: #000000; text-decoration: normal; font-weight: bold; } a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.reports:hover { background-color: #6b7cbe; color: #000000; text-decoration: normal; font-weight: bold; } a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.circulation:hover { background-color: #be6170; color: #000000; text-decoration: normal; font-weight: bold; } a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.parameters:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.about:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } --- NEW FILE ---

       

      Pocz±tek || Katalog || Członkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- acquisitions-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,22 **** - -

       

      - ! !
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || ! Akwizycja || ! Reporty || ! Admin || ! Pomoc
      --- 1,19 ----

       

      !
      Pocz±tek || ! Katalog || ! Członkowie || ! Akwizycje || ! Cyrkulacja || ! Reporty || ! Parametry || ! About || ! Pomoc
      *************** *** 24,26 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** acquisitions-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- acquisitions-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,150 **** - - - - KOHA: INTRANET: Akwizycje ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,76 ---- KOHA: INTRANET: Akwizycje ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- cat-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cat-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- cat-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,120 **** ! ! ! ! ! KOHA: INTRANET: Katalog ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! ! !
      !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! Circulation ! ! Home ! ! ! ! ! !
      --- 1,108 ---- ! ! ! KOHA: INTRANET: Katalog ! ! ! ! /includes/common-style.css"> ! ! ! ! ! ! ! ! ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! !
      opcje >>   ! Szybkie wyszukiwanie ! ! szukaj MARC ! ! Dodaj opis ! ! Zarz±dzaj kat. !
      !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj się]

      ! !

      Zaloguj się do Koha

      !       Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- circulation-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 2,20 ****

       

      -
      ! !
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 2,19 ----

       

      !
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz±tek
      Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** circulation-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- circulation-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,131 **** - - - - - ! KOHA: INTRANET: Wypożyczalnia ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! ! Circulation ! ! ! Home ! ! ! ! ! !
      --- 1,104 ---- ! KOHA: INTRANET: Cyrkulacja ! + /includes/common-style.css"> + ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      opcje >>   ! "Wypożyczenia ! ! Zwroty ! ! Transfery biblioteczne !
      ! !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj się]

      ! !

      Zaloguj się do Koha

      !       Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/issues-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- issues-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,21 ****
      - -
      - -
      Pocz±tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz±tek
      Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- members-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,107 **** - - - - - ! KOHA: INTRANET: Czytelnicy ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,91 ---- ! KOHA: INTRANET: Członkowie ! /includes/common-style.css"> ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      options >>   ! Strona domowa ! ! Nowy członek ! ! Nowa oraganizacja !
      !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/parameters-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** parameters-top.inc 3 Feb 2003 02:16:00 -0000 1.1 --- parameters-top.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,120 **** - - ! KOHA: INTRANET: Parameters ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - - -
      ! ! ! ! !

      ! KOHA: Main Menu
      !
      		! ! ! !
      !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - - - -
      --- 1,97 ---- ! KOHA: INTRANET: Parametry ! /includes/common-style.css"> ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! ! !
      options >>   ! Fundusze ! ! Auth value ! ! Tesaurus ! ! Waluty ! ! Drukarki !
      !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- reports-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz±tek || ! Wypożyczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz±tek || ! Katalog || ! Członkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** reports-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- reports-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,105 **** ! ! ! ! KOHA: INTRANET: Reporty ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu główne
      !
      		! ! !
      - - - - Katalog - - Czytelnicy - - Akwizycje - - Reporty - - Wypożyczalnia - - Pocz±tek - - - -
      --- 1,76 ---- ! KOHA: INTRANET: Reporty ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj się]

      + +

      Zaloguj się do Koha

      +       From kb2qzv at users.sourceforge.net Wed Oct 1 14:47:01 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 05:47:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.1,1.2 opac-account.tmpl,1.1,1.2 opac-auth.tmpl,1.3,1.4 opac-detail.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 opac-moredetail.tmpl,1.2,1.3 opac-reserve.tmpl,1.1,1.2 opac-search.tmpl,1.2,1.3 opac-searchresults.tmpl,1.1,1.2 opac-user.tmpl,1.2,1.3 opac-userupdate.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1984 Modified Files: kohaerror.tmpl opac-account.tmpl opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-search.tmpl opac-searchresults.tmpl opac-user.tmpl opac-userupdate.tmpl subject.tmpl Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** kohaerror.tmpl 28 Sep 2003 08:31:24 -0000 1.1 --- kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 6,10 ****
      !
      Wyst?pi? b??d
      --- 6,10 ----
      !
      Wyst?pi? b??d
      Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-account.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** Konto dla ! [Pocz?tek][Wyloguj]

      --- 3,7 ---- Konto dla ! [ Pocz?tek][Wyloguj]

      *************** *** 37,39 **** ! --- 37,39 ---- ! \ No newline at end of file Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-auth.tmpl 29 Jan 2003 23:42:30 -0000 1.3 --- opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 *************** *** 1,22 **** - - !

      Przepraszamy, system KOHA uwa??a, ??e nie masz uprawnie?? do tej strony.

      !

      Przepraszamy, twoja sesja wygas??a, prosimy zalogowa?? si?? ponownie.

      !

      Tw??j dost??p dokonuje si?? z innego adresu IP! Prosimy zalogowa?? si?? ponownie.

      !

      Wprowadzi??e?? niepoprawne has??o lub nazw??, prosimy spr??bowa?? ponownie.

      --- 1,20 ---- !

      Przepraszamy, system KOHA uwa?a, ?e nie masz uprawnie? do tej strony.

      !

      Przepraszamy, twoja sesja wygas?a, prosimy zalogowa? si? ponownie.

      !

      Tw?j dost?p dokonuje si? z innego adresu IP! Prosimy zalogowa? si? ponownie.

      !

      Wprowadzi?e? niepoprawne has?o lub nazw?, prosimy spr?bowa? ponownie.

      *************** *** 31,50 ****
      - ! !
      Koha - Wst??p
      NumerKarty:
      Has??o:
      		 - -
      - - --- 29,45 ---- +
      ! !
      Koha - Wst?p
      NumerKarty:
      Has?o:
      + Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-detail.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 2,6 **** !

      Zalogowany jako: [Strony Cz?onkowskie][Log Out]

      Zaloguj si? do Koha

      --- 2,6 ---- !

      Zalogowany jako: [Strony Cz?onkowskie][Wyloguj si?]

      Zaloguj si? do Koha

      Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 134,135 **** --- 134,138 ----

      + ????????? + ????????? + Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-moredetail.tmpl 26 Jan 2003 03:41:34 -0000 1.2 --- opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,5 **** - -
      --- 1,3 ---- *************** *** 13,24 **** ! ! ! &type=intra> ()

      ! ! --- 11,23 ---- ! ! &type=intra> ()

      ! > ! >

      *************** *** 67,73 ****
      ! ! ! --- 66,72 ---- ! > ! > ! > *************** *** 112,115 **** - - --- 111,112 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-reserve.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,8 ****
      ! !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

      Zaloguj si? do Koha

      --- 3,8 ----
      ! !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj si?]

      Zaloguj si? do Koha

      *************** *** 10,130 **** ! ! !
      ! Przepraszamy, nie wolno ci z?o?y? zam?wienia poniewa? zalegasz na . ! Przepraszamy, nie mo?esz z?o?y? wi?cej jak rezerwacji. ! Z?o?y?e?/a? juz zam?wienie na t? pozycj?. ! Musisz wybra? przynajmniej jeden typ pozycji! !

      - - ! ! !

      ! Strona rezerwacji dla pozycji: ( ) !

      !

      Z?o?ono ju? zam?wie? na t? pozycj?.

      !

      ! Prosimy wybra?, kt?ry typ pozycji Ci? interesuje. Pierwsza z pozycji, ! kt?ra stanie si? dost?pna a nale?y do jednego z tych typ?w ! zostanie dla Ciebie zatrzymana. !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Zam?wienieTyp PozycjiEgzemplarze
      Rezerwacja nie mo?liwa
      !

      ! Prosimy wybra? oddzia?, z kt?rego chcesz odebra? pozycj?: !
      ! !

      ! ! ! !
      Rezerwacja tego dnia:: ! ! ! ! ! ! ! !
      Koniec rezerwacji tego dnia: ! ! ! ! ! ! ! !
      ! !

      ! ! ! ! ! - ! !

      ! Prosimy potwierdzi?, ?e chcesz zam?wi? pozycj? typu: !

      ! !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ Pozycji
      ! ! Kt?ra ma by? podj?ta z .
      ! ! ! !
      Uwaga, bedzie pobrana op?ata w wysoko?ci PLN
      !       ! ! ! !
      !       --- 10,113 ---- ! ! !
      ! Przepraszamy, nie mo?esz z?ozy? zam?wienia poniewa? zalegasz na . ! Przepraszamy, nie mo?esz z?o?y? wi?cej jak rezerwacji. ! Z?o?y?e?/a? ju? zam?wienie na t? pozycj?. ! Musisz wybra? przynajmniej jeden typ pozycji! ! Musisz poda? oddzia? do odbioru! !

      ! !

      Strona rezerwacji dla pozycji: ( )

      !

      Z?o?ono ju? zam?wie? na t? pozycj?.

      !

      Prosimy wybra?, kt?ry typ pozycji Ci? interesuje. Pierwsza z pozycji,kt?ra stanie si? dost?pna a nale?y do jednego z tych typ?w zostanie dla Ciebie zatrzymana. ! !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Zam?wienieTyp PozycjiEgzemplarze
      Rezerwacja nie mo?liwa
      !

      ! Prosimy wybra? oddzia?, z kt?rego chcesz odebra? pozycj?: !
      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Rezerwacja tego dnia: ! ! ! ! ! !
      Koniec rezerwacji tego dnia: ! ! ! ! ! !
      !

      ! !

      ! !

      Prosimy potwierdzi?, ?e chcesz zam?wi? pozycj? typu:

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ Pozycji
      ! kt?ra ma by? podj?ta .
      ! ! !
      Uwaga, b?dzie pobrana op?ata w wysoko?ci PLN
      !       ! !
      Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.2 --- opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,69 **** ! !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

      !

      Zaloguj si? do Koha

      !       ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      !
      S?owo kluczowe
      Tytu? Zwyk?eDok?adne
      Autor
      Ilustrator
      Przedmiot
      Klasa ! !
      Barcode
      !
      !
      !
      ! ! ! --- 1,92 ---- ! !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

      !

      Zaloguj si? do Koha

      !       ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! +
      S?owa kluczowe
      LUB :
      Przedmiot
      LUB jedno albo wi?cej z :
      Tytu?NormalnePrecyzyjne
      Autor
      Ilustrator
      Klasa ! !
      Kod kreskowy
      Zauwa?, ?e je?li wpiszesz jak?? warto?? do S?owa kluczowe, oraz inn? gdzie indziej to u?yta zostanie jedynie warto?? S?owa kluczowego
      + +
      +
      + + + Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-searchresults.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 ****
      !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj si?]

      --- 3,7 ----
      !

      Zalogowano jako: [Strony cz?onkowskie][Wyloguj si?]

      Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 7 Jan 2003 17:13:21 -0000 1.2 --- opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 17,24 ****

      ! Czy kt?rekolwiek z naszych danych s? niepoprawne? Czy ostatnio przeprowadza?e?/a? si?, zmieni?e?/a? numer telefonu lub adres e-mail? !

      ! Zaktualizuj Dane

      --- 16,22 ----

      ! Czy kt?rekolwiek z naszych danych s? niepoprawne? Czy ostatnio przeprowadza?e?/a? si?, zmieni?e?/a? numer telefonu lub adres e-mail?

      ! Zaktualizuj dane

      *************** *** 26,30 **** - Witaj [Wyloguj si?]

      --- 24,27 ---- *************** *** 43,47 **** -
      Masz niezap?acone nale?no?ci i kary w wysoko?ci
      --- 40,43 ---- *************** *** 51,55 **** -
      Posiadasz kredyt na
      --- 47,50 ---- *************** *** 74,88 **** ! Obecnie masz wypo?yczonych pozycji.
      ! ! ! --- 69,83 ---- ! Obecnie masz wypo?yczonych pozycji
      Tytu? Autor Do zwrotuTyp Pozycji Op?atyStatus
      ! ! ! *************** *** 94,99 **** ! ! --- 89,94 ---- ! ! *************** *** 134,136 **** --- 129,132 ---- + Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-userupdate.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 1,54 **** ! !

      Zalogowano jako: [Wyloguj si?]

      !

      Zaloguj si? do Koha

      !       ! ! ! !
      !
      !
      tytu? Autor Do zwrotuTyp pozycji Op?atyBie??cy Status
      TakNieTakNie
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Nazwisko
      Tytu?
      Imi?
      Ulica
      Miasto
      Tel. domowy
      Tel./Fax w pracy
      Email
      !
      ! ! ! ! ! --- 1,56 ---- ! !

      Zalogowano jako: [Wyloguj si?]

      !

      Zaloguj si? do Koha

      ! ! ! Prosz? nanie?? potrzebne zmiany. Biblioteka otrzyma wiadomo?? e-mailem.
      ! Zmiany te nie uka?? si? dop?ki biblioteka ich nie zatwierdzi..

      ! ! !
      !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Nazwisko
      Tytu?
      Imi?
      Ulica
      Miasto
      Tel. domowy
      Tel./Fax w pracy
      Email
      !
      !
      !
      ! !       ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 6 Jan 2003 01:45:52 -0000 1.1 --- subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 *************** *** 3,7 **** !

      Logged in as: [Wyloguj si?]

      Zaloguj si? do Koha

      --- 3,7 ---- !

      Zalogowano jako: [Wyloguj si?]

      Zaloguj si? do Koha

      *************** *** 22,26 ****

      ! trafienia od do z record?w.
      --- 22,26 ----
      ! Trafienia od do z rekord?w.
      *************** *** 48,50 **** - --- 48,49 ---- From tipaul at users.sourceforge.net Wed Oct 1 15:25:51 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:25:51 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv11361/C4 Modified Files: Biblio.pm Log Message: seems a char encoding problem modified something in char_decode sub... changing back to something that works... Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** Biblio.pm 17 Sep 2003 14:21:13 -0000 1.62 --- Biblio.pm 1 Oct 2003 13:25:49 -0000 1.63 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.63 2003/10/01 13:25:49 tipaul + # seems a char encoding problem modified something in char_decode sub... changing back to something that works... + # # Revision 1.62 2003/09/17 14:21:13 tipaul # fixing bug that makes a MARC biblio disappear when using full acquisition (order => recieve ==> MARC editor). *************** *** 684,688 **** my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table --- 687,691 ---- my $record = MARC::Record->new(); #---- TODO : the leader is missing ! $record->leader(' '); my $sth=$dbh->prepare("select bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink from marc_subfield_table *************** *** 2299,2418 **** # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/??/gm ; ! s/\xe2/??/gm ; ! s/\xe9/??/gm ; ! s/\xec/??/gm ; ! s/\xf1/??/gm ; ! s/\xf3/??/gm ; ! s/\xf9/??/gm ; ! s/\xfb/??/gm ; ! s/\xc1\x61/??/gm ; ! s/\xc1\x65/??/gm ; ! s/\xc1\x69/??/gm ; ! s/\xc1\x6f/??/gm ; ! s/\xc1\x75/??/gm ; ! s/\xc1\x41/??/gm ; ! s/\xc1\x45/??/gm ; ! s/\xc1\x49/??/gm ; ! s/\xc1\x4f/??/gm ; ! s/\xc1\x55/??/gm ; ! s/\xc2\x41/??/gm ; ! s/\xc2\x45/??/gm ; ! s/\xc2\x49/??/gm ; ! s/\xc2\x4f/??/gm ; ! s/\xc2\x55/??/gm ; ! s/\xc2\x59/??/gm ; ! s/\xc2\x61/??/gm ; ! s/\xc2\x65/??/gm ; ! s/\xc2\x69/??/gm ; ! s/\xc2\x6f/??/gm ; ! s/\xc2\x75/??/gm ; ! s/\xc2\x79/??/gm ; ! s/\xc3\x41/??/gm ; ! s/\xc3\x45/??/gm ; ! s/\xc3\x49/??/gm ; ! s/\xc3\x4f/??/gm ; ! s/\xc3\x55/??/gm ; ! s/\xc3\x61/??/gm ; ! s/\xc3\x65/??/gm ; ! s/\xc3\x69/??/gm ; ! s/\xc3\x6f/??/gm ; ! s/\xc3\x75/??/gm ; ! s/\xc4\x41/??/gm ; ! s/\xc4\x4e/??/gm ; ! s/\xc4\x4f/??/gm ; ! s/\xc4\x61/??/gm ; ! s/\xc4\x6e/??/gm ; ! s/\xc4\x6f/??/gm ; ! s/\xc8\x45/??/gm ; ! s/\xc8\x49/??/gm ; ! s/\xc8\x65/??/gm ; ! s/\xc8\x69/??/gm ; ! s/\xc8\x76/??/gm ; ! s/\xc9\x41/??/gm ; ! s/\xc9\x4f/??/gm ; ! s/\xc9\x55/??/gm ; ! s/\xc9\x61/??/gm ; ! s/\xc9\x6f/??/gm ; ! s/\xc9\x75/??/gm ; ! s/\xca\x41/??/gm ; ! s/\xca\x61/??/gm ; ! s/\xd0\x43/??/gm ; ! s/\xd0\x63/??/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/??/gm ; ! s/\xe1\x65/??/gm ; ! s/\xe1\x69/??/gm ; ! s/\xe1\x6f/??/gm ; ! s/\xe1\x75/??/gm ; ! s/\xe1\x41/??/gm ; ! s/\xe1\x45/??/gm ; ! s/\xe1\x49/??/gm ; ! s/\xe1\x4f/??/gm ; ! s/\xe1\x55/??/gm ; ! s/\xe2\x41/??/gm ; ! s/\xe2\x45/??/gm ; ! s/\xe2\x49/??/gm ; ! s/\xe2\x4f/??/gm ; ! s/\xe2\x55/??/gm ; ! s/\xe2\x59/??/gm ; ! s/\xe2\x61/??/gm ; ! s/\xe2\x65/??/gm ; ! s/\xe2\x69/??/gm ; ! s/\xe2\x6f/??/gm ; ! s/\xe2\x75/??/gm ; ! s/\xe2\x79/??/gm ; ! s/\xe3\x41/??/gm ; ! s/\xe3\x45/??/gm ; ! s/\xe3\x49/??/gm ; ! s/\xe3\x4f/??/gm ; ! s/\xe3\x55/??/gm ; ! s/\xe3\x61/??/gm ; ! s/\xe3\x65/??/gm ; ! s/\xe3\x69/??/gm ; ! s/\xe3\x6f/??/gm ; ! s/\xe3\x75/??/gm ; ! s/\xe4\x41/??/gm ; ! s/\xe4\x4e/??/gm ; ! s/\xe4\x4f/??/gm ; ! s/\xe4\x61/??/gm ; ! s/\xe4\x6e/??/gm ; ! s/\xe4\x6f/??/gm ; ! s/\xe8\x45/??/gm ; ! s/\xe8\x49/??/gm ; ! s/\xe8\x65/??/gm ; ! s/\xe8\x69/??/gm ; ! s/\xe8\x76/??/gm ; ! s/\xe9\x41/??/gm ; ! s/\xe9\x4f/??/gm ; ! s/\xe9\x55/??/gm ; ! s/\xe9\x61/??/gm ; ! s/\xe9\x6f/??/gm ; ! s/\xe9\x75/??/gm ; ! s/\xea\x41/??/gm ; ! s/\xea\x61/??/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; --- 2302,2421 ---- # $encoding = C4::Context->preference("marcflavour") unless $encoding; if ($encoding eq "UNIMARC") { ! s/\xe1/?/gm ; ! s/\xe2/?/gm ; ! s/\xe9/?/gm ; ! s/\xec/?/gm ; ! s/\xf1/?/gm ; ! s/\xf3/?/gm ; ! s/\xf9/?/gm ; ! s/\xfb/?/gm ; ! s/\xc1\x61/?/gm ; ! s/\xc1\x65/?/gm ; ! s/\xc1\x69/?/gm ; ! s/\xc1\x6f/?/gm ; ! s/\xc1\x75/?/gm ; ! s/\xc1\x41/?/gm ; ! s/\xc1\x45/?/gm ; ! s/\xc1\x49/?/gm ; ! s/\xc1\x4f/?/gm ; ! s/\xc1\x55/?/gm ; ! s/\xc2\x41/?/gm ; ! s/\xc2\x45/?/gm ; ! s/\xc2\x49/?/gm ; ! s/\xc2\x4f/?/gm ; ! s/\xc2\x55/?/gm ; ! s/\xc2\x59/?/gm ; ! s/\xc2\x61/?/gm ; ! s/\xc2\x65/?/gm ; ! s/\xc2\x69/?/gm ; ! s/\xc2\x6f/?/gm ; ! s/\xc2\x75/?/gm ; ! s/\xc2\x79/?/gm ; ! s/\xc3\x41/?/gm ; ! s/\xc3\x45/?/gm ; ! s/\xc3\x49/?/gm ; ! s/\xc3\x4f/?/gm ; ! s/\xc3\x55/?/gm ; ! s/\xc3\x61/?/gm ; ! s/\xc3\x65/?/gm ; ! s/\xc3\x69/?/gm ; ! s/\xc3\x6f/?/gm ; ! s/\xc3\x75/?/gm ; ! s/\xc4\x41/?/gm ; ! s/\xc4\x4e/?/gm ; ! s/\xc4\x4f/?/gm ; ! s/\xc4\x61/?/gm ; ! s/\xc4\x6e/?/gm ; ! s/\xc4\x6f/?/gm ; ! s/\xc8\x45/?/gm ; ! s/\xc8\x49/?/gm ; ! s/\xc8\x65/?/gm ; ! s/\xc8\x69/?/gm ; ! s/\xc8\x76/?/gm ; ! s/\xc9\x41/?/gm ; ! s/\xc9\x4f/?/gm ; ! s/\xc9\x55/?/gm ; ! s/\xc9\x61/?/gm ; ! s/\xc9\x6f/?/gm ; ! s/\xc9\x75/?/gm ; ! s/\xca\x41/?/gm ; ! s/\xca\x61/?/gm ; ! s/\xd0\x43/?/gm ; ! s/\xd0\x63/?/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; ! } elsif ($encoding eq "USMARC" || $encoding eq "MARC21") { if(/[\xc1-\xff]/) { ! s/\xe1\x61/?/gm ; ! s/\xe1\x65/?/gm ; ! s/\xe1\x69/?/gm ; ! s/\xe1\x6f/?/gm ; ! s/\xe1\x75/?/gm ; ! s/\xe1\x41/?/gm ; ! s/\xe1\x45/?/gm ; ! s/\xe1\x49/?/gm ; ! s/\xe1\x4f/?/gm ; ! s/\xe1\x55/?/gm ; ! s/\xe2\x41/?/gm ; ! s/\xe2\x45/?/gm ; ! s/\xe2\x49/?/gm ; ! s/\xe2\x4f/?/gm ; ! s/\xe2\x55/?/gm ; ! s/\xe2\x59/?/gm ; ! s/\xe2\x61/?/gm ; ! s/\xe2\x65/?/gm ; ! s/\xe2\x69/?/gm ; ! s/\xe2\x6f/?/gm ; ! s/\xe2\x75/?/gm ; ! s/\xe2\x79/?/gm ; ! s/\xe3\x41/?/gm ; ! s/\xe3\x45/?/gm ; ! s/\xe3\x49/?/gm ; ! s/\xe3\x4f/?/gm ; ! s/\xe3\x55/?/gm ; ! s/\xe3\x61/?/gm ; ! s/\xe3\x65/?/gm ; ! s/\xe3\x69/?/gm ; ! s/\xe3\x6f/?/gm ; ! s/\xe3\x75/?/gm ; ! s/\xe4\x41/?/gm ; ! s/\xe4\x4e/?/gm ; ! s/\xe4\x4f/?/gm ; ! s/\xe4\x61/?/gm ; ! s/\xe4\x6e/?/gm ; ! s/\xe4\x6f/?/gm ; ! s/\xe8\x45/?/gm ; ! s/\xe8\x49/?/gm ; ! s/\xe8\x65/?/gm ; ! s/\xe8\x69/?/gm ; ! s/\xe8\x76/?/gm ; ! s/\xe9\x41/?/gm ; ! s/\xe9\x4f/?/gm ; ! s/\xe9\x55/?/gm ; ! s/\xe9\x61/?/gm ; ! s/\xe9\x6f/?/gm ; ! s/\xe9\x75/?/gm ; ! s/\xea\x41/?/gm ; ! s/\xea\x61/?/gm ; # this handles non-sorting blocks (if implementation requires this) $string = nsb_clean($_) ; From tipaul at users.sourceforge.net Wed Oct 1 15:43:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 06:43:50 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv16353/updater Modified Files: updatedatabase Log Message: fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** updatedatabase 30 Sep 2003 16:22:05 -0000 1.59 --- updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => '', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', *************** *** 796,799 **** --- 796,802 ---- $dbh->do("ALTER TABLE `items` CHANGE `barcode` `barcode` VARCHAR( 20 )") unless ($nullenabled{barcode} eq 'YES'); + # changing z3950daemon field to NULL in marc_breeding + $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 915,918 **** --- 918,924 ---- # $Log$ + # Revision 1.60 2003/10/01 13:43:48 tipaul + # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". + # # Revision 1.59 2003/09/30 16:22:05 tipaul # adding barcode NOT mandatory feature. Just run updatedatabase to get it. From tipaul at users.sourceforge.net Wed Oct 1 17:03:47 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:03:47 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv32687/updater Modified Files: updatedatabase Log Message: oups... typo fix in z3950random field definition Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** updatedatabase 1 Oct 2003 13:43:48 -0000 1.60 --- updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 *************** *** 581,585 **** field => 'z3950random', type => 'varchar(40)', ! null => 'YES', key => '', default => '', --- 581,585 ---- field => 'z3950random', type => 'varchar(40)', ! null => 'NULL', key => '', default => '', *************** *** 918,923 **** # $Log$ ! # Revision 1.60 2003/10/01 13:43:48 tipaul ! # fixing "z3950daemon not null" problem by changing the field to "null" instead of "not null". # # Revision 1.59 2003/09/30 16:22:05 tipaul --- 918,923 ---- # $Log$ ! # Revision 1.61 2003/10/01 15:03:45 tipaul ! # oups... typo fix in z3950random field definition # # Revision 1.59 2003/09/30 16:22:05 tipaul From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/C4 Z3950.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/C4 Modified Files: Z3950.pm Log Message: fix fog bug #622 : processz3950queue fails Index: Z3950.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Z3950.pm 29 Apr 2003 16:50:51 -0000 1.9 --- Z3950.pm 1 Oct 2003 15:08:14 -0000 1.10 *************** *** 215,219 **** my $serverlist=''; ! $serverlist = join(" ", @serverlist); # chop $serverlist; --- 215,219 ---- my $serverlist=''; ! $serverlist = join("|", @serverlist); # chop $serverlist; *************** *** 307,310 **** --- 307,313 ---- #-------------------------------------- # $Log$ + # Revision 1.10 2003/10/01 15:08:14 tipaul + # fix fog bug #622 : processz3950queue fails + # # Revision 1.9 2003/04/29 16:50:51 tipaul # really proud of this commit :-) From tipaul at users.sourceforge.net Wed Oct 1 17:08:16 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 01 Oct 2003 08:08:16 -0700 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv1097/z3950 Modified Files: processz3950queue Log Message: fix fog bug #622 : processz3950queue fails Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** processz3950queue 5 Sep 2003 11:30:22 -0000 1.6 --- processz3950queue 1 Oct 2003 15:08:14 -0000 1.7 *************** *** 97,101 **** my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\s+/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; --- 97,101 ---- my $globalsyntax; my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { (next) if ($serverdone{$serverinfo} == 1); my $stillprocessing=1; From kb2qzv at users.sourceforge.net Wed Oct 1 17:14:34 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 01 Oct 2003 08:14:34 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes join-top.inc,1.2,1.3 members-top.inc,1.2,1.3 opac-bottom.inc,1.1,1.2 opac-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv2606 Modified Files: join-top.inc members-top.inc opac-bottom.inc opac-top.inc Log Message: Earlier mistakes: files internally had mixed character encodings. Now ... -> iso-8859-2, the standard for the Polish language. Index: join-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/join-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** join-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- join-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,69 **** ! ! KOHA: Zosta? cz?onkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Zosta? cz?onkiemSzukaj ! ! ! Zapisy ! ! Pocz?tek
      KOHA
      ! ! ! ! !
      ! --- 1,67 ---- + ! ! KOHA: Zosta? cz?onkiem ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Zosta? cz?onkiem/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">Szukaj ! ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-join.gif" ! width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home">
      /images/inside-koha-bottom.gif" ! width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" ! width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" >
      ! ! ! ! !
      ! ????????? ! ????????? \ No newline at end of file Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- members-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 35,42 **** src="/images/menu-search.gif" width=71 height=30 alt="Szukaj" hspace=0 vspace=0 border=0 name="menu-search"> - - Zapisy
      ! !

       

      !
      !
      ! ! Przeszukiwanie Katalogu || ! ! Zosta? cz?onkiem || ! Pocz?tek ! ! !
      ! ! --- 1,32 ----
      ! ! ! !

       

      ! !
      ! !
      ! ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz?tek ! ! ! ! ! !
      ! ! ! ! ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-top.inc 26 Jan 2003 03:41:34 -0000 1.2 --- opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 *************** *** 1,73 **** ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Przeszukiwanie KataloguSearch ! ! ! Zapisy ! ! Pocz?tek
      KOHA
      ! ! ! ! !
      --- 1,70 ---- ! ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      KOHA: Przeszukiwanie KataloguSearch ! ! Zapisy ! ! Pocz?tek
      KOHA
      ! ! ! ! !
      From kb2qzv at users.sourceforge.net Fri Oct 3 22:04:20 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Fri, 03 Oct 2003 13:04:20 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.4,1.5 opac-detail.tmpl,1.2,1.3 opac-main.tmpl,1.3,1.4 opac-reserve.tmpl,1.2,1.3 opac-user.tmpl,1.3,1.4 opac-userupdate.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27293 Modified Files: opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-reserve.tmpl opac-user.tmpl opac-userupdate.tmpl Log Message: minor translation improvements Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-auth.tmpl 1 Oct 2003 12:46:58 -0000 1.4 --- opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + *************** *** 29,35 **** -
      --- 30,36 ----
      Koha - Wst?p
      + *************** *** 39,45 ****
      Koha - Wst?p
      - --- 40,49 ----
      + + + +       Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-detail.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 65,69 **** Witryna Online ! Dost?pn --- 65,69 ---- Witryna Online ! Dost?pna *************** *** 76,78 ****

      - --- 76,77 ---- Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-main.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 134,138 ****

      - ????????? - ????????? - --- 134,135 ---- Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-reserve.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 35,40 **** Egzemplarze ! ! --- 35,40 ---- Egzemplarze ! ! *************** *** 53,57 **** - - --- 64,67 ---- *************** *** 87,90 **** --- 85,89 ----

      Prosimy potwierdzi?, ?e chcesz zam?wi? pozycj? typu:

      +
      Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-user.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 *************** *** 130,132 **** - --- 130,131 ---- Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-userupdate.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 *************** *** 44,48 ****

      ! --- 44,48 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 10:26:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:26:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv23506/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:27:41 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:27:41 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv23662/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv23760/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:28:40 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:28:40 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv23803/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ added to the repository From kb2qzv at users.sourceforge.net Sat Oct 4 10:37:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:37:22 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv24872 Added Files: about.tmpl Log Message: first translation --- NEW FILE ---

      Dane o bie??cej wersji Koha w celu zg?aszania b??d?w (lub dla informacji og?lnej).

      Rezerwacja tego dnia: --- 53,56 ---- *************** *** 65,69 ****
      Koniec rezerwacji tego dnia:
      Wersja Koha:
      Wersja OS (przez 'uname -a'):
      Wersja Perl:
      Wersja MySQL:
      Wersja Apache:
      From kb2qzv at users.sourceforge.net Sat Oct 4 10:43:12 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:43:12 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl auth.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv25416 Modified Files: auth.tmpl Log Message: corrections of closing tag

Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/auth.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** auth.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- auth.tmpl 4 Oct 2003 08:43:10 -0000 1.3 *************** *** 3,22 **** !

Przepraszamy, system KOHA uwa?a, ?e nie masz uprawnie? do tej strony.

!

Przepraszamy, twoja sesja wygas?a, prosimy zalogowa? si? ponownie.

!

Tw?j dost?p dokonuje si? z innego adresu IP! Prosimy zalogowa? si? ponownie.

!

Wprowadzi?e? niepoprawne has?o lub nazw?, prosimy spr?bowa? ponownie.

--- 3,22 ---- !

Przepraszamy, system KOHA uwa?a, ?e nie masz uprawnie? do tej strony.

 !

Przepraszamy, twoja sesja wygas?a, prosimy zalogowa? si? ponownie.

 !

Tw?j dost?p dokonuje si? z innego adresu IP! Prosimy zalogowa? si? ponownie.

 !

Wprowadzi?e? niepoprawne has?o lub nazw?, prosimy spr?bowa? ponownie.

 From kb2qzv at users.sourceforge.net Sat Oct 4 10:48:37 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 01:48:37 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl bookcount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26009 Modified Files: bookcount.tmpl Log Message: latest code update Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/bookcount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** bookcount.tmpl 7 Jan 2003 16:45:50 -0000 1.2 --- bookcount.tmpl 4 Oct 2003 08:48:35 -0000 1.3 *************** *** 2,9 ****

! ! &type="intra"> ()

- --- 2,8 ----

!

! &type="intra"> ()

From kb2qzv at users.sourceforge.net Sat Oct 4 11:00:33 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:00:33 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl boraccount.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv27387 Modified Files: boraccount.tmpl Log Message: latest code update Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/boraccount.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** boraccount.tmpl 25 Jan 2003 20:05:47 -0000 1.2 --- boraccount.tmpl 4 Oct 2003 09:00:30 -0000 1.3 *************** *** 3,10 **** ! Konto dla

!   !

--- 3,10 ---- !

Konto dla ">

! Generuj rachunek   ! Generuj kredyt

*************** *** 15,21 ****

! ! ! --- 15,21 ---- ! ! ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,50 **** - - - --- 45,47 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 11:15:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:15:07 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl intranet-main.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv28840 Modified Files: intranet-main.tmpl Log Message: latest code update Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/intranet-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- intranet-main.tmpl 4 Oct 2003 09:15:04 -0000 1.3 *************** *** 15,27 **** if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> --- 15,27 ---- if (document.images){ search=new Image; ! search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; ! acquisitions.src ="/images/front-mouseover-acquisitions.gif" reports=new Image; ! reports.src ="/images/front-mouseover-reports.gif" circulation=new Image; ! circulation.src ="/images/front-mouseover-circulation.gif" } //--> *************** *** 45,72 **** ! ! ! --- 8,16 ---- ! ! *************** *** 19,62 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
KARY I OP?ATYKWOTADO ZAP?ATY
/images/background-mem.gif" colspan=2>KARY I OP?ATY/images/background-mem.gif" colspan=1>KWOTA/images/background-mem.gif" colspan=1>DO ZAP?ATY
RAZEM DO ZAP?ATY
Razem do zap?aty
! ! ! ! ! ! ! ! ! ! --- 45,72 ---- ! !
! ! ! ! ! ! ! ! ! ! *************** *** 75,108 **** ! ! ! - - --- 75,112 ---- ! ! ! ! *************** *** 112,117 **** --- 116,121 ---- *************** *** 127,131 ****
Wprowad? wyra?enie i naci?nij kalwisz enter.
! --- 131,135 ----
Wprowad? wyra?enie i naci?nij kalwisz enter.
! *************** *** 139,143 **** ! ! ! ! ! --- 170,176 ---- ! *************** *** 178,182 **** ! --- 182,186 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 11:21:03 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:21:03 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl mancredit.tmpl,1.2,1.3 maninvoice.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv29571 Modified Files: mancredit.tmpl maninvoice.tmpl Log Message: latest code update Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** mancredit.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 *************** *** 21,23 **** - --- 21,22 ---- Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 7 Jan 2003 19:52:00 -0000 1.1 --- maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 *************** *** 1,4 **** - - --- 1,2 ---- *************** *** 21,28 **** !
!
! Koha: Horowhenua Library Trust
Wprowad? wyra?enie i naci?nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (wi?cej opcji)
!
!
! Koha: Horowhenua Library Trust		 + +
+ +
Wprowad? wyra?enie i naci?nij klawisz enter.
! ! -Wyszukiwanie zaawansowane (wi?cej opcji)
! !
! ! ! !




!
!
Opis
Kwota
! ! \ No newline at end of file --- 19,25 ----
Opis
Kwota
! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 11:25:46 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:25:46 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv30220 Added Files: member-flags.tmpl Log Message: first upload --- NEW FILE ---

,

>
FLAGI
>

From kb2qzv at users.sourceforge.net Sat Oct 4 11:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:34:17 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbib.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv32526 Modified Files: modbib.tmpl Log Message: latest code update Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbib.tmpl 7 Jan 2003 20:13:24 -0000 1.1 --- modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 *************** *** 8,16 ****
Autor">
Tytu?">
Autor">
Tytu?">
Subject - ...
Data Copyright">
Tytu? Serii">
Autor dodatkowy">
Podtytu?">
Ujednolicony">
Notatki
Seria">
Analytic Author
Analytic Title
--- 19,53 ---- ! Przedmiot ! Data Copyright'u ! "> Tytu? Serii ! "> Autor dodatkowy ! "> Podtytu? ! "> Ujednolicony ! "> Notatki ! Seria ! "> From kb2qzv at users.sourceforge.net Sat Oct 4 11:52:38 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:52:38 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modbibitem.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2303 Modified Files: modbibitem.tmpl Log Message: latest code update Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbibitem.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 *************** *** 1,7 **** ! !

! "&type=intra> ()
! Modyfikuj Grup? -
--- 1,5 ---- !

"&type=intra> ()
! Modyfikuj Grup? -


*************** *** 70,75 **** ! ZMIANY DOTYCZ?CE TYCH KOD?W KRESKOWYCH
! Zaznacz te kody kreskowe, kt?rych zmiany maj? dotyczy?. Te nie-zaznaczone zachowaj? swoj? oryginaln? grup?. --- 68,73 ---- ! ZMIANY MAJ?CE DOTYCZY? TYCH KOD?W KRESKOWYCH
! Zaznacz TE kody kreskowe, kt?rych zmiany maj? dotyczy?. Wszystkie nie-zaznaczone zachowaj? swoj? oryginaln? grup?. *************** *** 101,110 **** ! POMOC: Musisz klikn?? w ?adane k??ko wyboru (na zielonym tle), i albo przypisa? pozycj?/e do istniej?cego ju? w systemie rekordu, ! albo zmodyfikowa? ten rekord. JE?LI zmiany maj? dotyczy? jedynie niekt?rych pozycji, zaznacz je odpowiednio, w?wczas utworzony zostanie dla nich ! automatycznie osobny rekord grupowy.

 

- --- 99,106 ---- ! POMOC: Musisz klikn?? w ??dane k??ko wyboru (na zielonym tle), nast?pnie albo przypisa? pozycj?/e do istniej?cego ju? w systemie rekordu, ! albo zmodyfikowa? ten rekord. JE?LI zmiany maj? dotyczy? jedynie niekt?rych pozycji, zaznacz je odpowiednio, w?wczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

 

From kb2qzv at users.sourceforge.net Sat Oct 4 11:59:51 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 02:59:51 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3204 Modified Files: moditem.tmpl Log Message: latest code update Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** moditem.tmpl 26 Jan 2003 03:36:37 -0000 1.3 --- moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 *************** *** 1,5 **** ! ()
--- 38,42 ----
--- 1,5 ---- !

()


! ! --- 19,34 ---- ! ! *************** *** 38,43 ****
*************** *** 19,34 **** Zagubiona ! zaznaczono > ! Tak ! zaznaczono > ! Nie
Anulowana zaznaczono > ! Tak ! zaznaczono > ! Nie
Zagubiona ! checked > ! Yes ! checked > ! No
Cancelled checked > ! Yes ! checked > ! No
!
! //images/filesave.png border=0>
*************** *** 45,48 **** ! ! --- 44,46 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Sat Oct 4 12:03:06 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:03:06 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl modwebsites.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv3938 Modified Files: modwebsites.tmpl Log Message: latest code update Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modwebsites.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 *************** *** 2,6 ****

">Powr?t do strony szczeg???w ! EOF --- 2,6 ----

">Powr?t do strony szczeg???w ! *************** *** 47,51 **** ! EOF --- 47,51 ---- ! From kb2qzv at users.sourceforge.net Sat Oct 4 12:07:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:07:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newimember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv4513 Modified Files: newimember.tmpl Log Message: latest code update Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 *************** *** 7,15 **** Niewa?ny numer karty.

" value=""> !
--- 7,16 ---- Niewa?ny numer karty.

+ Warto?ci zgodne. Kliknij OK, by potwierdzi? nowego czytelnika

" value=""> !
*************** *** 17,19 **** - --- 18,19 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 12:10:45 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 03:10:45 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv7558 Modified Files: newjmember.tmpl Log Message: latest code update Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newjmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 *************** *** 5,9 ****

'Potwierd? Wpis'

! --- 5,9 ----

'Potwierd? Wpis'

!
*************** *** 13,17 **** --- 13,17 ---- *************** *** 29,33 **** --- 29,33 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 14:53:09 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:53:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl request.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv1364 Added Files: request.tmpl stats.tmpl Log Message: first upload --- NEW FILE ---
/images/place-request.gif" align=right > "> ">

Zamawienie: >

! &nbpsq;
!  
! &nbpsq;
!  
/images/background-mem.gif">Ranga /images/background-mem.gif">Numer Cz?onka /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbi?r /images/background-mem.gif">Zam?wienie
Kolejna dost?pna,
(lub wybierz z listy poni?ej)
/images/background-mem.gif">Zam?wienie /images/background-mem.gif">Typ pozycji /images/background-mem.gif">Klasyfikacja /images/background-mem.gif">Tom /images/background-mem.gif">Data publikacji /images/background-mem.gif">Egzemplarze
Nie mo?e by? wybrana > >

 

action=modrequest.pl method=post>
/images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJ?CE ZAM?WIENIA
/images/background-mem.gif">Ranga /images/background-mem.gif">Cz?onek /images/background-mem.gif">Uwagi /images/background-mem.gif">Data /images/background-mem.gif">Odbi?r /images/background-mem.gif">Zam?wienie
> > > Oczekuj?ca pozycja w > &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> Kolejna dost?pna Tylko ten typ :
Wyma? rezerwacj? wybieraj?c "del" z listy ranga. //images/2rightarrow.png">


--- NEW FILE ---
Nazwa Typ Data/czas Kwota Odzia?

Zap?acono w sumie:
Odpisano w sumie:

From kb2qzv at users.sourceforge.net Sat Oct 4 14:58:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 05:58:43 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newmember.tmpl,1.1,1.2 opac-main.tmpl,1.2,1.3 overdue.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.2,1.3 updatebiblio.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv2725 Modified Files: newmember.tmpl opac-main.tmpl overdue.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: latest code update Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newmember.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,13 **** -

Potwierd? Wpis

" > ! ! --- 1,10 ---- +

Potwierd? Wpis

"> ! NOWY CZYTELNIK ! !  
" > ! *************** *** 21,30 **** " > ! - --- 18,24 ---- " > ! *************** *** 49,61 **** ! ! ! ! --- 43,47 ---- *************** *** 70,74 **** " > ! - - - - - --- 75,85 ---- " > ! *************** *** 125,134 **** " > ! - --- 100,106 ---- " > ! *************** *** 149,158 **** " > ! - --- 121,127 ---- " > ! *************** *** 188,197 **** ! " > ! --- 157,171 ---- ! ! ! ! " > ! *************** *** 229,238 **** " > ! - --- 203,209 ---- " > ! *************** *** 252,256 **** ! --- 223,249 ---- !

B??D

!

Nast?puj?ce pola s? ?le wype?nione. Wr?? do poprzedniej strony i spr?buj raz jeszcze:

! ! Cardnumber
! ! ! Invalid_cardnumber
! ! ! Gender
! ! ! Given Names
! ! ! Surname
! ! ! Postal Street Address
! ! ! Postal city
! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,135 **** ! WITAMY W KATALOGU KOHA
/images/background-mem.gif"> ! NOWY CZ?ONEK
"> SZCZEG??Y CZ?ONKOWSKIE -   -
/images/background-mem.gif"> SZCZEG??Y CZ?ONKOWSKIE
! !
! Area ! !
!
! Data Zapisu --- 56,60 ----
! Data zapisu *************** *** 89,110 **** !
"> DANE PERSONALNE -   -
- Etniczno?? - - -
!
/images/background-mem.gif"> DANE PERSONALNE
"> ADRES CZYTELNIKA -   -
/images/background-mem.gif"> ADRES CZYTELNIKA
"> DANE OSOBY KONTAKTOWEJ -   -
/images/background-mem.gif"> DANE OSOBY KONTAKTOWEJ
"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ !  
! Text messaging ! !
/images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
"> NOTATKI -   -
/images/background-mem.gif"> NOTATKI

Koha: Katalog i us?ugi dla czytelnik?w		 Szukaj w katalogu
   

Wprowad? wyra?enie i naci?nij klawisz enter.
-Wyszukiwanie zaawansowane (wi?cej opcji)

Zalogowano jako: [Wyloguj]

Zaloguj si? do Koha

! --- 1,269 ---- ! + WITAMY W KATALOGU KOHA + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ Koha: Katalog i us?ugi dla czytelnik?w		Szukaj w katalogu
   
+ +
+ + Wprowad? wyra?enie i naci?nij klawisz enter.
+ + + -Wyszukiwanie zaawansowane (wi?cej opcji)
+ + +

+ +

Zalogowano jako: [Wyloguj]

+ +

Zaloguj si? do Koha

+ +
+ +
+

+

! Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 *************** *** 1,10 **** ! ! ! ! ! ! Pozycje zaleg?e w dniu

--- 1,6 ---- ! !

Pozycje zaleg?e w dniu


*************** *** 34,39 **** ! ! ! ! --- 30,32 ---- ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** thesaurus_popup.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 1,16 **** ! ! Kreator warto?ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!

"> ! "> ! "> ! ! ! --- 1,18 ---- ! ! Kreator warto?ci Tezaurusa dla kategorii <TMPL_VAR name="category"> ! ! !

!
!

! "> ! "> ! "> ! ! !

*************** *** 24,33 **** !
"> "> wprowad? now? authority : ! ! ! --- 40,43 ---- } ! ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** updatebiblio.tmpl 26 Jan 2003 03:36:37 -0000 1.2 --- updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 *************** *** 3,9 **** !

Kliknij "Wy?lij", by wymusi? has?o przedmiotowe
!

--- 3,9 ---- !

Kliknij "Prze?lij..", by wymusi? przedmiot
!

*************** *** 17,19 **** - --- 17,18 ---- From kb2qzv at users.sourceforge.net Sat Oct 4 21:46:31 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:46:31 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25169 Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: first translation and upload --- NEW FILE ---

Akwizycje


SK?ADANIE ZAM?WIENIA, ODBI?R LUB MODYFIKACJA
Nazwa dostawcy
ODBI?R LUB MODYFIKACJA ZAM?WIE? REGULARNYCH
Wyszukiwanie tytu?owe

KURSY WYMIANY
" value=>
BUD?ET ORAZ WYDATKI KSI?GARSKIE
Bud?et Suma Wydano Alokowano Dost?pne
Total

Zastosuj kombinacj? klawiszy [ctrl + r] aby wy?wietli? uaktualnione cyfry. Podane cyfry s? przybli?one, gdy? kurs wymiany wp?ywa na kwot? faktycznie zap?acon?.

POMOC zam?wienia:

    By rozpocz?? akwizycj?, niezale?nie czy jest to zam?wienie, zakup w?asny czy darowizna najpierw wyszukaj dostawc?, dodaj go je?li potrzeba.
    Nast?pnie wybierz poprzedni koszyk lub utw?rz nowy. Uwaga, koszyk b?dzie nale?a? do nazwy u?ytkownika z jak? si? zalogowa?e?/a?.
    Aby z?ozy? zam?wienie nale?y ustali? czy istnieje ju? opis dla pozycji, nast?pnie albo doda? pozycj? albo wstawi? nowy opis i doda? pozycj?.

W celu zamkni?cia koszyka kliknij na "zobacz koszyki" lub szukaj powy?ej, a nast?pnie naci?nij "zatwierd? koszyk".

--- NEW FILE ---

Rachunek:
Otrzymany przez:

Receipt Summary for: Invoice,

- Odbi?r zam?wienia


Koszyk dla:
Zam?wienie z?o?one:

/images/background-mem.gif" colspan=2> SZCZEG??Y KATALOGU
Tytu? * " >
Autor " >
Data Copyright " >
Format
ISBN ">
Series ">
Oddzia?
Kod kreskowy pozycji * ">
Informacje tomowe (for serials) *
> > > "> "> "> /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0>
DETALE KSI?GOWO-FINANSOWE
Bookfund *
Ilo?? zam?wiona ">
Ilo?? odebrana * ">
Koszt wymiany ">
Budgeted Cost ">
Faktyczny koszt * ">
Numer rachunku ">
Uwagi ">

 


Koszyk ISBN TYTU? AUTOR Ilo?? Otrzymano
&biblio=&invoice=&freight=&gst=&id=>
--- NEW FILE ---

Koszyk dla >


(Our Reference: , #, zatwierdzone przez: )

"> > ">
Zam?wienie Isbn Tytu? Autor $ rrp $est Ilo?? Suma
&id=&basket=">
POMOC
W celu zmiany informacji dotycz?cej katalogu lub zaksi?gowania danego zam?wienia nalezy klikn?? w tytu?.
 SubTotal
GST
TOTAL
"> "> Dodaj zam?wienie : wprowad? has?o lub tytu?:

--- NEW FILE ---

Koszyk dla


(Our Reference: , #, zatwierdzone przez: )
Tel: , Fax:
,
,

"> "> Wyszukaj has?o lub tytu?:
>
Zam?wienie Isbn Tytu? Autor Ilo??
--- NEW FILE ---
"> "> "> "> "> "> "> "> "> "> " value=""> Obejrzyj koszyk

- Szczeg??y zam?wienia


Koszyk dla:

SZCZEG??Y KATALOGU
TYTU? * ">
Autor " >
Data Copyright ">
Format
ISBN ">
Series ">
Oddzia?
/images/holder.gif" width=32 height=250 align=left>
DETALE KSI?GOWO-FINANSOWE
Ilo?? " onchange='update(this.form)' >
Bookfund
Cena dostawcy " onchange='update(this.form)'>
Koszt wymiany
" onchange='update(this.form)'>
Budgeted Cost
(ex GST, inc discount) 		" onchange='update(this.form)'>
Budgeted GST
BUDGETED TOTAL
Koszt faktyczny
Numer rachunku *
Uwagi ">
//images/2rightarrow.png" border=0 align=right>
HELP
  • T?uste pola s? obowiazkowe dla stworzenia nowego opisu i pozycji.

  • Zacienione pola mog? by? u?yte w celu "szybkiego" odbioru zam?wienia, gdy pozycje by?y kupione lokalnie lub darowane. W tym wypadku ilo?? "zam?wiona" zostanie wprowadzona do bazy jako ilo?? otrzymana.

 

--- NEW FILE ---

Wyniki wyszukiwania dostawc?w


Szukano dostawcy , znaleziono rezultat(y)(?w)

>
Zam?w Odbierz Podmiot
Koszyk Pozycje Pracownik Data
/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
">


Dodaj dostawc? --- NEW FILE ---
Rachunek:
Otrzymany przez:

Receipt Summary for : , Rachunek

"> "> "> "> Szukaj ISBN lub tytu?:

">
KOSZYK ISBN TYTU? AUTOR FAKTYCZNY P&P IL SUMA
&biblio=&invoice=&gst=&freight=&id="> $ $
SUBTOTALS $ $
POMOC
The total at the bottom of the page should be within a few cents of the total for the invoice.

When you have finished this invoice save the changes.

GST $
TOTAL $
--- NEW FILE ---

Odbi?r zam?wie? od dostawcy ">

>

INFORMACJE O RACHUNKU DOSTAWCY
Numer rachunku dostawcy
GST
Za przesy?k?
/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>

--- NEW FILE --- >

Uaktualnienie:

Dodaj dostawc?

Szczeg??y podmiotu
Nazwa podmiotu ">
Adres pocztowy
Adres fizyczny
Telefon ">
Fax ">
Witryna ">
Dane kontaktowe
Nazwisko ">
Stanowisko ">
Telefon ">
Inny telefon ">
Fax ">
E-mail ">
Uwagi
/images/filesave.png" border=0 title="save" alt="save">
BIE??CY STATUS
Dostawca jest checked>Active checked>Inactive
DANE O ZAM?WIENIACH
Publishers and Imprints
List Prices are
Invoice Prices are
GST Registered checked>Yes checked>No
List Item Price Includes GST checked>Yes checked>No
Invoice Item Price Includes GST checked>Yes checked>No
Rabat > %
From kb2qzv at users.sourceforge.net Sat Oct 4 21:47:11 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 04 Oct 2003 12:47:11 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv25270 Modified Files: newbasket2.tmpl Log Message: minor corrections Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket2.tmpl 10 Jan 2003 22:04:42 -0000 1.1 --- newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 *************** *** 1,5 **** !

Nowy koszyk dla:

--- 1,5 ---- !

Koszyk dla:

From kb2qzv at users.sourceforge.net Sun Oct 5 20:51:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:51:48 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple isbnsearch.tmpl,1.3,1.4 marcimport.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4163 Modified Files: isbnsearch.tmpl marcimport.tmpl Log Message: update of code and translation Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** isbnsearch.tmpl 3 Feb 2003 05:36:43 -0000 1.3 --- isbnsearch.tmpl 5 Oct 2003 18:51:46 -0000 1.4 *************** *** 1,44 **** ! ! Rezultaty wyszukiwania opisu
! Szukano ISBN
! Trafienia od do wy?wietlono -

! ! ! ! ! ! ! ! ! "> ! -
TYTU?AUTOR©Pozycje
">Edycja...

- - &offset=&num="> - -

- Trafienia wed?ug stron: - &offset=&num=5">5 - &offset=&num=10">10 - &offset=&num=20">20 - &offset=&num=50">50 -

-
-

 

--- 1,104 ---- ! Rezultaty wyszukiwania opisu
! Szuka?e? ISBN tytu?
! znaleziono
! Trafienia z wy?wietlono

! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! ! !
Opisy w koha
! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! !
Tytu?Autor© 
">Dodaj pozycj?">Edytuj...
Nic nie znaleziono
!
! ! ! ! !
Opisy w hurtowni opis?w
! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Tytu?AutorISBNpochodz?cy z  
! ">Dodaj opis
Nic nie znaleziono
    ">Dodaj nowy opis">Dodaj nowy opis
+
Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marcimport.tmpl 9 Jan 2003 11:27:22 -0000 1.1 --- marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 *************** *** 1,3 **** -

System akwizycji MARC

--- 1,2 ---- *************** *** 5,18 **** !
Importuj do farmy hodowlanej
!

Importuj wyniki :

    rekordy importowano

    nie importowano poniewa? ju? s? w bazie

    !

    nie importowano poniewa? ju? s? w farmie

    nie importowano poniewa? nie wygl?daj? na b?d?ce w formacie MARC (lub brakuje ISBN/ISSN) !

    rekord?w przeczytanych

    --- 4,17 ---- !
    Importuj do hurtowni opis?w
    !

    Import wyniki :

      rekordy importowano

      nie importowano poniewa? ju? s? w bazie

      !

      nie importowano poniewa? ju? s? w hurtowni

      nie importowano poniewa? nie wygl?daj? na b?d?ce w formacie MARC (lub brakuje ISBN/ISSN) !

      rekord?w przeczytanych

      *************** *** 21,31 ****
        ! Wybierz plik, by importowa? go do farmy hodowlanej. B?dzie przeczytany i dla ka?dego znalezionego numeru ISBN ! utworzone zostanie nowe "ciel?tko" w farmie. Je?li ISBN ju? w farmie istnieje mo?na zdecydowa? czy nowe ! powinno by? zignorowane czy te? stare nadpisane nowym.
        ! Mo?na nada? nazw? dla tego importu. Mo?e si? przyda? przy tworzeniu opisu bibliograficznego wskazuj?c ! pochodzenie sugerowanych danych MARC !
        ! Oczywi?cie opis b?dzie ignorowany je?li numer ISBN istnieje ju? w aktywnej bazie Koha. !
      " enctype="multipart/form-data"> --- 20,28 ----
        !
      • Wybierz plik, by importowa? go do hurtowni opis?w. B?dzie przeczytany i dla ka?dego znalezionego numeru ISBN utworzone zostanie nowe "ciel?tko" w hurtowni.
        • !
      • Je?li ISBN ju? w hurtowni istnieje mo?na zdecydowa? czy nowe powinno by? zignorowane czy te? stare nadpisane nowym.
        • !
      • Mo?na nada? nazw? dla tego importu. Mo?e si? przyda? przy tworzeniu opisu bibliograficznego wskazuj?c pochodzenie sugerowanych danych MARC !
        • !
      • Oczywi?cie opis b?dzie ignorowany je?li numer ISBN istnieje ju? w aktywnej bazie Koha.
        • !
      " enctype="multipart/form-data">
      *************** *** 43,47 **** ! --- 40,44 ---- ! From kb2qzv at users.sourceforge.net Sun Oct 5 20:57:18 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 11:57:18 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple marcimport.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv4985 Modified Files: marcimport.tmpl Log Message: update of code and translation Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** marcimport.tmpl 5 Oct 2003 18:51:46 -0000 1.2 --- marcimport.tmpl 5 Oct 2003 18:57:16 -0000 1.3 *************** *** 20,25 ****
        !
      • Wybierz plik, by importowa? go do hurtowni opis?w. B?dzie przeczytany i dla ka?dego znalezionego numeru ISBN utworzone zostanie nowe "ciel?tko" w hurtowni.
        • !
      • Je?li ISBN ju? w hurtowni istnieje mo?na zdecydowa? czy nowe powinno by? zignorowane czy te? stare nadpisane nowym.
      • Mo?na nada? nazw? dla tego importu. Mo?e si? przyda? przy tworzeniu opisu bibliograficznego wskazuj?c pochodzenie sugerowanych danych MARC !
      • Oczywi?cie opis b?dzie ignorowany je?li numer ISBN istnieje ju? w aktywnej bazie Koha.
        • --- 20,25 ----
          !
        • Wybierz plik, by importowa? go do hurtowni opis?w. B?dzie przeczytany i dla ka?dego znalezionego numeru ISBN utworzone zostanie nowe "ciel?tko" w farmie.
          • !
        • Je?li ISBN ju? w farmie istnieje mo?na zdecydowa? czy nowe powinno by? zignorowane czy te? stare nadpisane nowym.
        • Mo?na nada? nazw? dla tego importu. Mo?e si? przyda? przy tworzeniu opisu bibliograficznego wskazuj?c pochodzenie sugerowanych danych MARC !
        • Oczywi?cie opis b?dzie ignorowany je?li numer ISBN istnieje ju? w aktywnej bazie Koha.
          • *************** *** 40,46 ****
      ! ! --- 40,52 ---- ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Oct 5 21:20:44 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 12:20:44 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1:/tmp/cvs-serv8858 Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl Log Message: first upload --- NEW FILE --- Dodaj nowy opis bibliograficzny
      Je?li ISBN ju? jest w farmie : Odrzu? ten, zatrzymaj istniej?cy
      Zast?p istniej?cy nowym
      Je?li ISBN ju? jest w hurtowni : Odrzu? ten, zatrzymaj istniej?cy
      Zast?p istniej?cy nowym
      Je?li ISBN ju? jest w hurtowni : Odrzu? ten, zatrzymaj istniej?cy
      ! Zast?p istniej?cy nowym
      Character encoding (USMARC or UNIMARC) !
      !
      Je?li ISBN ju? jest w hurtowni: Ignoruj to, zatrzymaj istniej?ce
      ! Nadpisz istniej?ce obecnym
      Sekcja Pierwsza: Informacje Copyright

      Prosz? okre?li? tytu?
      Tytu?: *
      Podtytu?:
      Autor:
      Tytu? serii:
      (je?li dotyczy)
      Data Copyright:
      Abstract:
      Uwagi:
      * Wymagane pola --- NEW FILE --- test

      Musisz nada? pozycji kod kreskowy

      Musisz otworzy? now? grup?, do kt?rej dodana zostanie pozycja

      Niestety, ten kod jest ju? w u?yciu

      REKORD BIBLIOGRAFICZNY
      Autor:
      Copyright:
      Tytu? serii:
      Uwagi:
      GRUPA -
      URL:
      Data:
      Uwagi:
      GRUPA -
      ISBN:
      Dewey:
      Wydawca:
      Miejsce:
      Data:
      Pozycja:
      Odzia? w?asny:
      Uwagi:

      ">
      DODAJ NOW? POZYCJ?:
      Dla witryny dodaj tylko grup?
      Kod kreskowy pozycji:
      Oddzia?:
      Cena wymiany:
      Uwagi:
      Dodaj do istniej?cej grupy:
      Grupa:
      LUB dodaj do nowej grupy:
      Format:
      ISBN:
      Wydawca:
      Rok publikacji:
      Miejsce publikacji:
      Ilustrator:
      Dodatkowi autorzy:
      Ka?dy autor w osobnej linii
      Subject Headings:
      One Subject per line
      Witryna URL:
      Dewey:
      Dewey Subclass:
      ISSN:
      LCCN:
      Tom:
      Numer:
      Volume Description:
      Strony:
      Wymiary:
      Uwagi:
      From slef at users.sourceforge.net Sun Oct 5 23:27:08 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 05 Oct 2003 14:27:08 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.51,1.52 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv30966 Modified Files: Install.pm Log Message: add locale test (Closes: 576) and remove crap underlining Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** Install.pm 8 Sep 2003 13:36:00 -0000 1.51 --- Install.pm 5 Oct 2003 21:27:06 -0000 1.52 *************** *** 231,239 **** access some of the features of the intranet. ! IMPORTANT : ! ! ============ ! ! You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. --- 231,235 ---- access some of the features of the intranet. ! IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. *************** *** 719,722 **** --- 715,721 ---- if (@missing > 0) { my $missing=''; + if (POSIX::setlocale(LC_ALL) != "C") { + $missing.=" export LC_ALL=C\n"; + } foreach my $module (@missing) { $missing.=" perl -MCPAN -e 'install \"$module\"'\n"; *************** *** 878,886 **** Please provide a good password for the user %s. ! IMPORTANT : ! ! ============ - You can log in using this userid and password at any time. Password for database user %s: |; --- 877,882 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; From kb2qzv at users.sourceforge.net Mon Oct 6 00:44:04 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 05 Oct 2003 15:44:04 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue catalogue-home.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv11000 Modified Files: catalogue-home.tmpl detail-opac.tmpl detail.tmpl Log Message: no message Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- catalogue-home.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 5,42 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj si? do Koha

      -
      ! Wyszukiwanie w katalogu -
      - - -
      ! ! ! ! ! ! ! ! ! !
      Numer pozycji     OR
       
      HELP
      ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

      ! Catalogue ! Maintenance: To add a new biblio or item go to ! acquisitions.

      ! To request, modify or delete a biblio or item first search for it here.

      --- 5,33 ---- !

      Przeszukiwanie katalogu

      ! ! ! ! ! ! ! ! ! !
      Kod kreskowy     LUB
       
      ! ! POMOC
      ! Wyszukiwanie: Wype?nienie kilku p?l w kwerendzie (np. S?owo kluczowe + autor + klasa) spowoduje wolniejsze wyszukiwanie.

      ! !

      *************** *** 44,64 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      S?owa kluczowe
      Tytu? Zwyk?eDok?adne
      Autor
      Ilustrator
      Dewey
      Class ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      S?owo kluczowe
      Tytu? ! Zwyk?e ! Precyzyjne !
      Autor
      Ilustrator
      Dewey
      Class
      OR
      S
      ! ! ! !
      ! !

      ! P??ki wirtualne ! ! --- 68,110 ----

      LUB
      Has?o przedm.
      ! ! ! ! ! ! !
      ! ! //images/2rightarrow.png" BORDER=0 > ! ! ! ! P??ki wirtualne !
      !
      ! !

      !

      Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail-opac.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,13 **** - - - - -

      Zalogowany jako: [Wyloguj]

      - -

      Zaloguj si? do Koha

      -       - --- 1,4 ---- *************** *** 28,32 ****
      ! Podtytu?:
      Autor:
      --- 19,23 ----
      ! Podtytu?:
      Autor:
      *************** *** 40,44 **** W sumie pozycji:

      ! --- 31,35 ---- W sumie pozycji:

      ! *************** *** 51,55 **** Lokalizacja Termin zwrotu ! Wypo?yczono? --- 42,46 ---- Lokalizacja Termin zwrotu ! Wypo?yczono Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 *************** *** 1,69 **** - - ! ! ! ! ! ! > ! ! ! () !

      ! ! ! ! ! ! ! ! ! ! !
      ! REKORD BIBLIO ! ! ! ! ! !
      !
      ! "> ! ! !
      !
      ! ! Podtytu?:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytu? serii:
      ! Has?o przedmiotowe:
      ! Copyright:
      ! Uwagi:
      ! Ujednolicony:
      ! Seria:
      ! W sumie pozycji: !

      ! !

      ! ! ! REKORD BIBLIO ! ! ! ! !

      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! ! Podtytu?:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytu? serii:
      ! Has?o:
      ! Copyright:
      ! Uwagi:
      ! Tytu? ujednol.:
      ! Seria:
      ! Ca?kowita liczba pozycji: !

      ! ! ! !

      ! /images/background-mem.gif"> *************** *** 28,33 **** --- 28,35 ---- *************** *** 36,48 ****
      Opis MARC :
      9
      		 "> !
      9
      		 + "> ! ! wyszukiwarka z3950
      !
      ! !
      ">"> -
        --- 38,52 ----
      !
      ! ! /images/background-mem.gif"> ! ! *************** *** 58,70 **** !
      ">"> - )">+
        * *************** *** 50,53 **** --- 54,58 ---- "> "> + "> ">
      ! ! --- 19,38 ---- From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail.tmpl 18 Sep 2003 13:28:59 -0000 1.5 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 *************** *** 19,59 ****

      ">"> -
        --- 63,77 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Sous-titre:
      ! Autres auteurs:
      ! Editeur
      ! Année:
      ! Périodique:
      ! URL :
      !
      ! R?sum?:
      !
      ! Sujet:
      !
      ! Nombre d'exemplaires: !

      !

      ! Sous-titre: ! Auteur:
      ! Autre Auteur:
       ! Publi? par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! C?te dewey :
      ! URL :
      ! Nbre d'exemplaires:
      ! ! ! ! ! ! ! !
      ! Notice biblio N? !
      !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">" class="button">MARC
      !
      !
      ! ! Sous-titre:
      ! Auteur: >
      ! Autre Auteur:
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre unique:
      ! Périodique:
      ! URL :
      ! Nbre total d'exemplaires: !

      !

      --- 19,52 ----

      ! ! ! ! ! ! !
      ! Notice N? !
      !
      " class="button">MARC

      ! ! Sous-titre: ! Auteur: >
      ! Autre Auteur:
       ! Publi? par : ! en ! , ! ,
      ! Collection:
      ! Sujet:
      ! Année:
      ! Notes:
      ! Titre uniforme:
      ! Périodique:
      ! C?te dewey :
      ! URL :
      ! Nbre total d'exemplaires: !

      ! !

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** detail.tmpl 18 Sep 2003 07:38:22 -0000 1.7 --- detail.tmpl 14 Oct 2003 11:37:48 -0000 1.8 *************** *** 23,50 **** !
      ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      !
      !
      ! Subtitle:
      ! Author: >
      ! Additional Author:
      ! Series Title:
      ! Subject:
      ! Copyright:
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Total Number of Items:

      --- 23,44 ---- !
      " class="button">MARC

      ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items:

      From tipaul at users.sourceforge.net Tue Oct 14 13:37:50 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 04:37:50 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv17529/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl Log Message: improving non-MARC biblio detail in both intranet and opac. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.tmpl 8 May 2003 12:26:14 -0000 1.8 --- opac-detail.tmpl 14 Oct 2003 11:37:47 -0000 1.9 *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! BIBLIO RECORD ! ! !
      ! ! Subtitle:
      ! Author:
      ! Subject:
      ! Copyright:
      ! Total Number of Items: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      --- 16,80 ---- ! ! ! ! ! ! !
      ! BIBLIO RECORD ! !
      ! ! Subtitle: ! Author: >
      ! Additional Author:
       ! Published by : ! in ! , ! ,
      ! Collection:
      ! Subject:
      ! Year :
      ! Notes:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! total number of Items: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Item TypeClassLocationDate DueLast SeenBarcode
      WebsiteOnlineAvailable

      From tipaul at users.sourceforge.net Tue Oct 14 14:36:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 14 Oct 2003 05:36:38 -0700 Subject: [Koha-cvs] CVS: koha/misc cleanmarcdb.pl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25755/misc Added Files: cleanmarcdb.pl Log Message: script to clean MARC DB when a subfield is removed from the MARC editor : the subfield is NOT removed from DB (to avoid stupid loss of data). This script forever removes unused subfields from the DB. Quite fast script. --- NEW FILE --- #!/usr/bin/perl # small script that rebuilds the non-MARC DB use strict; # Koha modules used # use MARC::File::USMARC; use MARC::Record; use MARC::Batch; use C4::Context; use C4::Biblio; use Time::HiRes qw(gettimeofday); use Getopt::Long; my ( $input_marc_file, $number) = ('',0); my ($version, $confirm,$test_parameter); GetOptions( 'c' => \$confirm, 'h' => \$version, 't' => \$test_parameter, ); if ($version || (!$confirm)) { print < shows this screen) \t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long) \t-t => test only, change nothing in DB EOF ;#' die; } my $dbh = C4::Context->dbh; my $i=0; my $starttime = gettimeofday; my $cleansubfield = $dbh->prepare("delete from marc_subfield_table where tag=? and subfieldcode=?"); my $cleanword = $dbh->prepare("delete from marc_word where tag=? and subfieldid=?"); # get tags structure my $tags = MARCgettagslib($dbh,1); foreach my $tag (sort keys(%{$tags})) { foreach my $subfield (sort keys(%{$tags->{$tag}})) { next if $subfield eq "lib"; next if $subfield eq "mandatory"; next if $subfield eq "tab"; # DO NOT drop biblionumber, biblioitemnumber and itemnumber. # they are stored internally, and are mapped to tab -1. This script must keep them or it will completly break Koha DB !!! next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblio.biblionumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "biblioitems.biblioitemnumber"); next if ($tags->{$tag}->{$subfield}->{kohafield} eq "items.itemnumber"); # now, test => if field is ignored (in tab -1 or '') => drop everything in the MARC table ! if ($tags->{$tag}->{$subfield}->{tab} eq -1 || $tags->{$tag}->{$subfield}->{tab} eq '') { print "dropping $tag \$ $subfield\n"; $cleansubfield->execute($tag,$subfield) unless $test_parameter; $cleanword->execute($tag,$subfield) unless $test_parameter; print "TEST " if $test_parameter; print "done\n"; } } } my $timeneeded = gettimeofday - $starttime; print "done in $timeneeded seconds\n"; From rangi at users.sourceforge.net Thu Oct 16 22:36:28 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:28 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** circulation.tmpl 7 Aug 2003 12:41:59 -0000 1.9 --- circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 *************** *** 164,173 **** ! ! ! ! ! !

      --- 164,170 ---- !
      ! ! +
      *************** *** 222,226 **** --- 219,263 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Patron information
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Cat?gorie: +
      CHARGES> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CHARGES onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      WAITING + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      ODUESYes, See below
      NOTES
      + +



      From rangi at users.sourceforge.net Thu Oct 16 22:36:27 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 16 Oct 2003 13:36:27 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3169/circ Modified Files: circulation.pl Log Message: Fix for bug 436, thanks to Pierre Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** circulation.pl 24 Jul 2003 08:33:35 -0000 1.60 --- circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 *************** *** 297,300 **** --- 297,301 ---- firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, + categorycode => $borrower->{'categorycode'}, question => $question, barcode => $barcode, *************** *** 309,317 **** CGIselectborrower => $CGIselectborrower, - patrontable => $patrontable, - flaginfotable => $flaginfotable, - CHARGES => $flags->{'CHARGES'}, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); --- 310,315 ---- CGIselectborrower => $CGIselectborrower, amountold => $amountold, ! todayissues => \@realtodayissues, previssues => \@realprevissues ); *************** *** 367,425 **** my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; ! } } else { ! if ($flag eq 'CHARGES') { ! $flaginfotext.="$flag $flags->{$flag}->{'message'} {'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment\n"; ! } elsif ($flag eq 'WAITING') { ! my $itemswaiting=''; ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'} $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})
      \n"; } ! $flaginfotext.="$flag$itemswaiting\n"; ! } elsif ($flag eq 'ODUES') { ! my $items=$flags->{$flag}->{'itemlist'}; ! my $itemswaiting="\n"; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $itemswaiting.="\n"; ! } } ! $itemswaiting.="
      $iteminformation->{'date_due'}{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}$iteminformation->{'title'}
      \n"; ! if ($query->param('module') ne 'returns'){ ! $flaginfotext.="$flag$flags->{$flag}->{'message'}, See below\n"; ! } else { ! $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; } - } else { - $flaginfotext.="$flag$flags->{$flag}->{'message'}\n"; - } } } - ($flaginfotext) && ($flaginfotext="Flags$flaginfotext\n"); - $flaginfotext.=""; - my $patrontable= << "EOF"; -

      - - - - EOF return($patrontable, $flaginfotext); } --- 365,436 ---- my $flags = $borrower->{'flags'}; my $flaginfotable=''; ! my $flaginfotext; ! #my $flaginfotext=''; my $flag; my $color=''; foreach $flag (sort keys %$flags) { + warn $flag; + my @itemswaiting=''; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); $flags->{$flag}->{'message'}=~s/\n/
      /g; if ($flags->{$flag}->{'noissues'}) { ! $template->param( ! noissues => 'true', ! color => $color, ! ); ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); ! } } else { ! if ($flag eq 'CHARGES') { ! $template->param( ! charges => 'true', ! chargesmsg => $flags->{'CHARGES'}->{'message'} ! ); } ! if ($flag eq 'WAITING') { ! my $items=$flags->{$flag}->{'itemlist'}; ! foreach my $item (@$items) { my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! $iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'}; ! push @itemswaiting, $iteminformation; ! } ! $template->param( ! waiting => 'true', ! waitingmsg => $flags->{'WAITING'}->{'message'}, ! itemswaiting => \@itemswaiting, ! ); } ! if ($flag eq 'ODUES') { ! $template->param( ! odues => 'true', ! oduesmsg => $flags->{'ODUES'}->{'message'} ! ); ! ! my $items=$flags->{$flag}->{'itemlist'}; ! my $currentcolor=$color; ! { ! my $color=$currentcolor; ! foreach my $item (@$items) { ! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); ! my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0); ! push @itemswaiting, $iteminformation; ! } ! } ! if ($query->param('module') ne 'returns'){ ! $template->param( nonreturns => 'true' ); ! } ! } ! if ($flag eq 'NOTES') { ! $template->param( ! notes => 'true', ! notesmsg => $flags->{'NOTES'}->{'message'} ! ); } } } return($patrontable, $flaginfotext); } From tipaul at users.sourceforge.net Fri Oct 17 12:02:59 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 17 Oct 2003 03:02:59 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.65,1.66 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv26914/C4 Modified Files: Biblio.pm Log Message: Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** Biblio.pm 14 Oct 2003 09:45:29 -0000 1.65 --- Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.66 2003/10/17 10:02:56 tipaul + # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. + # # Revision 1.65 2003/10/14 09:45:29 tipaul # adding rebuildnonmarc.pl script : run this script when you change a link between marc and non MARC DB. It rebuilds the non-MARC DB (long operation) *************** *** 1193,1197 **** foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>1 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { --- 1196,1200 ---- foreach my $word (@words) { # we record only words longer than 2 car and not in stopwords hash ! if (length($word)>2 and !($stopwords->{uc($word)})) { $sth->execute($bibid,$tag,$tagorder,$subfieldid,$subfieldorder,$word,$word); if ($sth->err()) { From cauchoip at users.sourceforge.net Fri Oct 17 13:10:59 2003 From: cauchoip at users.sourceforge.net (Pierre Cauchois) Date: Fri, 17 Oct 2003 04:10:59 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv3396 Modified Files: circulation.tmpl Log Message: fix for #436 on french default template Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** circulation.tmpl 22 Sep 2003 13:05:17 -0000 1.5 --- circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 *************** *** 163,172 **** ! ! ! ! ! !
      Patron Information
      - {'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}
      $borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'}
      --- 163,169 ---- !
      ! ! +
      *************** *** 221,225 **** --- 218,262 ----
      +       		+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Informations lecteur
      + " onClick="openWindow(this,'Member', 480, 640)"> + +
      Cat?gorie: +
      Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
      Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      En attente + + &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      +       +
      RetardsOui, voir ci-dessous
      Notes
      + +



      *************** *** 228,236 **** /images/background-mem.gif"> ! Todays Issues ! Due DateBar CodeTitleAuthorClass --- 265,273 ---- /images/background-mem.gif"> ! Emprunts du jour ! Retour pour leCode barreTitreAuteurClasse From tipaul at users.sourceforge.net Mon Oct 20 16:25:38 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 07:25:38 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.53,1.54 koha.upgrade,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7969/misc Modified Files: Install.pm koha.upgrade Log Message: koha.upgrade bugfixes. Should work... Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Install.pm 6 Oct 2003 09:10:39 -0000 1.53 --- Install.pm 20 Oct 2003 14:25:36 -0000 1.54 *************** *** 1772,1776 **** my %configfile; ! open (KC, "<$etcdir/koha.conf"); while () { chomp; --- 1772,1776 ---- my %configfile; ! open (KC, ") { chomp; *************** *** 1788,1799 **** } ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } --- 1788,1799 ---- } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** koha.upgrade 22 Jan 2003 03:45:39 -0000 1.4 --- koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 *************** *** 8,27 **** if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; - - loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } --- 8,24 ---- if ($<) { ! print "\n\nYou must run koha.upgrade as root.\n\n"; ! exit; } my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; chomp $::newversion; if ($::newversion =~ /RC/) { ! releasecandidatewarning(); } *************** *** 37,41 **** This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? ([Y]/N): |; --- 34,38 ---- This upgrade script will make a backup copy of your files for you. ! Would you like to proceed? (Y/[N]): |; *************** *** 43,64 **** chomp $answer; ! if ($answer =~/n/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; - - checkperlmodules(); - - my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; --- 40,57 ---- chomp $answer; ! unless ($answer =~/y/i) { ! print qq| Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. |; ! exit; } else { ! print "Great! continuing upgrade... \n"; }; checkperlmodules(); my $backupdir='/usr/local/koha/backups'; ! print "Please specify a backup directory [$backupdir]: "; $answer = ; *************** *** 66,84 **** if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } } - } } --- 59,77 ---- if ($answer) { ! $backupdir=$answer; } if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } } } *************** *** 92,106 **** foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! )) { ! if ( -d $mysql ) { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! $mysqldir='/usr'; ! } my ($sec, $min, $hr, $day, $month, $year) = (localtime(time))[0,1,2,3,4,5]; --- 85,115 ---- foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } } if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <) { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } --- 128,136 ---- while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; } *************** *** 129,133 **** close MD; - my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; --- 138,141 ---- *************** *** 194,198 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 202,206 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; *************** *** 272,275 **** --- 280,284 ---- /etc/apache-ssl/conf/apache.conf /etc/httpd/conf/httpd.conf + /etc/httpd/conf/commonhttpd.conf /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { *************** *** 362,366 **** unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); --- 371,375 ---- unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; if ($result==0) { my @dirs = split(m#/#, $::kohalogdir); *************** *** 382,387 **** ! open (KC, "/etc/koha.conf"); ! my $kccontents=''; my $kc; while () { --- 391,396 ---- ! ! my $kccontents='';open (KC, "/etc/koha.conf"); my $kc; while () { *************** *** 455,461 **** and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. - - [NOTE PERMISSIONS ARE NOT COMPLETED AS OF 1.2.3RC1. Do not give passwords to - any patrons unless you want them to have full access to your intranet.] |; print "Press the key to continue: "; --- 464,467 ---- *************** *** 469,473 **** = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. --- 475,480 ---- = Koha Upgrade Completed = ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha prior to 1.2.1, it is likely that you will have to modify your Apache configuration to point it to the new files. From tipaul at users.sourceforge.net Mon Oct 20 17:45:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:45:00 -0700 Subject: [Koha-cvs] CVS: koha/marc deletemarc,1.1,NONE koha2marc,1.6,NONE marcschema.sql,1.16,NONE perlmarcstructure,1.4,NONE updatedb2marc.pl,1.6,NONE Message-ID: Update of /cvsroot/koha/koha/marc In directory sc8-pr-cvs1:/tmp/cvs-serv28788/marc Removed Files: deletemarc koha2marc marcschema.sql perlmarcstructure updatedb2marc.pl Log Message: removing outdated scripts. --- deletemarc DELETED --- --- koha2marc DELETED --- --- marcschema.sql DELETED --- --- perlmarcstructure DELETED --- --- updatedb2marc.pl DELETED --- From slef at users.sourceforge.net Mon Oct 20 18:13:03 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:13:03 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv4145 Modified Files: updatedatabase Log Message: Omitted annotation added. Closes: 624 Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 --- updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 *************** *** 646,649 **** --- 646,650 ---- } unless ( $existingtables{'z3950servers'} ) { + #MJR: added syntax entries to close bug 624 print "Adding z3950servers table...\n"; my $sti = $dbh->prepare( "create table z3950servers ( *************** *** 919,922 **** --- 920,926 ---- # $Log$ + # Revision 1.63 2003/10/20 16:13:01 slef + # Omitted annotation added. Closes: 624 + # # Revision 1.62 2003/10/20 16:10:19 slef # Adding USMARC to LOC z3950 entry From tipaul at users.sourceforge.net Mon Oct 20 18:27:00 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:27:00 -0700 Subject: [Koha-cvs] CVS: koha release_notes_200RC1.txt,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv6776 Added Files: release_notes_200RC1.txt Log Message: 1st draft of release notes for next public release --- NEW FILE --- RELEASE NOTES ============= this version of Koha is the 1st one of the 2.0.0 series in the "stable" tree. IT DOES NOT MEAN IT HAS NO BUGS. It means that at least 5 libraries are using it and they don't encounter unsolvable problems. If you want to adopt Koha, you're welcomed, but you're warned that this version still has some bugs and missing features. INSTALLATION ========== * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./installer.pl * follow the instructions. UPGRADE from previous 2.0.0preX version ======= * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. UPGRADE from previous 1.2.x version ======= This upgrade is possible with this release for the 1st time. EXPECT IT TO HAVE SOME BUGS SOMEWHERE. USE IT ONLY IF YOU KNOW HOW TO GO BACK TO PREVIOUS SITUATION. Otherwise, WAIT for 2.0.0RC2 or so. * Download the package * tar xvfz koha-version.tar.gz * cd koha-version * ./koha.upgrade * follow the instructions. * launch Koha * Go to Parameters >> Marc structure option and Koha-MARC links option. * Modify default MARC structure to fit your needs. * open a console/term * Enter : cd /path/to/koha/misc export PERL5LIB=/path/to/koha ./koha2marc.pl the old DB is "copied" in the new MARC one. Koha 2.0.0RC1 is ready. BUGFIXES/IMPROVEMENTS ======= BUGS FIXED : +++++++++ 619 : Visiting selectbranchprinter.pl automatically resets branch 618 : Add member process does not check for duplicate barcode 532 : Can't assign new password without changing UserID 599 : edited items are stored incorrectly in old Koha DB (aka : barcode non mandatory bug) 616 : MARCgetbiblio doesn't create leader 500 : [INTRANET]Only 21 items are displayed in the search result 595 : 'Add field' link in /acqui.simple/addbiblio.pl adds incorrect field. 622 : processz3950queue fails 576 : add install locale test 39 : Update Dirs in z3950 scripts 536 : bulkmarcimport.pl generates subtitle error 436 : circulation.pl only partially templated (this bug is partially fixed) IMPROVEMENTS +++++++++ * Polish version of Koha (courtesy of Benedykt) * some useful tools in misc directory to manage the DB * adding "fines" entry in parameters section : to manage fees when a book is returned too late * From tipaul at users.sourceforge.net Mon Oct 20 18:28:01 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 09:28:01 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import In directory sc8-pr-cvs1:/tmp/cvs-serv6956/koha-tmpl/intranet-tmpl/default/fr/import Modified Files: breeding.tmpl Log Message: Index: breeding.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** breeding.tmpl 4 Jun 2003 13:46:24 -0000 1.1 --- breeding.tmpl 20 Oct 2003 16:27:59 -0000 1.2 *************** *** 37,40 **** --- 37,46 ---- + encodage (MARC21 or UNIMARC) + +
      + + + Si l'ISBN existe déjà dans le réservoir : Ignorer celui-ci, conserver celui qui existe déjà
      From tipaul at users.sourceforge.net Mon Oct 20 17:42:45 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Mon, 20 Oct 2003 08:42:45 -0700 Subject: [Koha-cvs] CVS: koha/misc koha2marc.pl,NONE,1.1 dumpmarc.pl,1.2,1.3 koha.upgrade,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv28325/misc Modified Files: dumpmarc.pl koha.upgrade Added Files: koha2marc.pl Log Message: Upgrade script : the koha2marc.pl copies the old DB into the new MARC one. This script must be executed when migrating from 1.2.x to 2.0.x. --- NEW FILE --- #!/usr/bin/perl use C4::Context; use CGI; use DBI; #use strict; use C4::Biblio; use C4::Output; use Getopt::Long; my ( $confirm,$delete); GetOptions( 'c' => \$confirm, 'd' => \$delete, ); my $dbh = C4::Context->dbh; if ($delete) { print "deleting MARC tables\n"; $dbh->do("delete from marc_biblio"); $dbh->do("delete from marc_subfield_table"); $dbh->do("delete from marc_blob_subfield"); $dbh->do("delete from marc_word"); } my $userid=$ENV{'REMOTE_USER'}; my $sthbiblioitem = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); my $sthitems = $dbh->prepare("select itemnumber from items where biblionumber=?"); my $sth=$dbh->prepare("select biblionumber from biblio"); $sth->execute; my $env; $env->{'marconly'}=1; my ($MARC, $biblionumber,$biblioitemnumber,$bibid); while (($biblionumber) = $sth->fetchrow) { print "Processing $biblionumber\n"; $sthbiblioitem->execute($biblionumber); ($biblioitemnumber) = $sthbiblioitem->fetchrow; $MARC = &MARCkoha2marcBiblio($dbh,$biblionumber,$biblioitemnumber); $bibid = &MARCaddbiblio($dbh,$MARC,$biblionumber); # now, search items, and add them... $sthitems->execute($biblionumber); while (($itemnumber) = $sthitems->fetchrow) { $MARC = &MARCkoha2marcItem($dbh,$biblionumber,$itemnumber); &MARCadditem($dbh,$MARC,$biblionumber); } } Index: dumpmarc.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/dumpmarc.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dumpmarc.pl 21 May 2003 14:19:32 -0000 1.2 --- dumpmarc.pl 20 Oct 2003 15:42:43 -0000 1.3 *************** *** 40,41 **** --- 40,42 ---- $i++; } + print "\n==================\n$i record parsed\n"; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** koha.upgrade 20 Oct 2003 14:25:36 -0000 1.5 --- koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 *************** *** 492,495 **** --- 492,507 ---- You may also need to uncomment a "LoadModules env_module ... " line and restart Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) Please report any problems you encounter through http://bugs.koha.org/ From slef at users.sourceforge.net Mon Oct 20 18:10:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 09:10:21 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv3778 Modified Files: updatedatabase Log Message: Adding USMARC to LOC z3950 entry Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** updatedatabase 1 Oct 2003 15:03:45 -0000 1.61 --- updatedatabase 20 Oct 2003 16:10:19 -0000 1.62 *************** *** 656,660 **** id int, checked smallint, ! rank int)" ); $sti->execute; --- 656,661 ---- id int, checked smallint, ! rank int, ! syntax char(80))" ); $sti->execute; *************** *** 665,669 **** '', '', 'Library of Congress', ! 1, 1, 1)" ); $sti->execute; --- 666,670 ---- '', '', 'Library of Congress', ! 1, 1, 1, 'USMARC')" ); $sti->execute; *************** *** 918,921 **** --- 919,925 ---- # $Log$ + # Revision 1.62 2003/10/20 16:10:19 slef + # Adding USMARC to LOC z3950 entry + # # Revision 1.61 2003/10/01 15:03:45 tipaul # oups... typo fix in z3950random field definition From slef at users.sourceforge.net Mon Oct 20 21:16:52 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:52 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.54,1.55 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7426/misc Modified Files: Install.pm Log Message: Work on install bugs (see bug 632) Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** Install.pm 20 Oct 2003 14:25:36 -0000 1.54 --- Install.pm 20 Oct 2003 19:16:50 -0000 1.55 *************** *** 958,965 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on %s/koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. Enter the Apache userid: |; --- 958,966 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; *************** *** 978,982 **** /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf --- 979,983 ---- /var/www/conf/httpd.conf /etc/apache2/httpd.conf ! /etc/apache2/apache2.conf /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf *************** *** 1068,1072 **** NOTE: You will need to add lines to your main httpd.conf to ! Include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). --- 1069,1073 ---- NOTE: You will need to add lines to your main httpd.conf to ! include %s/koha-httpd.conf and to make sure it is listening on the right ports (using the Listen directive). *************** *** 1192,1196 **** startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf"`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; --- 1193,1197 ---- startsysout; ! if (`grep -q 'VirtualHost $servername' "$httpdconf" 2>/dev/null`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; *************** *** 1418,1422 **** #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\n"; close(FILE); --- 1419,1423 ---- #MJR: generate our own settings, to remove the /home/paul hardwired links open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options"); ! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf"; close(FILE); *************** *** 1772,1776 **** my %configfile; ! open (KC, ") { chomp; --- 1773,1778 ---- my %configfile; ! #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. ! open (KC, "<$etcdir/koha.conf"); while () { chomp; From slef at users.sourceforge.net Mon Oct 20 21:16:53 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 20 Oct 2003 12:16:53 -0700 Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-shell.sh,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1:/tmp/cvs-serv7426/z3950 Modified Files: z3950-daemon-shell.sh Log Message: Work on install bugs (see bug 632) Index: z3950-daemon-shell.sh =================================================================== RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-shell.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** z3950-daemon-shell.sh 6 Oct 2003 09:10:39 -0000 1.3 --- z3950-daemon-shell.sh 20 Oct 2003 19:16:50 -0000 1.4 *************** *** 35,42 **** --- 35,48 ---- export PERL5LIB + KOHA_CONF=$KohaConf + export KOHA_CONF + exec $KohaZ3950Script $LogDir >>$LOGFILE 2>&1 #------------------- # $Log$ + # Revision 1.4 2003/10/20 19:16:50 slef + # Work on install bugs (see bug 632) + # # Revision 1.3 2003/10/06 09:10:39 slef # Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.15,1.16 marctagstructure.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** authorised_values.tmpl 4 Jul 2003 14:03:44 -0000 1.15 --- authorised_values.tmpl 21 Oct 2003 15:47:07 -0000 1.16 *************** *** 76,90 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 76,96 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.18 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.19 *************** *** 132,137 **** ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> --- 132,149 ---- ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/admin authorised_values.pl,1.10,1.11 marctagstructure.pl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv22352/admin Modified Files: authorised_values.pl marctagstructure.pl Log Message: fix for #577 Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** authorised_values.pl 24 Jun 2003 10:26:17 -0000 1.10 --- authorised_values.pl 21 Oct 2003 15:47:07 -0000 1.11 *************** *** 66,70 **** debug => 1, }); ! my $pagesize=20; my $op = $input->param('op'); --- 66,70 ---- debug => 1, }); ! my $pagesize=5; my $op = $input->param('op'); *************** *** 188,198 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => ""); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => ""); ! ! } } #---- END $OP eq DEFAULT --- 188,203 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT Index: marctagstructure.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** marctagstructure.pl 1 Aug 2003 14:23:52 -0000 1.16 --- marctagstructure.pl 21 Oct 2003 15:47:07 -0000 1.17 *************** *** 193,201 **** if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(previous => "'); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(next => "'); } } #---- END $OP eq DEFAULT --- 193,208 ---- if ($offset>0) { my $prevpage = $offset-$pagesize; ! $template->param(isprevpage => $offset, ! prevpage=> $prevpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; ! $template->param(nextpage =>$nextpage, ! searchfield => $searchfield, ! script_name => $script_name, ! ); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Tue Oct 21 17:47:09 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 21 Oct 2003 08:47:09 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters authorised_values.tmpl,1.5,1.6 marctagstructure.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv22352/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: authorised_values.tmpl marctagstructure.tmpl Log Message: fix for #577 Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** authorised_values.tmpl 4 Jul 2003 14:04:02 -0000 1.5 --- authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 *************** *** 81,95 **** - - - - - -
      ! !
      //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>//images/1rightarrow.png" title="next" ALT="next" BORDER=0>
      --- 81,101 ---- ! !
      ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
      Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** marctagstructure.tmpl 14 Oct 2003 09:45:29 -0000 1.6 --- marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 *************** *** 154,159 **** //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! //images/1leftarrow.png" title="Prec" ALT="Prec" BORDER=0 >       ! //images/1rightarrow.png" title="Suivant" ALT="Suivant" BORDER=0> --- 154,171 ---- //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! ! From rangi at users.sourceforge.net Wed Oct 22 22:20:50 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:20:50 -0700 Subject: [Koha-cvs] CVS: koha updatebibitem.pl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv23486 Modified Files: updatebibitem.pl Log Message: Fix for bug 591 Index: updatebibitem.pl =================================================================== RCS file: /cvsroot/koha/koha/updatebibitem.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** updatebibitem.pl 13 Oct 2002 07:35:50 -0000 1.11 --- updatebibitem.pl 22 Oct 2003 20:20:48 -0000 1.12 *************** *** 22,26 **** use CGI; use strict; ! use C4::Acquisitions; use C4::Output; use C4::Search; --- 22,26 ---- use CGI; use strict; ! use C4::Biblio; use C4::Output; use C4::Search; From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.61,1.62 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/circ Modified Files: circulation.pl Log Message: moving more html out of the script Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** circulation.pl 16 Oct 2003 20:36:25 -0000 1.61 --- circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 *************** *** 156,162 **** # HTML code.... ! my $responsesform = ''; foreach (keys %responses) { ! $responsesform.="\n"; } my $questionform; --- 156,166 ---- # HTML code.... ! my %responseform; ! my @responsearray; foreach (keys %responses) { ! # $responsesform.="\n"; ! $responseform{'name'}=$_; ! $responseform{'value'}=$responses{$_}; ! push @responsearray,\%responseform; } my $questionform; *************** *** 290,294 **** printername => $printers->{$printer}->{'printername'}, allowborrow =>$allowborrow, - #question form question => $question, --- 294,297 ---- *************** *** 305,316 **** yearoptions => $yearoptions, stickyduedate => $stickyduedate, - responseform => $responsesform, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, - amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues ); --- 308,318 ---- yearoptions => $yearoptions, stickyduedate => $stickyduedate, rejected => $rejected, message => $message, CGIselectborrower => $CGIselectborrower, amountold => $amountold, todayissues => \@realtodayissues, ! previssues => \@realprevissues, ! responseloop => \@responsearray ); From slef at users.sourceforge.net Wed Oct 22 16:48:10 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Wed, 22 Oct 2003 07:48:10 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.55,1.56 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv25043 Modified Files: Install.pm Log Message: A lot of wording rewritten Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** Install.pm 20 Oct 2003 19:16:50 -0000 1.55 --- Install.pm 22 Oct 2003 14:48:08 -0000 1.56 *************** *** 122,151 **** my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing setup.\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! Welcome to the Koha install script! This script will prompt you for some ! basic information about your desired setup, then install Koha for you. ! ! If you want to install the Koha configuration file somewhere other than /etc ! (eg for non-root installation, or multiple Koha versions on one system), you ! should set the etcdir and prefix environment variables. If this is your ! only koha installation on this machine and you are running this as root, the ! default should be OK. ! ! To accept the default value for any question, simply hit Enter at the prompt. ! ! Please be sure to read the documentation, or visit the Koha website at ! http://www.koha.org for more information. Are you ready to begin the installation? ([Y]/N): |; $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING WARNING WARNING WARNING WARNING ! ! You are about to install Koha version %s. This version of Koha is a ! release candidate. It is not intended to be installed on production systems. It is being released so that users can test it before we release a final ! version. Are you sure you want to install Koha %s? (Y/[N]): |; --- 122,153 ---- my $messages; ! $messages->{'continuing'}->{en}="Great! Continuing...\n\n"; $messages->{'WelcomeToKohaInstaller'}->{en} = heading('Welcome to the Koha Installer') . qq| ! This program will ask some questions and try to install koha for you. ! You need to know: where most koha files should be stored (you can set ! the prefix environment variable for this); the username and password of ! a mysql superuser; and details of your library setup. You may also need ! to know details of your Apache setup. ! ! If you want to install the Koha configuration files somewhere other than ! /etc (for multiple Koha versions on one system, for example), you should ! set the etcdir environment variable. Please look at your manuals for ! details of how to set that. ! ! Recommended answers are given in brackets after each question. To accept ! the default value for any question (indicated by []), simply hit Enter ! at the prompt. Are you ready to begin the installation? ([Y]/N): |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| ! WARNING: You are about to install Koha version %s. This is a ! release candidate, not intended for production systems. It is being released so that users can test it before we release a final ! version and report bugs to us. ! ! Most people should answer Yes here. Are you sure you want to install Koha %s? (Y/[N]): |; *************** *** 168,182 **** perl -MCPAN -e 'install Net::Z3950' ! IMPORTANT NOTE : If you use PERL5.8.0 (RedHat 8.0 or Mandrake 9.x), you MUST install ! manually the Net::Z3950 and edit Makefile.PL and yazwrap/Makefile.PL to include: 'DEFINE' => '-D_GNU_SOURCE', Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting the following line in yazwrap/ywpriv.h : ! #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL & MODULES') . qq| Checking perl modules ... |; --- 170,187 ---- perl -MCPAN -e 'install Net::Z3950' ! ...or by installing packages for your distribution, if available. ! ! IMPORTANT NOTE : If you use Perl 5.8.0, you might need to ! edit NET::Z3950's Makefile.PL and yazwrap/Makefile.PL to include: ! 'DEFINE' => '-D_GNU_SOURCE', + Also note that some installations of Perl on Red Hat will generate a lot of "'my_perl' undeclared" errors when running make in Net-Z3950. This is fixed by ! inserting in yazwrap/ywpriv.h a line saying #include "XSUB.h" Press the key to continue: |; #' ! $messages->{'CheckingPerlModules'}->{en} = heading('PERL MODULES') . qq| Checking perl modules ... |; *************** *** 187,191 **** You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They can be installed by running (as root) the following: %s --- 192,196 ---- You are missing some Perl modules which are required by Koha. Once these modules have been installed, rerun this installer. ! They may be installed by running (as root) the following: %s *************** *** 193,197 **** $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('ALL PERL MODULES INSTALLED') . qq| All mandatory perl modules are installed. --- 198,202 ---- $messages->{'AllPerlModulesInstalled'}->{en} = ! heading('PERL MODULES AVAILABLE') . qq| All mandatory perl modules are installed. *************** *** 201,206 **** $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists ! already). If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. --- 206,211 ---- $messages->{'KohaAlreadyInstalled'}->{en} = heading('Koha already installed') . qq| ! It looks like Koha is already installed on your system (%s/koha.conf exists). ! If you would like to upgrade your system to %s, please use the koha.upgrade script in this directory. *************** *** 215,240 **** $messages->{'GetIntranetDir'}->{en} = ! heading('INTRANET/LIBRARIANS DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Intranet/Librarians files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('KOHA LOG DIRECTORY') . qq| ! Specify a log directory where any Koha daemons can create log files. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" module to add passwords for other accounts and set their permissions. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('KOHA INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! --- 220,245 ---- $messages->{'GetIntranetDir'}->{en} = ! heading('LIBRARIAN DIRECTORY') . qq| ! Please supply the directory you want Koha to store its Librarian interface files in. This directory will be auto-created for you if it doesn't exist. Intranet Directory [%s]: |; #' ! $messages->{'GetKohaLogDir'}->{en} = heading('LOG DIRECTORY') . qq| ! Specify a directory where log files will be written. Koha Log Directory [%s]: |; $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq| ! This release of Koha has a new authentication module. ! You will be required to log in to ! access some features. IMPORTANT: You can log in using the userid and password from the %s/koha.conf configuration file at any time. ! Use the "Members" screen to add passwords for other accounts and set their flags. Press the key to continue: |; ! $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq| Congratulations ... your Koha installation is complete! *************** *** 242,254 **** http://%s\:%s/ - use mysql login and password to connect to this interface. Then, go to admin page, and create whatever fits your needs. ! and the OPAC interface at : ! http://%s\:%s/ ! Be sure to read the Hints file. ! For more information visit http://www.koha.org Press to exit the installer: |; --- 247,258 ---- http://%s\:%s/ ! use the koha admin mysql login and password to connect to this interface. ! and the OPAC interface at: ! http://%s\:%s/ ! Please read the Hints file and visit http://www.koha.org Press to exit the installer: |; *************** *** 749,764 **** $messages->{'NoUsrBinPerl'}->{en} = ! heading('Perl is not located in /usr/bin/perl') . qq| ! The Koha perl scripts expect to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable: [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! The Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! May I create this symlink? ([Y]/N): ! : |; $messages->{'DirFailed'}->{en} = RED.qq| --- 753,769 ---- $messages->{'NoUsrBinPerl'}->{en} = ! heading('No /usr/bin/perl') . qq| ! Koha expects to find the perl executable in the /usr/bin directory. It is not there on your system. |; ! $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl Executable [%s]: |; $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq| ! Some Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl ! Most users should answer Y here. ! ! May I try to create this symlink? ([Y]/N):|; $messages->{'DirFailed'}->{en} = RED.qq| *************** *** 854,874 **** =cut ! $messages->{'DatabaseName'}->{en} = heading('Name of MySQL database') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the hostname for mysql. Unless the database is located on ! another machine this will be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! Please provide the name of the user who will have full administrative rights ! to the %s database, when authenticating from %s. ! This user will also be used to access Koha's INTRANET interface. Database user [%s]: |; --- 859,882 ---- =cut ! $messages->{'DatabaseName'}->{en} = heading('Database Name') . qq| Please provide the name that you wish to give your koha database. It must not exist already on the database server. + Most users give a short single-word name for their library here. + Database name [%s]: |; $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq| ! Please provide the mysql server name. Unless the database is stored on ! another machine, this should be "localhost". Database host [%s]: |; $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq| ! We are going to create a new mysql user for Koha. This user will have full administrative rights ! to the database called %s when they connect from %s. ! This is also the name of the Koha librarian superuser. ! Most users give a single-word name here. Database user [%s]: |; *************** *** 877,881 **** Please provide a good password for the user %s. ! IMPORTANT: You can log in using this userid and password at any time. Password for database user %s: |; --- 885,889 ---- Please provide a good password for the user %s. ! IMPORTANT: You can log in using this user and password at any time. Password for database user %s: |; *************** *** 937,946 **** $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES') . qq| I found more than one possible Apache configuration file: %s ! Choose the correct file [1]: |; $messages->{'NoApacheConfFiles'}->{en} = --- 945,954 ---- $messages->{'FoundMultipleApacheConfFiles'}->{en} = ! heading('MULTIPLE APACHE CONFIG FILES FOUND') . qq| I found more than one possible Apache configuration file: %s ! Enter number of the file to read [1]: |; $messages->{'NoApacheConfFiles'}->{en} = *************** *** 948,954 **** I was not able to find your Apache configuration file. ! The file is usually called httpd.conf or apache.conf. ! Please specify the location of your config file: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| --- 956,962 ---- I was not able to find your Apache configuration file. ! The file is usually called httpd.conf, apache.conf or similar. ! Please enter the full name, starting with /: |; $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq| *************** *** 958,970 **** $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the user that Apache is running as. ! This is used to set up access permissions of ! %s/koha.conf. This user should be set in one of the Apache configuration ! files with the "User" line. ! Please try to find it and enter the user name below. Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USERID') . qq| The userid %s is not a valid userid on this system. --- 966,978 ---- $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. ! This is used to set up access permissions for ! %s/koha.conf. This user should be set in one of the Apache configuration. ! Please try to find it and enter the user name below. You might find ! that "ps u|grep apache" will tell you. It probably is NOT "root". Enter the Apache userid: |; ! $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| The userid %s is not a valid userid on this system. *************** *** 1061,1070 **** heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and LIBRARIAN virtual hosts. By default this installer ! will do this by using one ip address and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf detailing ! what these other options are. NOTE: You will need to add lines to your main httpd.conf to --- 1069,1077 ---- heading('APACHE CONFIGURATION') . qq| Koha needs to write an Apache configuration file for the ! OPAC and Librarian sites. By default this installer ! will do this by using one name and two different ports for the virtual hosts. There are other ways to set this up, and the installer will leave comments in ! %s/koha-httpd.conf about them. NOTE: You will need to add lines to your main httpd.conf to *************** *** 1076,1087 **** $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB SERVER E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for the virtual hosts (this ! address is displayed if any errors are encountered). E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB SERVER HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. --- 1083,1094 ---- $messages->{'GetVirtualHostEmail'}->{en} = ! heading('WEB E-MAIL CONTACT') . qq| ! Enter the e-mail address to be used as a contact for Koha. This ! address is displayed if fatal errors are encountered. E-mail contact [%s]: |; $messages->{'GetServerName'}->{en} = ! heading('WEB HOST NAME OR IP ADDRESS') . qq| Please enter the host name or IP address that you wish to use for koha. Normally, this should be a name or IP that belongs to this machine. *************** *** 1089,1102 **** Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC VIRTUAL HOST PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content from this host, you should change it ! to a different port (8000 might be a good choice). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('INTRANET VIRTUAL HOST PORT') . qq| ! Please enter the port for your Intranet interface. This must be different from the OPAC port (%s). --- 1096,1109 ---- Host name or IP Address [%s]: |; ! $messages->{'GetOpacPort'}->{en} = heading('OPAC PORT') . qq| Please enter the port for your OPAC interface. This defaults to port 80, but ! if you are already serving web content with this hostname, you should change it ! to a different port (8000 might be a good choice, but check any firewalls). Enter the OPAC Port [%s]: |; $messages->{'GetIntranetPort'}->{en} = ! heading('LIBRARIAN PORT') . qq| ! Please enter the port for your Librarian interface. This must be different from the OPAC port (%s). *************** *** 1155,1160 **** heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find statements for them in your config. Please ! make sure that they are enabled for your Koha host. Press to continue: |; --- 1162,1167 ---- heading('APACHE CONFIGURATION NEEDS UPDATE') . qq| Koha uses the mod_env and mod_include apache features, but the ! installer did not find them in your config. Please ! make sure that they are enabled for your Koha site. Press to continue: |; *************** *** 1163,1168 **** $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha ! Virtual Hosts. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache --- 1170,1174 ---- $messages->{'ApacheAlreadyConfigured'}->{en} = heading('APACHE ALREADY CONFIGURED') . qq| ! %s appears to already have an entry for Koha. You may need to edit %s if anything has changed since it was last set up. This script will not attempt to modify an existing Koha apache *************** *** 1279,1293 **** $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('INTRANET AUTHENTICATION') . qq| ! I can set it up so that the Intranet/Librarian site is password protected using ! Apache's Basic Authorization. ! This is going to be phased out very soon. However, setting this up can provide ! an extra layer of security before the new authentication system is completely ! in place. ! Would you like to do this ([Y]/N): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a userid for intranet access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; --- 1285,1297 ---- $messages->{'IntranetAuthenticationQuestion'}->{en} = ! heading('LIBRARIAN AUTHENTICATION') . qq| ! The Librarian site can be password protected using ! Apache's Basic Authorization instead of Koha user details. ! This method going to be phased out very soon. Most users should answer N here. ! Would you like to do this (Y/[N]): |; #' ! $messages->{'BasicAuthUsername'}->{en}="Please enter a username for librarian access [%s]: "; $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: "; $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n"; *************** *** 1295,1299 **** sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'y'); my $httpdconf = $etcdir."/koha-httpd.conf"; --- 1299,1303 ---- sub basicauthentication { my $message=getmessage('IntranetAuthenticationQuestion'); ! my $answer=showmessage($message, 'yn', 'n'); my $httpdconf = $etcdir."/koha-httpd.conf"; *************** *** 1441,1445 **** $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To allow us to create the koha database please enter your mysql server's root user password: --- 1445,1449 ---- $messages->{'MysqlRootPassword'}->{en} = heading('MYSQL ROOT USER PASSWORD') . qq| ! To create the koha database, please enter your mysql server's root user password: *************** *** 1454,1466 **** heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, I have a batch of sample ! data that you can install now. ! If you are installing Koha with the intention of populating it with your own data, you probably don't want this sample data installed. --- 1458,1470 ---- heading('ERROR CREATING DATABASE') . qq| Couldn't connect to the MySQL server for the reason given above. ! This is a serious problem, the database will not get installed. Press to continue: |; #' $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq| ! If you are installing Koha for evaluation purposes, ! you can install some sample data now. ! If you are installing Koha to use your own data, you probably don't want this sample data installed. *************** *** 1473,1477 **** http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at +irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: --- 1477,1481 ---- http://bugs.koha.org/. If you need help with testing Koha, you can post a question through the koha-devel mailing list, or you can check for a developer ! online at irc.katipo.co.nz:6667 channel #koha. You can find instructions for subscribing to the Koha mailing lists at: *************** *** 1483,1487 **** $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to install an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; --- 1487,1491 ---- $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq| ! Would you like to describe an initial branch and printer? [Y]/N: |; $messages->{'BranchName'}->{en}="Branch Name [%s]: "; *************** *** 1564,1569 **** $messages->{'UpdateMarcTables'}->{en} = ! heading('UPDATING MARC FIELD DEFINITION TABLES') . qq| ! You can import marc parameters for : 1 MARC21 --- 1568,1573 ---- $messages->{'UpdateMarcTables'}->{en} = ! heading('MARC FIELD DEFINITIONS') . qq| ! You can import MARC settings for: 1 MARC21 *************** *** 1571,1593 **** N none ! Please choose which parameter you want to install. Note if you choose N, ! nothing will be added, and it can be a BIG job to manually create those tables Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq| This version of koha supports a few languages. - Enter your language preference : either en, fr, es, pl or zh_TW ! Note that the en is always choosen when the system does not finds the ! language you choose in a specific screen. ! fr : all is translated (except pictures) ! es : a few intranet is translated (including pictures) ! pl : OPAC and a few intranet is translated ! zh_TW : partial translation ! Whether you specify a language here, you can always go to the ! intranet interface and change it from the system preferences. Which language do you choose? |; --- 1575,1598 ---- N none ! NOTE: If you choose N, ! nothing will be added, and you must create them all yourself. ! Only choose N if you want to use a MARC format not listed here, ! such as DANMARC. We would like to hear from you if you do. Choose MARC definition [1]: |; ! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGE') . qq| This version of koha supports a few languages. ! en : default language, all pages available ! fr : complete translation (except pictures) ! es : partial librarian site translation (including pictures) ! pl : complete OPAC and partial librarian translation ! zh_TW : partial translation ! en is used when a screen is not available in your language ! If you specify a language here, you can still ! change it from the system preferences screen in the librarian sit. Which language do you choose? |; From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Thu Oct 23 22:33:55 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:33:55 -0700 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.63,1.64 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1:/tmp/cvs-serv8901/updater Modified Files: updatedatabase Log Message: Making the borrowenumber an auto_increment field Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -r1.63 -r1.64 *** updatedatabase 20 Oct 2003 16:13:01 -0000 1.63 --- updatedatabase 23 Oct 2003 20:33:53 -0000 1.64 *************** *** 801,804 **** --- 801,807 ---- $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"); + # extending the timestamp in branchtransfers... my %branchtransfers; *************** *** 920,923 **** --- 923,929 ---- # $Log$ + # Revision 1.64 2003/10/23 20:33:53 rangi + # Making the borrowenumber an auto_increment field + # # Revision 1.63 2003/10/20 16:13:01 slef # Omitted annotation added. Closes: 624 From rangi at users.sourceforge.net Thu Oct 23 22:26:58 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Thu, 23 Oct 2003 13:26:58 -0700 Subject: [Koha-cvs] CVS: koha insertdata.pl,1.21,1.22 memberentry.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv7479 Modified Files: insertdata.pl memberentry.pl Log Message: Fix for bug 631, race conditions on borrowernumber when entering a new borrower. Depends on borrowernumber having auto_increment set in the database Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** insertdata.pl 19 May 2003 15:22:12 -0000 1.21 --- insertdata.pl 23 Oct 2003 20:26:56 -0000 1.22 *************** *** 46,52 **** } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); --- 46,52 ---- } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=?"; my $sth=$dbh->prepare($query); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'}); *************** *** 71,78 **** $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', --- 71,79 ---- $data{'joining'}=format_date_in_iso($data{'joining'}); $data{'expiry'}=format_date_in_iso($data{'expiry'}); + $data{'borrowernumber'}=NewBorrowerNumber(); $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity, altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}', '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}', *************** *** 80,84 **** '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor --- 81,85 ---- '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}', '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}', ! '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } # ok if its an adult (type) it may have borrowers that depend on it as a guarantor *************** *** 104,108 **** } ! #print $query; my $sth2=$dbh->prepare($query); $sth2->execute; --- 105,109 ---- } ! warn $query; my $sth2=$dbh->prepare($query); $sth2->execute; Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** memberentry.pl 9 Jul 2003 20:27:55 -0000 1.35 --- memberentry.pl 23 Oct 2003 20:26:56 -0000 1.36 *************** *** 51,57 **** my $member=$input->param('bornum'); ! if ($member eq ''){ ! $member=NewBorrowerNumber(); ! } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); --- 51,57 ---- my $member=$input->param('bornum'); ! # if ($member eq ''){ ! # $member=NewBorrowerNumber(); ! # } my $type=$input->param('type') || ''; my $modify=$input->param('modify'); From rangi at users.sourceforge.net Wed Oct 22 22:01:30 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Wed, 22 Oct 2003 13:01:30 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1:/tmp/cvs-serv19162/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: moving more html out of the script Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** circulation.tmpl 16 Oct 2003 20:36:25 -0000 1.10 --- circulation.tmpl 22 Oct 2003 20:01:28 -0000 1.11 *************** *** 79,83 **** > > ! --- 79,85 ---- > > ! ! " value=""> ! *************** *** 95,99 **** > > ! --- 97,103 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:18:36 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:18:36 -0700 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1:/tmp/cvs-serv29298/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: circulation.tmpl Log Message: syn'ching chris commits Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** circulation.tmpl 17 Oct 2003 11:10:57 -0000 1.6 --- circulation.tmpl 25 Oct 2003 08:18:34 -0000 1.7 *************** *** 78,82 **** > > ! --- 78,84 ---- > > ! ! " value=""> ! *************** *** 94,98 **** > > ! --- 96,102 ---- > > ! ! " value=""> ! From tipaul at users.sourceforge.net Sat Oct 25 10:46:31 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:46:31 -0700 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.66,1.67 Breeding.pm,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv32447/C4 Modified Files: Biblio.pm Breeding.pm Log Message: minor fixes for bilbio deletion (still buggy) Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Biblio.pm 17 Oct 2003 10:02:56 -0000 1.66 --- Biblio.pm 25 Oct 2003 08:46:27 -0000 1.67 *************** *** 2,5 **** --- 2,8 ---- # $Id$ # $Log$ + # Revision 1.67 2003/10/25 08:46:27 tipaul + # minor fixes for bilbio deletion (still buggy) + # # Revision 1.66 2003/10/17 10:02:56 tipaul # Indexing only words longer than 2 letters. Was >=2 before, & 2 letters words usually means nothing. *************** *** 1827,1831 **** sub OLDdelbiblio{ my ($dbh,$biblio)=@_; - # my $dbh=C4Connect; my $query="select * from biblio where biblionumber=$biblio"; my $sth=$dbh->prepare($query); --- 1830,1833 ---- *************** *** 1839,1843 **** } $query=~ s/\,$/\)/; - # print $query; $sth=$dbh->prepare($query); $sth->execute; --- 1841,1844 ---- *************** *** 1849,1853 **** } $sth->finish; - # $dbh->disconnect; } --- 1850,1853 ---- *************** *** 2126,2129 **** --- 2126,2131 ---- my $dbh = C4::Context->dbh; &OLDdelbiblio($dbh,$biblio); + my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblio); + &MARCdelbiblio($dbh,$bibid,0); } Index: Breeding.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Breeding.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Breeding.pm 8 Sep 2003 08:42:40 -0000 1.3 --- Breeding.pm 25 Oct 2003 08:46:28 -0000 1.4 *************** *** 72,75 **** --- 72,76 ---- for (my $i=0;$i<=$#marcarray;$i++) { my $marcrecord = MARC::File::USMARC::decode($marcarray[$i]."\x1D"); + my @warnings = $marcrecord->warnings(); if (ref($marcrecord) eq undef) { $notmarcrecord++; From tipaul at users.sourceforge.net Sat Oct 25 10:50:41 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 01:50:41 -0700 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_700_701_702.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1:/tmp/cvs-serv388/value_builder Modified Files: unimarc_field_700_701_702.pl Log Message: bugfix : use of '$var' instead of ? in sql statement Index: unimarc_field_700_701_702.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_700_701_702.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** unimarc_field_700_701_702.pl 27 Feb 2003 16:58:03 -0000 1.4 --- unimarc_field_700_701_702.pl 25 Oct 2003 08:50:39 -0000 1.5 *************** *** 122,127 **** if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST ('$search_string') and category ='NP'"); ! $sti->execute; while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; --- 122,127 ---- if ($search_string) { # my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where freelib like '".$search_string."%' and category ='$category'"); ! my $sti=$dbh->prepare("select id,freelib from bibliothesaurus where match (category,freelib) AGAINST (?) and category ='NP'"); ! $sti->execute($search_string); while (my $line=$sti->fetchrow_hashref) { $stdlib{$line->{'id'}} = "$line->{'freelib'}"; From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From tipaul at users.sourceforge.net Sat Oct 25 11:53:57 2003 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Sat, 25 Oct 2003 02:53:57 -0700 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.56,1.57 koha.upgrade,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv7816/misc Modified Files: Install.pm koha.upgrade Log Message: etcdir not harcoded Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** Install.pm 22 Oct 2003 14:48:08 -0000 1.56 --- Install.pm 25 Oct 2003 09:53:54 -0000 1.57 *************** *** 965,970 **** Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq| ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. --- 965,970 ---- Please press to continue: |; ! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq\ ! The installer could not find the User setting in the Apache configuration file. This is used to set up access permissions for %s/koha.conf. This user should be set in one of the Apache configuration. *************** *** 972,976 **** that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: |; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| --- 972,976 ---- that "ps u|grep apache" will tell you. It probably is NOT "root". ! Enter the Apache userid: \; $messages->{'InvalidUserid'}->{en} = heading('INVALID USER') . qq| *************** *** 993,997 **** /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf)) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; --- 993,999 ---- /etc/apache-ssl/httpd.conf /etc/httpd/conf/httpd.conf ! /etc/httpd/httpd.conf ! /etc/httpd/2.0/conf/httpd2.conf ! )) { if ( -f $httpdconf ) { push @confpossibilities, $httpdconf; *************** *** 1002,1005 **** --- 1004,1008 ---- my $message=getmessage('NoApacheConfFiles'); my $choice=''; + $realhttpdconf=''; until (-f $realhttpdconf) { $choice=showmessage($message, "free", 1); *************** *** 1618,1628 **** system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); - } - - $result = system ("perl -I $intranetdir/modules scripts/marc/updatedb2marc.pl"); - if ($result) { - print "Problem updating database to MARC...\n"; - restoremycnf(); - exit; } delete($ENV{"KOHA_CONF"}); --- 1621,1624 ---- Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** koha.upgrade 20 Oct 2003 15:42:43 -0000 1.6 --- koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 *************** *** 12,15 **** --- 12,23 ---- } + ############################################### + # SET THE etcdir ENVIRONMENT VAR INSTEAD # + ############################################### + my $etcdir = $ENV{etcdir}||'/etc'; + system("mkdir -p $etcdir"); + + Install::setetcdir $etcdir; + my $input; loadconfigfile(); From slef at users.sourceforge.net Sun Oct 26 13:21:16 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 04:21:16 -0800 Subject: [Koha-cvs] CVS: koha/misc koha.upgrade,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv12088 Modified Files: koha.upgrade Log Message: Initial changes so that I can test. /etc still hardcoded. z3950 installation buggy. Really needs merge with Install.pm, which I will nw start on. Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** koha.upgrade 25 Oct 2003 09:53:54 -0000 1.7 --- koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 *************** *** 7,15 **** $::language='en'; - if ($<) { - print "\n\nYou must run koha.upgrade as root.\n\n"; - exit; - } - ############################################### # SET THE etcdir ENVIRONMENT VAR INSTEAD # --- 7,10 ---- *************** *** 60,64 **** checkperlmodules(); ! my $backupdir='/usr/local/koha/backups'; print "Please specify a backup directory [$backupdir]: "; --- 55,59 ---- checkperlmodules(); ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; print "Please specify a backup directory [$backupdir]: "; *************** *** 189,193 **** OPAC: $::opacdir ! INTRANET: $::intranetdir --- 184,188 ---- OPAC: $::opacdir ! LIBRARIAN: $::intranetdir *************** *** 210,214 **** $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your INTRANET files: "; $answer = ; --- 205,209 ---- $::opacdir=''; while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; $answer = ; *************** *** 306,310 **** I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! /etc/koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; --- 301,305 ---- I was not able to determine the user that Apache is running as. This information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration files using the "User" directive. |; *************** *** 470,474 **** using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the /etc/koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; --- 465,469 ---- using basic authentication on your intranet, you will be required to log in to access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the "Members" module to add passwords for other accounts and set their permissions. |; From slef at users.sourceforge.net Sun Oct 26 14:21:21 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Sun, 26 Oct 2003 05:21:21 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.57,1.58 koha.upgrade,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv23111 Modified Files: Install.pm koha.upgrade Log Message: first part of upgrade merge: some FIXMEs and testing to do Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** Install.pm 25 Oct 2003 09:53:54 -0000 1.57 --- Install.pm 26 Oct 2003 13:21:19 -0000 1.58 *************** *** 71,74 **** --- 71,75 ---- &populatedatabase &restartapache + &backupkoha &finalizeconfigfile &loadconfigfile *************** *** 142,145 **** --- 143,160 ---- Are you ready to begin the installation? ([Y]/N): |; + $messages->{'WelcomeToUpgrader'}->{en} = + heading('Welcome to the Koha Upgrader') . qq| + You are attempting to upgrade from Koha %s to %s. + + We recommend that you do a complete backup of all your files before upgrading. + This upgrade script will make a backup copy of your files for you. + + Would you like to proceed? (Y/[N]):|; + + $messages->{'AbortingInstall'}->{en} = + heading('ABORTING') . qq| + Aborting as requested. Please rerun when you are ready. + |; + $messages->{'ReleaseCandidateWarning'}->{en} = heading('RELEASE CANDIDATE') . qq| *************** *** 258,261 **** --- 273,312 ---- Press to exit the installer: |; + $messages->{'UpgradeCompleted'}->{en} = heading('UPGRDE COMPLETE') . qq| + Congratulations ... your Koha upgrade is finished! + + If you are upgrading from a version of Koha + prior to 1.2.1, it is likely that you will have to modify your Apache + configuration to point it to the new files. + + In your INTRANET VirtualHost section you should have: + DocumentRoot $::intranetdir/htdocs + ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + In the OPAC VirtualHost section you should have: + DocumentRoot $::opacdir/htdocs + ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ + SetEnv PERL5LIB $::intranetdir/modules + + You may also need to uncomment a "LoadModules env_module ... " line and restart + Apache. + If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. + To populate it : + * launch Koha + * Go to Parameters >> Marc structure option and Koha-MARC links option. + * Modify default MARC structure to fit your needs. + * open a console + * type: + cd /path/to/koha/misc + export PERL5LIB=/path/to/koha + ./koha2marc.pl + the old DB is "copied" in the new MARC one. + Koha 2.0.0 is ready :-) + + Please report any problems you encounter through http://bugs.koha.org/ + + Press to exit the installer: |; + sub releasecandidatewarning { my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]); *************** *** 668,671 **** --- 719,788 ---- } + =item checkpaths + + checkpaths; + + Make sure that we loaded the right dirs from an old koha.conf + + =cut + + #FIXME: update to use Install.pm + sub checkpaths { + if ($opacdir && $intranetdir) { + print qq| + + I believe that your old files are located in: + + OPAC: $opacdir + LIBRARIAN: $intranetdir + + + Does this look right? ([Y]/N): + |; + $answer = ; + chomp $answer; + + if ($answer =~/n/i) { + $intranetdir=''; + $opacdir=''; + } else { + print "Great! continuing upgrade... \n"; + } + } + + if (!$opacdir || !$intranetdir) { + $intranetdir=''; + $opacdir=''; + while (!$intranetdir) { + print "Please specify the location of your LIBRARIAN files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $intranetdir=$answer; + } + if (! -e "$intranetdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $intranetdir=''; + } + } + while (!$opacdir) { + print "Please specify the location of your OPAC files: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $opacdir=$answer; + } + if (! -e "$opacdir/htdocs") { + print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; + $opacdir=''; + } + } + } + + } =item checkperlmodules *************** *** 1363,1366 **** --- 1480,1484 ---- #MJR: preserve old files, just in case + #FIXME: use dated backups sub neatcopy { my $desc = shift; *************** *** 1612,1615 **** --- 1730,1734 ---- } + #FIXME: do not ask if we are upgrading from a MARC-ready system my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); *************** *** 1731,1734 **** --- 1850,1987 ---- } + =item backupkoha + + backupkoha; + + This function attempts to back up all koha's details. + + =cut + + #FIXME: rewrite to use Install.pm + sub backupkoha { + my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; + print "Please specify a backup directory [$backupdir]: "; + + $answer = ; + chomp $answer; + + if ($answer) { + $backupdir=$answer; + } + + if (! -e $backupdir) { + my $result=mkdir ($backupdir, oct(770)); + if ($result==0) { + my @dirs = split(m#/#, $backupdir); + my $checkdir=''; + foreach (@dirs) { + $checkdir.="$_/"; + unless (-e "$checkdir") { + mkdir($checkdir, 0775); + } + } + } + } + + chmod 0770, $backupdir; + + # Backup MySql database + # + # + my $mysql; + my $mysqldir; + + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + print "I don't see mysql in the usual places.\n"; + for (;;) { + print "Where have you installed mysql? "; + chomp($mysqldir = ); + last if -f "$mysqldir/bin/mysqladmin"; + print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); + + my $itemcounter=0; + my $bibliocounter=0; + my $biblioitemcounter=0; + my $membercounter=0; + + while () { + (/insert into items /i) && ($itemcounter++); + (/insert into biblioitems /i) && ($biblioitemcounter++); + (/insert into biblio /i) && ($bibliocounter++); + (/insert into borrowers /i) && ($membercounter++); + print BF $_; + } + + close BF; + close MD; + + my $filels=`ls -hl $backupdir/Koha.backup_$date`; + chomp $filels; + printf qq| + + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + $filels + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): + |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; + + $answer = ; + chomp $answer; + + if ($answer=~/^n/i) { + print qq| + + Aborting. The database dump is located in: + + $backupdir/Koha.backup_$date + + |; + exit; + } else { + print "Great! continuing upgrade... \n"; + }; + + + + } =item finalizeconfigfile *************** *** 1775,1778 **** --- 2028,2032 ---- #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this. + #FIXME: make a dated backup open (KC, "<$etcdir/koha.conf"); while () { *************** *** 1791,1802 **** } ! $::intranetdir=$configfile{'intranetdir'}; ! $::opacdir=$configfile{'opacdir'}; ! $::kohaversion=$configfile{'kohaversion'}; ! $::kohalogdir=$configfile{'kohalogdir'}; ! $::database=$configfile{'database'}; ! $::hostname=$configfile{'hostname'}; ! $::user=$configfile{'user'}; ! $::pass=$configfile{'pass'}; } --- 2045,2057 ---- } ! #MJR: Reverted this too. You do not mess with my privates. Please ask for new functions if required. ! $intranetdir=$configfile{'intranetdir'}; ! $opacdir=$configfile{'opacdir'}; ! $kohaversion=$configfile{'kohaversion'}; ! $kohalogdir=$configfile{'kohalogdir'}; ! $database=$configfile{'database'}; ! $hostname=$configfile{'hostname'}; ! $user=$configfile{'user'}; ! $pass=$configfile{'pass'}; } *************** *** 1846,1851 **** =head1 SEE ALSO ! buildrelease.pl, installer.pl =cut --- 2101,2107 ---- =head1 SEE ALSO ! buildrelease.pl installer.pl + koha.upgrade =cut Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** koha.upgrade 26 Oct 2003 12:21:14 -0000 1.8 --- koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 *************** *** 10,22 **** # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! my $etcdir = $ENV{etcdir}||'/etc'; ! system("mkdir -p $etcdir"); ! ! Install::setetcdir $etcdir; my $input; loadconfigfile(); - ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; --- 10,18 ---- # SET THE etcdir ENVIRONMENT VAR INSTEAD # ############################################### ! Install::setetcdir($ENV{etcdir}||'/etc'); my $input; loadconfigfile(); ($::kohaversion) || ($::kohaversion='unknown version'); $::newversion=`cat koha.version`; *************** *** 26,51 **** } ! print qq| ! ! ================ ! = Koha Upgrade = ! ================ ! ! You are attempting to upgrade from Koha $::kohaversion to $::newversion. ! ! We recommend that you do a complete backup of all your files before upgrading. ! This upgrade script will make a backup copy of your files for you. ! ! Would you like to proceed? (Y/[N]): ! |; ! ! my $answer = ; ! chomp $answer; unless ($answer =~/y/i) { ! print qq| ! ! Aborting. Please re-run koha.upgrade when you are ready to upgrade Koha. ! |; exit; } else { --- 22,30 ---- } ! #FIXME: need kohaversion number ! showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn'); unless ($answer =~/y/i) { ! showmessage(getmessage('AbortingInstall'),'PressEnter'); exit; } else { *************** *** 54,514 **** checkperlmodules(); ! ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $backupdir=$answer; ! } ! ! if (! -e $backupdir) { ! my $result=mkdir ($backupdir, oct(770)); ! if ($result==0) { ! my @dirs = split(m#/#, $backupdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0770, $backupdir; ! ! # Backup MySql database # ! # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n"); ! ! my $itemcounter=0; ! my $bibliocounter=0; ! my $biblioitemcounter=0; ! my $membercounter=0; ! ! while () { ! (/insert into items /i) && ($itemcounter++); ! (/insert into biblioitems /i) && ($biblioitemcounter++); ! (/insert into biblio /i) && ($bibliocounter++); ! (/insert into borrowers /i) && ($membercounter++); ! print BF $_; ! } ! ! close BF; ! close MD; ! ! my $filels=`ls -hl $backupdir/Koha.backup_$date`; ! chomp $filels; ! printf qq| ! ! Backed up: ! ! %6d biblio entries ! %6d biblioitems entries ! %6d items entries ! %6d borrowers ! ! File Listing ! --------------------------------------------------------------------- ! $filels ! --------------------------------------------------------------------- ! ! Does this look right? ([Y]/N): ! |, $bibliocounter, $biblioitemcounter, $itemcounter, $membercounter; ! ! $answer = ; ! chomp $answer; ! ! if ($answer=~/^n/i) { ! print qq| ! ! Aborting. The database dump is located in: ! ! $backupdir/Koha.backup_$date ! ! |; ! exit; ! } else { ! print "Great! continuing upgrade... \n"; ! }; ! ! ! ! if ($::opacdir && $::intranetdir) { ! print qq| ! ! I believe that your old files are located in: ! ! OPAC: $::opacdir ! LIBRARIAN: $::intranetdir ! ! ! Does this look right? ([Y]/N): ! |; ! $answer = ; ! chomp $answer; ! ! if ($answer =~/n/i) { ! $::intranetdir=''; ! $::opacdir=''; ! } else { ! print "Great! continuing upgrade... \n"; ! } ! } ! ! ! if (!$::opacdir || !$::intranetdir) { ! $::intranetdir=''; ! $::opacdir=''; ! while (!$::intranetdir) { ! print "Please specify the location of your LIBRARIAN files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::intranetdir=$answer; ! } ! if (! -e "$::intranetdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::intranetdir=''; ! } ! } ! while (!$::opacdir) { ! print "Please specify the location of your OPAC files: "; ! ! $answer = ; ! chomp $answer; ! ! if ($answer) { ! $::opacdir=$answer; ! } ! if (! -e "$::opacdir/htdocs") { ! print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n"; ! $::opacdir=''; ! } ! } ! } ! ! ! ! print "\n\nBacking up old Koha scripts...\n"; ! print "===============================\n\n"; ! ! mkdir "$backupdir/kohafiles-$date", 0770; ! mkdir "$backupdir/kohafiles-$date/intranet", 0770; ! mkdir "$backupdir/kohafiles-$date/opac", 0770; ! ! my $result=system("cp -R $::intranetdir/* $backupdir/kohafiles-$date/intranet/"); ! if ($result) { ! print "Error encounted when copying $::intranetdir to $backupdir/kohafiles-$date/intranet/\n"; ! exit; ! } else { ! system("rm -rf $::intranetdir/*"); ! } ! $result=system("cp -R $::opacdir/* $backupdir/kohafiles-$date/opac/"); ! if ($result) { ! print "Error encounted when copying $::opacdir to $backupdir/kohafiles-$date/opac/\n"; ! exit; ! } else { ! system("rm -rf $::opacdir/*"); ! } ! ! print "Creating $::intranetdir/htdocs...\n"; ! mkdir ("$::intranetdir/htdocs", oct(750)); ! print "Creating $::intranetdir/cgi-bin...\n"; ! mkdir ("$::intranetdir/cgi-bin", oct(750)); ! print "Creating $::intranetdir/modules...\n"; ! mkdir ("$::intranetdir/modules", oct(750)); ! print "Creating $::intranetdir/scripts...\n"; ! mkdir ("$::intranetdir/scripts", oct(750)); ! chmod (oct(770), "$::opacdir"); ! print "Creating $::opacdir/htdocs...\n"; ! mkdir ("$::opacdir/htdocs", oct(750)); ! print "Creating $::opacdir/cgi-bin...\n"; ! mkdir ("$::opacdir/cgi-bin", oct(750)); ! ! my $httpduser; ! my $realhttpdconf; ! ! foreach my $httpdconf (qw(/usr/local/apache/conf/httpd.conf ! /usr/local/etc/apache/httpd.conf ! /usr/local/etc/apache/apache.conf ! /var/www/conf/httpd.conf ! /etc/apache/conf/httpd.conf ! /etc/apache/conf/apache.conf ! /etc/apache-ssl/conf/apache.conf ! /etc/httpd/conf/httpd.conf ! /etc/httpd/conf/commonhttpd.conf ! /etc/httpd/httpd.conf)) { ! if ( -f $httpdconf ) { ! $realhttpdconf=$httpdconf; ! open (HTTPDCONF, $httpdconf) or warn "Insufficient privileges to open $httpdconf for reading.\n"; ! while () { ! if (/^\s*User\s+"?([-\w]+)"?\s*$/) { ! $httpduser = $1; ! } ! } ! close(HTTPDCONF); ! } ! } ! ! unless ($httpduser) { ! print qq| ! I was not able to determine the user that Apache is running as. This ! information is necessary in order to set the access privileges correctly on ! koha.conf. This user should be set in one of the Apache configuration ! files using the "User" directive. ! |; ! print "What is your Apache user? "; ! chomp($input = ); ! ! if ($input) { ! $httpduser = $input; ! } else { ! $httpduser='Undetermined'; ! } ! } ! ! print "\n\nINSTALLING KOHA...\n"; ! print "\n\n==================\n"; ! print "Copying intranet-html files to $::intranetdir/htdocs...\n"; ! system("cp -R intranet-html/* $::intranetdir/htdocs/"); ! print "Copying intranet-cgi files to $::intranetdir/cgi-bin...\n"; ! system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/"); ! print "Copying script files to $::intranetdir/scripts...\n"; ! system("cp -R scripts/* $::intranetdir/scripts/"); ! print "Copying module files to $::intranetdir/modules...\n"; ! system("cp -R modules/* $::intranetdir/modules/"); ! print "Copying opac-html files to $::opacdir/htdocs...\n"; ! system("cp -R opac-html/* $::opacdir/htdocs/"); ! print "Copying opac-cgi files to $::opacdir/cgi-bin...\n"; ! system("cp -R opac-cgi/* $::opacdir/cgi-bin/"); ! system("touch $::opacdir/cgi-bin/opac"); ! ! system("chown -R root:$httpduser $::opacdir"); ! system("chown -R root:$httpduser $::intranetdir"); ! ! ! # Copy custom templates and reports back in ! ! opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! my @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::intranetdir/htdocs/$_"); ! print "Restoring custom intranet templates $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! } ! ! opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! @dirlist=readdir D; ! foreach (@dirlist) { ! (next) if (/^\./); ! (next) if ($_ eq 'default'); ! (next) if ($_ eq 'doc'); ! (next) if ($_=~/^koha-/); ! (next) if (-e "$::opacdir/htdocs/$_"); ! print "Restoring custom opac template $_...\n"; ! system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! } ! ! ! ! ! ! unless ($::kohalogdir && -e $::kohalogdir) { ! $::kohalogdir='/var/log/koha'; ! print "\n\nDirectory for logging by Z39.50 daemon [$::kohalogdir]: "; ! chomp($input = ); ! if ($input) { ! $::kohalogdir=$input; ! } ! } ! ! unless (-e "$::kohalogdir") { ! my $result = mkdir 0770, "$::kohalogdir"; ! if ($result==0) { ! my @dirs = split(m#/#, $::kohalogdir); ! my $checkdir=''; ! foreach (@dirs) { ! $checkdir.="$_/"; ! unless (-e "$checkdir") { ! mkdir($checkdir, 0775); ! } ! } ! } ! } ! ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh"; ! chmod 0750, "$::intranetdir/scripts/z3950daemon/processz3950queue"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!"; ! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $::intranetdir/scripts/z3950daemon/processz3950queue: $!"; ! ! ! ! my $kccontents='';open (KC, "/etc/koha.conf"); ! my $kc; ! while () { ! if (/^\s*includes\s*=/) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! $kc->{'includes'}=1; ! } elsif (/^\s*httpduser\s*=/) { ! $kccontents.="httpduser=$httpduser\n"; ! $kc->{'httpduser'}=1; ! } elsif (/^\s*kohaversion\s*=/) { ! $kccontents.="kohaversion=$::newversion\n"; ! $kc->{'kohaversion'}=1; ! } elsif (/^\s*kohalogdir\s*=/) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! $kc->{'kohalogdir'}=1; ! } elsif (/^\s*intranetdir\s*=/) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! $kc->{'intranetdir'}=1; ! } elsif (/^\s*opacdir\s*=/) { ! $kccontents.="opacdir=$::opacdir\n"; ! $kc->{'opacdir'}=1; ! } else { ! $kccontents.="$_"; ! } ! } ! ! unless (defined($kc->{'kohaversion'})) { ! $kccontents.="kohaversion=$::newversion\n"; ! } ! unless (defined($kc->{'includes'})) { ! $kccontents.="includes=$::intranetdir/htdocs/includes\n"; ! } ! unless (defined($kc->{'httpduser'})) { ! $kccontents.="httpduser=$httpduser\n"; ! } ! unless (defined($kc->{'intranetdir'})) { ! $kccontents.="intranetdir=$::intranetdir\n"; ! } ! unless (defined($kc->{'opacdir'})) { ! $kccontents.="opacdir=$::opacdir\n"; ! } ! unless (defined($kc->{'kohalogdir'})) { ! $kccontents.="kohalogdir=$::kohalogdir\n"; ! } ! ! ! system("mv /etc/koha.conf /etc/koha.conf.backup"); ! ! open (KC, ">/etc/koha.conf") || warn "Couldn't open /etc/koha.conf for writing."; ! print KC $kccontents; ! close KC; ! ! ! print qq| ! ! Upgrading Database ! ================== ! |; ! system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase"); ! ! ! print qq| ! ! ================== ! = Authentication = ! ================== ! ! This release of Koha has a new authentication module. If you are not already ! using basic authentication on your intranet, you will be required to log in to ! access some of the features of the intranet. You can log in using the userid ! and password from the koha.conf configuration file at any time. Use the ! "Members" module to add passwords for other accounts and set their permissions. ! |; ! print "Press the key to continue: "; ! ; ! ! ! ! print qq| ! ! ========================== ! = Koha Upgrade Completed = ! ========================== ! The Koha Upgrade is finished. ! If you are upgrading from a version of Koha ! prior to 1.2.1, it is likely that you will have to modify your Apache ! configuration to point it to the new files. ! ! In your INTRANET VirtualHost section you should have: ! DocumentRoot $::intranetdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! In the OPAC VirtualHost section you should have: ! DocumentRoot $::opacdir/htdocs ! ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/ ! SetEnv PERL5LIB $::intranetdir/modules ! ! You may also need to uncomment a "LoadModules env_module ... " line and restart ! Apache. ! If you're upgrading from 1.2.x version of Koha note that the MARC DB is NOT populated. ! To populate it : ! * launch Koha ! * Go to Parameters >> Marc structure option and Koha-MARC links option. ! * Modify default MARC structure to fit your needs. ! * open a console ! * type: ! cd /path/to/koha/misc ! export PERL5LIB=/path/to/koha ! ./koha2marc.pl ! the old DB is "copied" in the new MARC one. ! Koha 2.0.0 is ready :-) ! ! Please report any problems you encounter through http://bugs.koha.org/ ! |; my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); --- 33,69 ---- checkperlmodules(); ! backupkoha(); ! getapacheinfo(); ! installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} ! updatedatabase(); ! finalizeconfigfile(); + showmessage(getmessage('UpgradeCompleted'),'PressEnter'); my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y'); From kb2qzv at users.sourceforge.net Sun Oct 26 23:54:56 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 14:54:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.3,1.4 opac-detail.tmpl,1.3,1.4 opac-moredetail.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1:/tmp/cvs-serv26051 Modified Files: opac-reserve.tmpl opac-detail.tmpl opac-moredetail.tmpl Log Message: translation improvements, typos corrected. Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-reserve.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 24,28 ****

      Strona rezerwacji dla pozycji: ( )

      Z?o?ono ju? zam?wie? na t? pozycj?.

      !

      Prosimy wybra?, kt?ry typ pozycji Ci? interesuje. Pierwsza z pozycji,kt?ra stanie si? dost?pna a nale?y do jednego z tych typ?w zostanie dla Ciebie zatrzymana.

      --- 24,28 ----

      Strona rezerwacji dla pozycji: ( )

      Z?o?ono ju? zam?wie? na t? pozycj?.

      !

      Prosimy wybra?, kt?ry typ pozycji Ci? interesuje. Pierwsza z pozycji, kt?ra stanie si? dost?pna a nale?y do jednego z tych typ?w zostanie dla Ciebie zatrzymana. Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-detail.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 1,5 **** !

      Zalogowany jako: [Strony Cz?onkowskie][Wyloguj si?]

      --- 1,5 ---- !

      Zalogowany jako: [Strony Cz?onkowskie][Wyloguj si?]

      *************** *** 11,16 **** - - () --- 11,14 ---- *************** *** 18,73 **** ! ! ! ! ! ! ! !
      ! OPIS BIBLIO ! ! !
      ! ! Podtytu?:
      ! Autor:
      ! Przedmiot:
      ! Copyright:
      ! Ca?kowita liczba pozycji: !

      !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDost?pna

      --- 16,80 ---- ! ! ! ! ! ! !
      ! OPIS BIBLIO ! !
      ! ! Podtytu?: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez : ! w ! , ! ,
      ! Collection:
      ! Has?o przedmiotowe:
      ! Rok :
      ! Uwagi:
      ! Unititle:
      ! Serial:
      ! Dewey:
      ! URL:
      ! ca?kowita liczba pozycji: !       !

      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
      WitrynaOnlineDost?pna

      Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-moredetail.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 *************** *** 78,85 **** Ostatnio zdano:
      Ostatnio po?yczono:
      ! on issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Current Branch:
      Cena wymiany:
      Pozycja zagubiona:
      --- 78,85 ---- Ostatnio zdano:
      Ostatnio po?yczono:
      ! issue bit Ostatni czytelnik 1:
      Ostatni czytelnik 2:
      ! Bie??cy oddzia?:
      Cena wymiany:
      Pozycja zagubiona:
      From kb2qzv at users.sourceforge.net Mon Oct 27 00:39:43 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 15:39:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1631 Added Files: branchtransfers.tmpl Log Message: first round translation --- NEW FILE ---
      Nast?pny Czytelnik Zwroty

      Wypo?yczalnia: Transfery


      Oddzia?:   Drukarka:
      Zmie? ustawienia > >

      /images/background-mem.gif">Wykryto rezerwacj?
      Zarezerwowano: wykryto rezerwacj? dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). Pozycja oznaczona czeka:
      Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
      Ustaw rezerwacj? jako czekaj?c? i transferuj ksi??ke do : Uniewa?nij rezerwacj?, nast?pnie spr?buj transferowa?: value=> value=> value=> > > >
      Uniewa?nij rezerwacj?, nast?pnie spr?buj transferowa?:
      value=> value=> value=> > > > >
      Ignoruj i powr?? do transfer?w:
      > value=> value=> value=>
      /images/background-mem.gif">Wiadomo?ci
      Rezerwacja uniewa?niona
       Pozycja powinna teraz czeka? w oddziale:
      Brak pozycji o kodzie kreskowym: Prosz? zwr?cic pozycj? do rodzimego oddzia?u: Pozycja ju? jest w docelowym oddziale. Pozycj? wypo?yczy?/a " onClick="openWindow(this,'Member', 480, 640); return false;"> i zosta?a zwr?cona.
      /images/holder.gif" width=24 height=24>

      /images/background-mem.gif"> Wybierz oddzia?
      Oddzia? docelowy:
      /images/holder.gif" width=24 height=50 align=left>
      /images/background-mem.gif"> Wprowad? kod kreskowy ksi??ki
      Kod kreskowy pozycji:
      > value=> value=> value=>

      /images/background-mem.gif">Pozycje transferowane
      Kod kreskowyTytu?AutorTypOdDo
      align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center> align=center> align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:10:50 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:10:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ circulation.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv7322 Added Files: circulation.tmpl Log Message: first round translation --- NEW FILE ---
      &branch=&printer=&print=yes> Nast?pny czytelnik  Zwroty  Transfery

      Wypo?yczalnia: wypo?yczenia


      Oddzia?:
      Drukarka:
      Zmie? ustawienia > >

      Zwroty   Transfery

      Wypo?yczalnia: wypo?yczenia


      Oddzia?:
      Drukarka:
      Zmie? ustawienia > >

      /images/background-mem.gif"> Issuing Question
      Pr?ba wypo?yczenia autorstwa dla .

      > > > > > > > > > " value="">
      > > > > > > > > > " value="">
      B??d przy wypo?yczeniu
      /images/background-mem.gif">Wiadomo??

      > >
      /images/background-mem.gif"> Wybierz czytelnika

      /images/background-mem.gif"> Wprowad? numer karty czytelnika
      lub fragment nazwiska
      > >
      /images/background-mem.gif"> Wprowad? kod kreskowy ksi??ki
      Kod kreskowy pozycji:
      > Sticky Due Date
      > > > >
      Dane czytelnika
      " onClick="openWindow(this,'Member', 480, 640)">
      Kategoria:
      OBCI??ENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      OBCI??ENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
      CZEKA &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
      Zaleg?o?ciTak, patrz ni?ej
      UWAGI



      /images/background-mem.gif"> Wypo?yczenia dzi?
      Termin zwrotuKod kreskowyTytu?AutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      /images/background-mem.gif"> Poprzednie wypo?yczenia
      Termin zwrotuKod kreskowyTytu?AutorKlasa
      align=center> align=center> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> > > align=center>
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:41:21 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:41:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ returns.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv12425 Added Files: returns.tmpl Log Message: first round translation --- NEW FILE ---
      Wypo?yczenia  Transfery

      Cyrkulacja: Zwroty


      Oddzia?:   Drukarka:
      Zmie? ustawienia > >

      ! !
      /images/background-mem.gif">Wykryto rezerwacj?
      Pozycja oznakowana Czeka:
      Pozycja ()
      jest oznaczona oczekuje w dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Pozycja oznakowana Czeka:
      Pozycja: ()
      ma by? transferowana do
      do odebrania przez (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
      value=> value=> value=>
      Wykryto rezerwacj?: Pozycja: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      dla (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) do odebrania w .
      Zmie? status na oczekuj?ca i drukujwykaz?:
      value=> value=> value=> > > > POZYCJA ZAREZERWOWANA: () Kod kreskowy: itemtype: ODBI?R W: CZYTELNIK: Numer karty: Tel.: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ">
      /images/background-mem.gif"> Wprowad? kod kreskowy
      Kod kreskowy pozycji:
      value=> value=> value=>
      /images/background-mem.gif">Messages
      Brak pozycji z kodem: Prosz? wr?? do Nie w obiegu. Pozycja zagubiona, nie odnaleziona. pozycja uniewa?niona
      /images/background-mem.gif"> Dane zwr?conej pozycji
      Tytu?:
      /images/background-mem.gif"> Dane czytelnika
      " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ,
      /images/background-mem.gif" colspan=2> Flagi
      >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">P?atno??
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
      > &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
      >
      /images/background-mem.gif"> Zwr?cona pozycja
      Termin zwrotuKod kreskowyTytu?AutorTypCzytelnik
      > // Nie w obiegu. > align=center> &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> > > align=center> > " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;">
      From kb2qzv at users.sourceforge.net Mon Oct 27 01:49:14 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 16:49:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1:/tmp/cvs-serv13308 Added Files: selectbranchprinter.tmpl Log Message: first round translation --- NEW FILE ---

      Cyrkulacja: Ustawienia wyboru drukarki i oddzia?u


      align=center background=> Prosz? wybra? drukark? i oddzia?
      Oddzia?:
      		Drukarka:
      From kb2qzv at users.sourceforge.net Mon Oct 27 02:13:39 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 26 Oct 2003 17:13:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import In directory sc8-pr-cvs1:/tmp/cvs-serv16738 Added Files: breeding.tmpl Log Message: first round translation --- NEW FILE ---

      System akwizycji MARC

      Importuj do hurtowni opis?w

      Import wyniki :

        rekordy importowano

        nie importowano poniewa? ju? s? w bazie

        nie importowano poniewa? ju? s? w hurtowni

        nie importowano poniewa? nie wygl?daj? na b?d?ce w formacie MARC (lub brakuje ISBN/ISSN) !

        rekord?w przeczytanych

        Powr?t

      • Wybierz plik, by importowa? go do hurtowni opis?w. B?dzie przeczytany i dla ka?dego znalezionego numeru ISBN utworzone zostanie nowe "ciel?tko" w farmie.
      • Je?li ISBN ju? w farmie istnieje mo?na zdecydowa? czy nowe powinno by? zignorowane czy te? stare nadpisane nowym.
      • Mo?na nada? nazw? dla tego importu. Mo?e si? przyda? przy tworzeniu opisu bibliograficznego wskazuj?c pochodzenie sugerowanych danych MARC !
      • Oczywi?cie opis b?dzie ignorowany je?li numer ISBN istnieje ju? w aktywnej bazie Koha.
      " enctype="multipart/form-data">
      Wybierz plik do importu :
      Nazwa tego importu :
      Character encoding (USMARC or UNIMARC)
      Je?li ISBN ju? jest w hurtowni: Ignoruj ten, zatrzymaj istniej?cy
      Nadpisz istniej?cy obecnym
       
      From kb2qzv at users.sourceforge.net Mon Oct 27 15:34:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:34:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes members-bottom.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3725 Modified Files: members-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: members-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- members-bottom.inc 27 Oct 2003 14:34:15 -0000 1.2 *************** *** 5,22 **** ! !
      ! ! Pocz?tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc !
      --- 5,21 ---- !
      Pocz?tek || ! Katalog || ! Cz?onkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc !
      From kb2qzv at users.sourceforge.net Mon Oct 27 16:07:27 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:07:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue MARCdetail.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv10294 Modified Files: MARCdetail.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/MARCdetail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MARCdetail.tmpl 9 Feb 2003 09:47:22 -0000 1.2 --- MARCdetail.tmpl 27 Oct 2003 15:07:25 -0000 1.3 *************** *** 1,11 **** - ! ! ! ! +
      Opis MARC:
      --- 1,28 ---- ! ! !
      + + +
      + + /images/background-mem.gif"> + + +
      + + + + + + +
      ">//images/fileopen.png">">NormalOpis MARC :
      +
      *************** *** 20,40 **** !
      8
      9
      Pozycja
      !
      ! ! ! --- 37,67 ---- !
       
      8
      9
      Pozycja
      +       		+ + + class="button">Zam?w + +
      !
      ! /images/background-mem.gif"> ! ! + *************** *** 43,56 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 70,84 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 59,72 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 87,101 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 75,88 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 104,118 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 91,104 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 121,135 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 107,120 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 138,152 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 123,136 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 155,169 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 139,152 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 172,186 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 155,168 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 189,203 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 171,184 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! ! --- 206,220 ---- !
       
      ! /images/background-mem.gif"> ! + *************** *** 187,193 **** !
        &operator==&type=intranet&value=">//images/filefind.png" height=15>
      ! --- 223,229 ---- !
      ! /images/background-mem.gif"> *************** *** 209,213 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 245,249 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 220,222 **** - --- 256,257 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 15:57:16 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/export marc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export In directory sc8-pr-cvs1:/tmp/cvs-serv8118 Modified Files: marc.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: marc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export/marc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marc.tmpl 9 Jan 2003 11:39:26 -0000 1.1 --- marc.tmpl 27 Oct 2003 14:57:13 -0000 1.2 *************** *** 1,12 **** ! ! ! !

      Zalogowano jako: [Wyloguj]

      ! !

      Zaloguj si? do Koha

      !
      ! Administracja systemu Koha


      ! Eksportuj nast?puj?ce opisy w formacie MARC:

      od opisu numer : --- 1,7 ---- ! !

      !

      Eksportowanie opisu MARC




      ! Eksportuj nast?puj?ce opisy w formacie MARC :

      od opisu numer : From kb2qzv at users.sourceforge.net Mon Oct 27 16:41:30 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 07:41:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detail.tmpl,1.2,1.3 searchresults.tmpl,1.1,1.2 subject.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv16926 Modified Files: detail.tmpl searchresults.tmpl subject.tmpl Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** detail.tmpl 5 Oct 2003 22:44:02 -0000 1.2 --- detail.tmpl 27 Oct 2003 15:41:27 -0000 1.3 *************** *** 23,50 ****

      ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! ! ! ! ! ! ! !
      ! "> ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ! /images/edittrash.png" width=32 hspace=0 vspace=0 border=0">">MARC
      ! !
      ! Podtytu?:
      ! Autor: >
      ! Dodatkowy Autor:
      ! Tytu? serii:
      ! Has?o:
      ! Copyright:
      ! Uwagi:
      ! Tytu? ujednol.:
      ! Seria:
      ! Ca?kowita liczba pozycji:

      --- 23,44 ----

      !
      " class="button">MARC

      ! Podtytu?: ! Autor: >
      ! Autor dodatkowy:
       ! Wydano przez: ! w ! , ! ,
      ! Kolekcja:
      ! Has?o przedm:
      ! Rok:
      ! Uwagi:
      ! Ujednolicony:
      ! Serial:
      ! Dewey:
      ! URL:
      ! W sumie pozycji:

      Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchresults.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 6,69 ****

      - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj si? do Koha

      -       - ! Szukano ! Nie poda?e? ?adnego kryterium wyszukiwania
       znalezionych trafie?

      ! ! ! ! ! &&type=opacintra> ! ! ! ! ! -highlight.gif> ! &&type=opacintra>.gif border=0> ! ! ! ! &&type=opacintra> ! ! !

      ! ! ! - ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! --- 6,52 ----
      ! Szuka?e? ! Nie poda?e? kryteri?w wyszukiwania
       znalezionych trafie?

      ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! /images/numbers/-highlight.gif> ! &=&type=opacintra>/images/numbers/.gif border=0> + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

      !

      Tytu?Autor©Ilo?? pozycjiLokalizacja  
      ?type=opacintra&bib=> &type=opacintra>
      ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! *************** *** 72,109 **** ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
      Tytu?Autor©Ilo??Lokalizacja  
      ?type=opacintra&bib=> &type=opacintra> >Rezerwacja
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
      ! &&type=opacintra>Previous Records   ! ! &&type=opacintra>Next Records   !
      !
      ! !
      ! Trafienia od do z rekord?w. !

      ! Spr?buj nowej kwerendy ! Spr?buj nowej kwerendy --- 55,95 ---- !
      		>Request
      ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
      ! &=&type=opacintra>Previous Records   ! ! &=&type=opacintra>Next Records   !
      !
      ! !
      ! Wyniki do z trafie?. !
      ! Jeszcze jedno wyszukiwanie ! Jeszcze jedno wyszukiwanie Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/subject.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** subject.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- subject.tmpl 27 Oct 2003 15:41:28 -0000 1.2 *************** *** 1,3 **** - --- 1,2 ---- *************** *** 6,15 **** - -

      Zalogowano jako: [Wyloguj]

      - -

      Zaloguj si? do Koha

      -       -
      --- 5,8 ---- *************** *** 40,43 **** ! ! \ No newline at end of file --- 33,35 ---- ! \ No newline at end of file From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:29 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport AcceptBiblioitem.tmpl,1.1,1.2 AcceptMarcUpload.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29351 Modified Files: AcceptBiblioitem.tmpl AcceptMarcUpload.tmpl Log Message: small corrections Index: AcceptBiblioitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptBiblioitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptBiblioitem.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptBiblioitem.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -
      --- 1,2 ---- Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AcceptMarcUpload.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- AcceptMarcUpload.tmpl 27 Oct 2003 16:34:27 -0000 1.2 *************** *** 1,3 **** -

      >Menu g??wne

      --- 1,2 ---- *************** *** 41,43 **** - \ No newline at end of file --- 40,41 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 17:34:07 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 08:34:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/marcimport ListFileRecords.tmpl,1.1,1.2 uploadmarc.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv29274 Modified Files: ListFileRecords.tmpl uploadmarc.tmpl Log Message: small corrections Index: ListFileRecords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/ListFileRecords.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ListFileRecords.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- ListFileRecords.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 28,32 **** > " ! [Prz?gl?danie do z rekord?w] |
      --- 28,32 ---- > " ! [Prz?gl?danie od do z rekord?w] |
      Index: uploadmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/uploadmarc.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** uploadmarc.tmpl 9 Jan 2003 11:43:23 -0000 1.1 --- uploadmarc.tmpl 27 Oct 2003 16:34:05 -0000 1.2 *************** *** 1,3 **** -

      >Menu g??wne

      --- 1,2 ---- From slef at users.sourceforge.net Mon Oct 27 18:13:09 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:13:09 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.58,1.59 koha.upgrade,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv5026 Modified Files: Install.pm koha.upgrade Log Message: Old files warning and MARC upgrade fix Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** Install.pm 26 Oct 2003 13:21:19 -0000 1.58 --- Install.pm 27 Oct 2003 17:13:06 -0000 1.59 *************** *** 78,82 **** ); ! use vars qw( $kohaversion ); # set in installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl --- 78,82 ---- ); ! use vars qw( $kohaversion $newversion ); # set in loadconfigfile and installer.pl use vars qw( $language ); # set in installer.pl use vars qw( $domainname ); # set in installer.pl *************** *** 91,96 **** use vars qw( $dbname $hostname $user $pass ); # virtual hosting - use vars qw( $newversion ); # XXX this seems to be unused - =item heading --- 91,94 ---- *************** *** 381,385 **** sub setkohaversion ($) { ! ($kohaversion) = @_; } --- 379,383 ---- sub setkohaversion ($) { ! ($newversion) = @_; } *************** *** 1472,1475 **** --- 1470,1483 ---- |; + $messages->{'OldFiles'}->{en} = heading('OLD FILES') . qq| + Any files from the previous edition of Koha have been + copied to a dated backup directory alongside the new + installation. You should move any custom files that you + want to keep (such as your site templates) into the new + directories and then move the backup off of the live + server. + + Press ENTER to continue:|; + $messages->{'CopyingFiles'}->{en}="Copying %s to %s.\n"; *************** *** 1527,1531 **** opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$kohaversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl --- 1535,1539 ---- opacdir=$opacdir kohalogdir=$kohalogdir ! kohaversion=$newversion httpduser=$httpduser intrahtdocs=$intranetdir/htdocs/intranet-tmpl *************** *** 1552,1555 **** --- 1560,1565 ---- chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $intranetdir/scripts/z3950daemon/processz3950queue: $!"; } #MJR: FIXME: Should report that we haven't chown()d. + + showmessage(getmessage('OldFiles'),'PressEnter'); } *************** *** 1730,1745 **** } ! #FIXME: do not ask if we are upgrading from a MARC-ready system ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); } - delete($ENV{"KOHA_CONF"}); print RESET."\n\nFinished updating of database. Press to continue..."; --- 1740,1756 ---- } ! if ($kohaversion =~ /^1\.[012]\./) { ! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1'); ! startsysout(); ! if ($response eq '1') { ! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! if ($response eq '2') { ! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname"); ! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname"); ! } ! delete($ENV{"KOHA_CONF"}); } print RESET."\n\nFinished updating of database. Press to continue..."; Index: koha.upgrade =================================================================== RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** koha.upgrade 26 Oct 2003 13:21:19 -0000 1.9 --- koha.upgrade 27 Oct 2003 17:13:06 -0000 1.10 *************** *** 32,65 **** }; checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! ! #FIXME: Copy custom templates and reports back in, or warn ! ! #opendir D, "$backupdir/kohafiles-$date/intranet/htdocs/"; ! #my @dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::intranetdir/htdocs/$_"); ! # print "Restoring custom intranet templates $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/intranet/htdocs/$_ $::intranetdir/htdocs/"); ! #} ! # ! #opendir D, "$backupdir/kohafiles-$date/opac/htdocs/"; ! #@dirlist=readdir D; ! #foreach (@dirlist) { ! # (next) if (/^\./); ! # (next) if ($_ eq 'default'); ! # (next) if ($_ eq 'doc'); ! # (next) if ($_=~/^koha-/); ! # (next) if (-e "$::opacdir/htdocs/$_"); ! # print "Restoring custom opac template $_...\n"; ! # system("cp -a $backupdir/kohafiles-$date/opac/htdocs/$_ $::opacdir/htdocs/"); ! #} updatedatabase(); finalizeconfigfile(); --- 32,41 ---- }; + setkohaversion($::newversion); checkperlmodules(); backupkoha(); getapacheinfo(); installfiles(); ! # custom templates warning added to installfiles(); updatedatabase(); finalizeconfigfile(); From slef at users.sourceforge.net Mon Oct 27 18:36:19 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:36:19 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.59,1.60 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv8869/misc Modified Files: Install.pm Log Message: Added getmysqldir function Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** Install.pm 27 Oct 2003 17:13:06 -0000 1.59 --- Install.pm 27 Oct 2003 17:36:17 -0000 1.60 *************** *** 959,963 **** --- 959,994 ---- } + =item getmysqldir + getmysqldir; + + Get the MySQL database server installation directory, automatically if possible. + + =cut + + $messages->{'WhereIsMySQL'}->{en} = heading('MYSQL LOCATION').qq| + Koha can't find MySQL. If you compiled mysql yourself, + please give the value of --prefix when you ran configure. + The file mysqladmin should be in bin/mysqladmin under the directory that you give here. + + MySQL installation directory: |; + + sub getmysqldir { + foreach my $mysql (qw(/usr/local/mysql + /opt/mysql + /usr + )) { + if ( -d $mysql && -f "$mysql/bin/mysqladmin") { + $mysqldir=$mysql; + } + } + if (!$mysqldir){ + for (;;) { + $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); + last if -f "$mysqldir/bin/mysqladmin"; + } + } + return($mysqldir); + } =item getdatabaseinfo *************** *** 1628,1658 **** $mysqluser = 'root'; $mysqlpass = ''; - foreach my $mysql (qw(/usr/local/mysql - /opt/mysql - /usr - )) { - if ( -d $mysql && -f "$mysql/bin/mysqladmin") { - $mysqldir=$mysql; - } - } - if (!$mysqldir){ - print "I don't see mysql in the usual places.\n"; - for (;;) { - print "Where have you installed mysql? "; - chomp($mysqldir = ); - last if -f "$mysqldir/bin/mysqladmin"; - print <{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! Apache needs to be restarted to load the new configuration for Koha. ! This requires the root password. Would you like to try to restart Apache now? [Y]/N: |; --- 1835,1843 ---- wants so. =cut $messages->{'RestartApache'}->{en} = heading('RESTART APACHE') . qq| ! The web server daemon needs to be restarted to load the new configuration for Koha. ! The installer can do this if you are using Apache and give the root password. Would you like to try to restart Apache now? [Y]/N: |; *************** *** 1845,1850 **** my $response=showmessage(getmessage('RestartApache'), 'yn', 'y'); - - unless ($response=~/^n/i) { startsysout(); --- 1847,1850 ---- *************** *** 1869,1883 **** =cut #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups'; ! print "Please specify a backup directory [$backupdir]: "; ! ! $answer = ; ! chomp $answer; ! if ($answer) { ! $backupdir=$answer; ! } if (! -e $backupdir) { --- 1869,1897 ---- =cut + $messages->{'BackupDir'}->{en} = heading('BACKUP STORAGE').qq| + The upgrader will now try to backup your old files. + + Please specify a directory to store the backup in [%s]: |; + + $messages->{'BackupSummary'}->{en} = heading('BACKUP SUMMARY').qq| + Backed up: + + %6d biblio entries + %6d biblioitems entries + %6d items entries + %6d borrowers + + File Listing + --------------------------------------------------------------------- + %s + --------------------------------------------------------------------- + + Does this look right? ([Y]/N): |; + #FIXME: rewrite to use Install.pm sub backupkoha { ! my $backupdir=$ENV{'prefix'}.'/backups'; ! $answer = showmessage(getmessage('BackupDir',[$backupdir]),'free',$backupdir); if (! -e $backupdir) { *************** *** 1900,1934 **** # # ! my $mysql; ! my $mysqldir; ! ! foreach my $mysql (qw(/usr/local/mysql ! /opt/mysql ! /usr ! )) { ! if ( -d $mysql && -f "$mysql/bin/mysqladmin") { ! $mysqldir=$mysql; ! } ! } ! if (!$mysqldir){ ! print "I don't see mysql in the usual places.\n"; ! for (;;) { ! print "Where have you installed mysql? "; ! chomp($mysqldir = ); ! last if -f "$mysqldir/bin/mysqladmin"; ! print <; ! chomp $answer; if ($answer=~/^n/i) { --- 1943,1947 ---- my $filels=`ls -hl $backupdir/Koha.backup_$date`; chomp $filels; ! $answer = showmessage(getmessage('BackupSummary',[$bibliocounter, $biblioitemcounter, $itemcounter, $membercounter, $filels]),'yn'); if ($answer=~/^n/i) { From slef at users.sourceforge.net Mon Oct 27 18:39:43 2003 From: slef at users.sourceforge.net (MJ Ray) Date: Mon, 27 Oct 2003 09:39:43 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.60,1.61 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1:/tmp/cvs-serv9359/misc Modified Files: Install.pm Log Message: Timed backups in installfiles Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** Install.pm 27 Oct 2003 17:36:17 -0000 1.60 --- Install.pm 27 Oct 2003 17:39:41 -0000 1.61 *************** *** 1519,1523 **** #MJR: preserve old files, just in case - #FIXME: use dated backups sub neatcopy { my $desc = shift; --- 1519,1522 ---- *************** *** 1525,1531 **** my $tgt = shift; ! if (-d $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.".old"]); ! startsysout; system("mv ".$tgt." ".$tgt.".old"); } --- 1524,1530 ---- my $tgt = shift; ! if (-e $tgt) { ! print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]); ! startsysout(); system("mv ".$tgt." ".$tgt.".old"); } From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:52 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30638 Modified Files: member.tmpl Log Message: small corrections Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/member.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** member.tmpl 25 Jan 2003 19:23:37 -0000 1.2 --- member.tmpl 27 Oct 2003 21:59:50 -0000 1.3 *************** *** 13,28 **** ! ! ! ! ! ! ! ! ! --- 13,28 ----
      KartaNazwiskoImi?KategoriaAdresZaleg?e pozycjeOp?atyUwagi
      ! ! ! ! ! ! ! ! ! *************** *** 42,52 ****
      !
      ! Osoba Organizacja - - - - --- 42,48 ----
      ! ! Doros?y Organizacja From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:17 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:17 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members imemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30534 Modified Files: imemberentry.tmpl Log Message: small corrections Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/imemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** imemberentry.tmpl 9 Jan 2003 13:31:31 -0000 1.1 --- imemberentry.tmpl 27 Oct 2003 21:59:15 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !
      ! Dodaj now? instytucj?
      --- 1,10 ---- !
      ! !

      Edytuj instytucj?


      ! !

      Dodaj now? instytucj?


      !       *************** *** 28,34 ****
      ! --- 22,28 ---- ! *************** *** 36,91 **** ! ! ! - ! - ! ! ! ! - ! ! ! - ! --- 30,70 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,123 **** - - - - - ! ! ! ! ! - ! --- 72,100 ---- ! + ! + + + + + ! ! *************** *** 125,133 **** ! ! --- 102,113 ---- ! + + + ! *************** *** 135,144 **** - - - - --- 115,120 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 23:00:22 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 14:00:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members memberentry.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30746 Modified Files: memberentry.tmpl Log Message: small corrections Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/memberentry.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** memberentry.tmpl 25 Jan 2003 19:31:09 -0000 1.2 --- memberentry.tmpl 27 Oct 2003 22:00:19 -0000 1.3 *************** *** 1,7 **** ! ! ! !
      --- 1,5 ---- ! !


      *************** *** 15,28 ****       ! ! ! ! --- 13,26 ---- ! ! ! ! *************** *** 30,39 **** ! --- 28,47 ---- ! ! ! ! ! ! ! ! *************** *** 44,59 **** ! ! ! ! ! - - - + ! ! ! ! ! ! ! *************** *** 70,146 **** - - - - - - - - - - - ! ! ! - - - - - - - ! ! - ! ! - ! - ! ! ! ! - ! --- 80,159 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + + + + + + + ! ! ! ! ! + + + + + *************** *** 155,183 **** ! ! ! ! ! ! ! ! ! - ! ! - - --- 168,185 ---- ! ! ! *************** *** 185,190 **** ! --- 187,192 ---- ! *************** *** 192,201 **** ! ! ! ! !
      /images/background-mem.gif">Karta/images/background-mem.gif">Nazwisko/images/background-mem.gif">Imi?/images/background-mem.gif">Kategoria/images/background-mem.gif">Adres/images/background-mem.gif">Zaleg?e pozycje/images/background-mem.gif">Op?aty/images/background-mem.gif">Uwagi
      ! Czytelnik# , Numer Karty*
      ! Czytelnik# , Numer karty* >
      ! SZCZEG??Y INSTYTUCJI
      Nazwa instytucji
       
      ! Adres Instytucji
      ! !
      Adres pocztowy*Miasto*Rejon
       
      Dane kontaktowe
      /images/background-mem.gif"> ! DANE INSTYTUCJI /images/background-mem.gif">
      Nazwa instytucji
      ">
       
      /images/background-mem.gif"> ! ADRES INSTYTUCJI
      Adres pocztowy*Kod / Miasto*Area
      ">">
      ">      		 ! !
       
      /images/background-mem.gif"> Dane kontaktowe
      Nazwisko osoby kontaktowej*
      Tel. (w dzie?) Fax Email
       
      Uwagi
      Nazwisko osoby kontaktowej*
      ">
      Tel. (dzienny) Fax Email
      ">">">
       
      Uwagi
      Na u?ytek biblioteki
      /images/background-mem.gif">DO U?YTKU BIBLIOTEKI
      Uwagi
      Uwagi
      !
      !
      Czytelnik# , Numer Karty*
      DANE PERSONALNE CZYTELNIKA* ! zaznaczono>F ! zaznaczono> !     Data ur. (dd/mm/rr)
      Czytelnik# , Numer karty*
      /images/background-mem.gif">DANE OSOBOWE CZYTELNIKA/images/background-mem.gif">* ! checked>F ! checked> M !     Data urodzenia ()
      !
      tytu?Inicja?yImiona*Nazwisko*Preferowane imi?
      !
      Tytu?Inicja?yImiona*Nazwisko*Preferowane imi?
       
      Etniczno??Uwagi etniczne  Kategoria cz?onkowstwa*
      + +
      Etniczno??Uwagi dot. etniczno?ci  Kategoria cz?onkowstwa*
       
      Adres czetylnika
      !
      Adres pocztowy*Miasto*Kod
       
      Ulica, je?li innaMiasto
       
      DANE KONTAKTOWE CZYTELNIKA
      Tel. (dom)Tel. (praca)FaxEmail
       
      Alternatywne dane kontaktowe
      /images/background-mem.gif">ADRES CZYTELNIKA
      Pocztowy adres*Kod / Miasto*Oddzia? zapisu
      ! ">
      ! !       		!
      Adres zamieszkania je?li innyKod / Miasto
      ! ">
      !
      /images/background-mem.gif">DANE KONTAKTOWE CZYTELNIKA
      Phone (Home)FaxEmailText Messaging
      Phone (Daytime)
      /images/background-mem.gif">ALTERNATE CONTACT DETAILS
      Name*PhoneRelationship*
      Nazwisko*Tel.Pokrewie?stwo*
       
      Uwagi
       
      NA U?YTEK BIBLIOTEKI
      Uwagi
       
      FLAGS
      Notes
      /images/background-mem.gif">LIBRARY USE
      Notes
      FLAGS
      >Tak ! >Nie
      >Yes ! >No
      --- 194,204 ----       +
      ! > ! //images/2rightarrow.png" ALT="Add New Member" border=0 > !
      *************** *** 203,207 **** - - - --- 206,207 ---- From kb2qzv at users.sourceforge.net Mon Oct 27 22:59:35 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 13:59:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members jmemberentry.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1:/tmp/cvs-serv30583 Modified Files: jmemberentry.tmpl Log Message: small corrections Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/jmemberentry.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** jmemberentry.tmpl 9 Jan 2003 13:29:25 -0000 1.1 --- jmemberentry.tmpl 27 Oct 2003 21:59:33 -0000 1.2 *************** *** 1,16 **** ! ! ! ! ! ! ! !

      ! ! Dodaj nowego m?odocianego czytelnika
      - ! ! ! ! !
      ! ! ! !
      ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,128 ---- ! ! ! ! WELCOME TO THE KOHA INTRANET ! ! ! ! ! ! !
      !
      ! Koha: Horowhenua Library Trust      		 ! !
      ! Type in the box and press the enter key.
      ! ! ! -Advanced Search (More Options)
       !
      ! !
      ! !
      ! Type in the box and press the enter key.
      !

      !
      ! ! !
      /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 151,186 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 130,158 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 189,193 ****
      /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
      /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Catalogue Search" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
      ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">      		   ! !
      ! Type in the box and press the enter key.
      ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
       ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
        ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Member Search" name="member" hspace="0" vspace="0" border="0">
        
      ! !
      ! Type in the box and press the enter key.
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
           /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

      !

      !
           /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts and Reports" hspace="0" vspace="0" border="0">
      ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
          /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parameters" border="0">
      + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
      - --- 161,164 ---- From rangi at users.sourceforge.net Fri Oct 31 22:02:18 2003 From: rangi at users.sourceforge.net (Chris Cormack) Date: Fri, 31 Oct 2003 13:02:18 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.62,1.63 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1758/circ Modified Files: circulation.pl Log Message: Fix for bug 592 Re-issuing book does not renew correctly Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** circulation.pl 22 Oct 2003 20:01:28 -0000 1.62 --- circulation.pl 31 Oct 2003 21:02:16 -0000 1.63 *************** *** 314,318 **** todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray ); --- 314,322 ---- todayissues => \@realtodayissues, previssues => \@realprevissues, ! responseloop => \@responsearray, ! month=>$month, ! day=>$day, ! year=>$year ! ); From kb2qzv at users.sourceforge.net Mon Oct 27 15:33:48 2003 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Mon, 27 Oct 2003 06:33:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 common-style.css,NONE,1.1 parameters-bottom.inc,NONE,1.1 acquisitions-bottom.inc,1.1,1.2 acquisitions-top.inc,1.2,1.3 cat-bottom.inc,1.1,1.2 cat-top.inc,1.2,1.3 circulation-bottom.inc,1.1,1.2 circulation-top.inc,1.2,1.3 issues-bottom.inc,1.1,1.2 members-top.inc,1.2,1.3 parameters-top.inc,1.1,1.2 reports-bottom.inc,1.1,1.2 reports-top.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes In directory sc8-pr-cvs1:/tmp/cvs-serv3589 Modified Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc members-top.inc parameters-top.inc reports-bottom.inc reports-top.inc Added Files: about-bottom.inc about-top.inc common-style.css parameters-bottom.inc Log Message: update of translations, synchronization with files in ../default/en directory. Whenever they change we must followup... . --- NEW FILE ---

       

      Pocz?tek || Katalog || Cz?onkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      --- NEW FILE --- KOHA: INTRANET: Parametry /includes/common-style.css">

      Zalogowany jako: [Log Out]

      Zaloguj si? do Koha

       --- NEW FILE --- .button { text-align: center; font: 1.2em sans-serif; padding: 10px 15px; border-style: solid; border-width: 2px; border-color: black; text-decoration: none; color: black; border-radius: 6px; -moz-border-radius: 6px; background-color:#FFFFFF; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } #problem { color: red; font-weight:bold; } #menubar { border-top:1px solid #666666; font: 1.2em sans-serif; background-color:#DDDDDD; } #submenu { font: 0.5em sans-serif; background-color:#EEEEEE; border-left:1px solid #000000; } a.submenu { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#EEEEEE; padding:4px; font-weight: bold; margin:0; } a.submenu2 { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; background-color:#CCCCCC; padding:4px; font-weight: bold; margin:0; } .koha { text-align:center; background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.home:hover { background-color: #339933; color: #000000; text-decoration: none; font-weight: normal; font-weight: bold; } a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; margin:0; } a.catalogue:hover { font-weight: normal; text-decoration: none; cursor: hand; background-color:#ad11ad; color:#FFFFFF; font-weight: bold; } a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.members:hover { background-color: #86c268; color: #000000; text-decoration: none; font-weight: bold; } a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.acquisition:hover { background-color: #ffdf61; color: #000000; text-decoration: normal; font-weight: bold; } a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.reports:hover { background-color: #6b7cbe; color: #000000; text-decoration: normal; font-weight: bold; } a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.circulation:hover { background-color: #be6170; color: #000000; text-decoration: normal; font-weight: bold; } a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.parameters:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; padding:4px; font-weight: bold; } a.about:hover { background-color: #86c268; color: #000000; text-decoration: normal; font-weight: bold; } --- NEW FILE ---

       

      Pocz?tek || Katalog || Cz?onkowie || Akwizycje || Cyrkulacja || Reporty || Parametry || About || Pomoc
      Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- acquisitions-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,22 **** - -

       

      - ! !
      Pocz?tek || ! Wypo?yczalnia || ! Katalog || ! Czytelnicy || ! Akwizycja || ! Reporty || ! Admin || ! Pomoc
      --- 1,19 ----

       

      !
      Pocz?tek || ! Katalog || ! Cz?onkowie || ! Akwizycje || ! Cyrkulacja || ! Reporty || ! Parametry || ! About || ! Pomoc
      *************** *** 24,26 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** acquisitions-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- acquisitions-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,150 **** - - - - KOHA: INTRANET: Akwizycje ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu g??wne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,76 ---- KOHA: INTRANET: Akwizycje ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj si?]

      + +

      Zaloguj si? do Koha

      +       Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- cat-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz?tek || ! Wypo?yczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz?tek || ! Katalog || ! Cz?onkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cat-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- cat-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,120 **** ! ! ! ! ! KOHA: INTRANET: Katalog ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
      ! ! ! ! !

      ! KOHA: Menu g??wne
      !
      		! ! ! !
      !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! Circulation ! ! Home ! ! ! ! ! !
      --- 1,108 ---- ! ! ! KOHA: INTRANET: Katalog ! ! ! ! /includes/common-style.css"> ! ! ! ! ! ! ! ! ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! !
      opcje >>   ! Szybkie wyszukiwanie ! ! szukaj MARC ! ! Dodaj opis ! ! Zarz?dzaj kat. !
      !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj si?]

      ! !

      Zaloguj si? do Koha

      !       Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- circulation-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 2,20 ****

       

      -
      ! !
      Pocz?tek || ! Wypo?yczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 2,19 ----

       

      !
      Pocz?tek || ! Katalog || ! Cz?onkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz?tek
      Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** circulation-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- circulation-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,131 **** - - - - - ! KOHA: INTRANET: Wypo?yczalnia ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu g??wne
      !
      		! ! !
      ! ! ! ! Catalogue ! ! Members ! ! Acquisitions ! ! Reports ! ! ! Circulation ! ! ! Home ! ! ! ! ! !
      --- 1,104 ---- ! KOHA: INTRANET: Cyrkulacja ! + /includes/common-style.css"> + ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      opcje >>   ! "Wypo?yczenia ! ! Zwroty ! ! Transfery biblioteczne !
      ! !
      !
      !
      ! !

      Zalogowany jako: [Wyloguj si?]

      ! !

      Zaloguj si? do Koha

      !       Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/issues-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- issues-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,21 ****
      - -
      - -
      Pocz?tek || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz?tek || ! Katalog || ! Cz?onkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pocz?tek
      Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** members-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- members-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,107 **** - - - - - ! KOHA: INTRANET: Czytelnicy ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu g??wne
      !
      		! ! !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - -
      --- 1,91 ---- ! KOHA: INTRANET: Cz?onkowie ! /includes/common-style.css"> ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! !
      options >>   ! Strona domowa ! ! Nowy cz?onek ! ! Nowa oraganizacja !
      !
      !
      + +

      Zalogowany jako: [Wyloguj si?]

      + +

      Zaloguj si? do Koha

      +       Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/parameters-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** parameters-top.inc 3 Feb 2003 02:16:00 -0000 1.1 --- parameters-top.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 1,120 **** - - ! KOHA: INTRANET: Parameters ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! - - - -
      ! ! ! ! !

      ! KOHA: Main Menu
      !
      		! ! ! !
      !
      - - - - Catalogue - - Members - - Acquisitions - - Reports - - Circulation - - Home - - - - -
      --- 1,97 ---- ! KOHA: INTRANET: Parametry ! /includes/common-style.css"> ! ! ! !
      ! ! !
      ! ! ! ! ! ! ! ! ! ! ! !
      options >>   ! Fundusze ! ! Auth value ! ! Tesaurus ! ! Waluty ! ! Drukarki !
      !
      !
      + +

      Zalogowany jako: [Wyloguj si?]

      + +

      Zaloguj si? do Koha

      +       Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-bottom.inc 9 Jan 2003 11:41:25 -0000 1.1 --- reports-bottom.inc 27 Oct 2003 14:33:43 -0000 1.2 *************** *** 5,22 ****
      - -
      - -
      Pocz?tek || ! Wypo?yczalnia || ! Katalog || ! Czytelnicy || Akwizycje || Reporty || ! Admin || ! Pomoc
      --- 5,19 ----
      Pocz?tek || ! Katalog || ! Cz?onkowie || Akwizycje || + Cyrkulacja || Reporty || ! Parametry || ! About || ! Pomoc
      Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** reports-top.inc 26 Jan 2003 03:36:37 -0000 1.2 --- reports-top.inc 27 Oct 2003 14:33:43 -0000 1.3 *************** *** 1,105 **** ! ! ! ! KOHA: INTRANET: Reporty ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! - - -
      ! ! ! ! !

      ! KOHA: Menu g??wne
      !
      		! ! !
      - - - - Katalog - - Czytelnicy - - Akwizycje - - Reporty - - Wypo?yczalnia - - Pocz?tek - - - -
      --- 1,76 ---- ! KOHA: INTRANET: Reporty ! /includes/common-style.css"> ! ! !
      ! ! !
      ! !
      !
      + +

      Zalogowany jako: [Wyloguj si?]

      + +

      Zaloguj si? do Koha

      +