Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote branch 'kc/new/bug_5370' into kcmaster

Browse source
This commit is contained in:
Chris Cormack 2010-11-08 09:42:52 +13:00
commit 4a86a4de8c
23 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/XSLT.pm
View file

@ -218,7 +218,7 @@ sub buildKohaItemsNamespace {
. "</item>";
}
$xml = "<items xmlns=\"http://www.koha.org/items\">".$xml."</items>";
$xml = "<items xmlns=\"http://www.koha-community.org/items\">".$xml."</items>";
return $xml;
}

1
Makefile.PL
View file

@ -16,7 +16,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Current maintainer MJR http://mjr.towers.org.uk/
# See http://www.koha.org/wiki/?page=KohaInstaller
#
use strict;

2
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<kohaidx:index_defs xmlns:kohaidx="http://www.koha.org/schemas/index-defs">
<kohaidx:index_defs xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs">
<!-- variables -->
<kohaidx:var name="form_subdivision_subfield">v</kohaidx:var>
<kohaidx:var name="general_subdivision_subfield">x</kohaidx:var>

2
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xslo:stylesheet xmlns:xslo="http://www.w3.org/1999/XSL/Transform" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:z="http://indexdata.com/zebra-2.0" xmlns:kohaidx="http://www.koha.org/schemas/index-defs" version="1.0">
<xslo:stylesheet xmlns:xslo="http://www.w3.org/1999/XSL/Transform" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:z="http://indexdata.com/zebra-2.0" xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs" version="1.0">
<xslo:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
<xslo:template match="text()"/>
<xslo:template match="text()" mode="index_subfields"/>

2
etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
View file

@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias"
xmlns:z="http://indexdata.com/zebra-2.0"
xmlns:kohaidx="http://www.koha.org/schemas/index-defs">
xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs">
<xsl:namespace-alias stylesheet-prefix="xslo" result-prefix="xsl"/>
<xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>

1
install-CPAN.pl
View file

@ -23,7 +23,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Current maintainer MJR http://mjr.towers.org.uk/
# See http://www.koha.org/wiki/?page=KohaInstaller
# Create a fake CPAN location for koha
use CPAN;

4
install_misc/README.fr.install_koha_on_fresh_debian
View file

@ -52,7 +52,7 @@ Le script nécessite les droits root. lancer l'installation:
les modificateurs sont:
b: installer koha grace au tarball du site koha.org
b: installer koha grace au tarball du site koha-community.org
c: ne pas configurer le systeme de paquet debian
ils sont regroupés (sans espace), ainsi
@ -70,7 +70,7 @@ conseillons de conserver ce paramètre et de selectionner [dev] comme type
d'installation lorsque cela vous sera demandé. Ce choix vous permet de mettre
koha à jour par un simple git pull.
Si vous préférez utiliser le tarball disponible sur le site de koha.org,
Si vous préférez utiliser le tarball disponible sur le site de koha-community.org,
utilisez le modificateur b:
sh install_koha_on_fresh_debian b

8
install_misc/install_koha_on_fresh_debian
View file

@ -2,7 +2,7 @@
# Licensed under the GPL
# Copyright 2008 Biblibre.com
# Koha library project www.koha.org
# Koha library project www.koha-community.org
#
# this script follow all the installtion procedure described in INSTALL.Debian
# with some additions to use lenny packages.
@ -270,11 +270,11 @@ get_koha_git_clone () {
dpkg -l git-core ||
aptitude -y install git-core git-email
git clone git://git.koha.org/pub/scm/koha.git "$base"
git clone git://git.koha-community.org/koha.git "$base"
}
get_koha_release () {
wget -O- http://download.koha.org/koha-3.00.00.tar.gz |
wget -O- http://download.koha-community.org/koha-3.00.00.tar.gz |
tar xzf -
}
@ -292,7 +292,7 @@ get_koha_beta () {
local i basename; i=2
while [ $i != 11 ]; do
basename=koha-3.00.00-beta$i
wget -O- http://download.koha.org/$basename.tar.gz |
wget -O- http://download.koha-community.org/$basename.tar.gz |
tar xzf - &&
mv $basename "$base" &&
return 0

2
installer/data/mysql/backfill_statistics.pl
View file

@ -1,6 +1,6 @@
#!/usr/bin/perl
# Part of the Koha Library Software www.koha.org
# Part of the Koha Library Software www.koha-community.org
# Licensed under the GPL.
use strict;

2
installer/data/mysql/update22to30.pl
View file

@ -4,7 +4,7 @@
# Database Updater
# This script checks for required updates to the database.
# Part of the Koha Library Software www.koha.org
# Part of the Koha Library Software www.koha-community.org
# Licensed under the GPL.
# Bugs/ToDo:

2
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
View file

@ -2,7 +2,7 @@
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">
<xsl:import href="MARC21slimUtils.xsl"/>

2
koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
View file

@ -4,7 +4,7 @@
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">

2
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
View file

@ -2,7 +2,7 @@
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">
<xsl:import href="MARC21slimUtils.xsl"/>

2
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
View file

@ -2,7 +2,7 @@
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">
<xsl:import href="MARC21slimUtils.xsl"/>

2
koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
View file

@ -4,7 +4,7 @@
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">

2
koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
View file

@ -4,7 +4,7 @@
<xsl:stylesheet version="1.0"
xmlns:marc="http://www.loc.gov/MARC21/slim"
xmlns:items="http://www.koha.org/items"
xmlns:items="http://www.koha-community.org/items"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
exclude-result-prefixes="marc items">

6
misc/cronjobs/rss/README
View file

@ -42,14 +42,14 @@ Here's the lastAquired.conf by way of example:
channel
title=Recent Koha Acquisitions
link=http://www.koha.org
link=http://www.koha-community.org
desc=The 15 most recent acquisitions
lang=en
lastBuild=Fri, 09 May 2003 08:00:00
image
title=Koha, the worlds best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
tmpl=lastAcquired.tmpl
output=lastAcquired.xml

6
misc/cronjobs/rss/lastAcquired-1.0.conf
View file

@ -1,12 +1,12 @@
channel
title=Recent Acquisitions
link=http://www.koha.org
link=http://www.koha-community.org
desc=The library's 15 most recent acquisitions
lang=en
image
title=Koha, the worlds best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
description=Koha, the worlds best Open Source Library System
config
tmpl=lastAcquired-1.0.tmpl

6
misc/cronjobs/rss/lastAcquired-2.0.conf
View file

@ -1,12 +1,12 @@
channel
title=Recent Acquisitions
link=http://www.koha.org
link=http://www.koha-community.org
desc=The library's 15 most recent acquisitions
lang=en
image
title=Koha, the worlds best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
description=Koha, the worlds best Open Source Library System
width=88
height=31

6
misc/cronjobs/rss/lastAcquired.conf
View file

@ -1,13 +1,13 @@
channel
title=Recent Koha Acquisitions
link=http://www.koha.org
link=http://www.koha-community.org
desc=The 15 most recent acquisitions
lang=en
lastBuild=Fri, 09 May 2003 08:00:00
image
title=Koha, the world's best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
tmpl=lastAcquired.tmpl
output=lastAcquired.xml

6
misc/cronjobs/rss/longestUnseen.conf
View file

@ -1,12 +1,12 @@
channel
title=Longest Unseen Koha Items
link=http://www.koha.org
link=http://www.koha-community.org
desc=The 15 least recently seen items
lang=en
image
title=Koha, the worlds best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
tmpl=longestUnseen.tmpl
output=longestUnseen.xml

6
misc/cronjobs/rss/mostReserved.conf
View file

@ -1,12 +1,12 @@
channel
title=Most Reserved Items
link=http://www.koha.org
link=http://www.koha-community.org
desc=The 15 most reserved items
lang=en
image
title=Koha, the worlds best Open Source Library System
url=http://www.koha.org/images/foo.jpg
link=http://www.koha.org
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
tmpl=mostReserved.tmpl
output=mostReserved.xml

1
rewrite-config.PL
View file

@ -16,7 +16,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Current maintainer MJR http://mjr.towers.org.uk/
# See http://www.koha.org/wiki/?page=KohaInstaller
#
# 2007/11/12 Added DB_PORT and changed other keywords to reflect multi-dbms support. -fbcit