From c558249f29a90579ed2ae2dacd74bece7e003d57 Mon Sep 17 00:00:00 2001
From: Justin Bradley <jb4@ecs.soton.ac.uk>
Date: Fri, 9 Jan 2015 11:58:52 +0000
Subject: [PATCH 01/29] type fix

---
 AUTHORS                                |    2 +-
 lib/lang/en/static/eprints/index.xpage |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1f8240e..4868eb7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ Software Architects
  Seb Francois
 
 Developers
- Dr Jiadi Yeo - http://www.ecs.soton.ac.uk/people/jy2e08
+ Dr Jiadi Yao - http://www.ecs.soton.ac.uk/people/jy2e08
  Justin Bradley - http://www.ecs.soton.ac.uk/people/jb4
  Kelly Terrell - http://www.ecs.soton.ac.uk/people/kt2
  Adam Field - http://www.ecs.soton.ac.uk/people/af05v
diff --git a/lib/lang/en/static/eprints/index.xpage b/lib/lang/en/static/eprints/index.xpage
index f08ca69..8953139 100644
--- a/lib/lang/en/static/eprints/index.xpage
+++ b/lib/lang/en/static/eprints/index.xpage
@@ -38,7 +38,7 @@
 
 <h3>Developers</h3>
 <ul>
- <li><a href="http://www.ecs.soton.ac.uk/people/jy2e08">Dr Jiadi Yeo</a></li>
+ <li><a href="http://www.ecs.soton.ac.uk/people/jy2e08">Dr Jiadi Yao</a></li>
  <li><a href="http://www.ecs.soton.ac.uk/people/jb4">Justin Bradley</a></li>
  <li><a href="http://www.ecs.soton.ac.uk/people/kt2">Kelly Terrell</a></li>
  <li><a href="http://www.ecs.soton.ac.uk/people/af05v">Adam Field</a></li>
-- 
1.7.0.4


From e601950d321fed342301c624ad3d83c947d78b3f Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Mon, 12 Jan 2015 17:27:51 +0000
Subject: [PATCH 02/29] Fixed misordering of year and month in final example search string for time (date) search field help.

---
 lib/lang/en/phrases/system.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lang/en/phrases/system.xml b/lib/lang/en/phrases/system.xml
index 7e7a923..c495fcd 100644
--- a/lib/lang/en/phrases/system.xml
+++ b/lib/lang/en/phrases/system.xml
@@ -1594,13 +1594,13 @@ For more information see <a href="http://eprints.org/d/?keyword=MetaFields">Meta
     <epp:phrase id="lib/searchfield:help_time">Enter a date or date range. 
 <br/>Examples:  "<span class="ep_form_example">1985-</span>", 
 "<span class="ep_form_example">2001-05-17-2002-05-16</span>",
-"<span class="ep_form_example">-11-1980</span>"
+"<span class="ep_form_example">-1980-11</span>"
 </epp:phrase>
 	<epp:phrase id="lib/searchfield:help_timestamp" ref="lib/searchfield:help_time" />
     <epp:phrase id="lib/searchfield:help_date">Enter a date or date range. 
 <br/>Examples:  "<span class="ep_form_example">1985-</span>", 
 "<span class="ep_form_example">2001-05-17-2002-05-16</span>",
-"<span class="ep_form_example">-11-1980</span>"
+"<span class="ep_form_example">-1980-11</span>"
 </epp:phrase>
     <epp:phrase id="lib/searchfield:help_boolean">Select a value.</epp:phrase>
     <epp:phrase id="lib/searchfield:help_email">Enter some text to search for.</epp:phrase>
-- 
1.7.0.4


From 31fd77d72bcea7854699629c9cd6b1f3e8d3129f Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Thu, 22 Jan 2015 16:22:01 +0000
Subject: [PATCH 03/29] Added -q flag to a2dismod mpm_event so it does not error if installing on vanilla Ubuntu 12.04.

---
 debian/preinst.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/preinst.in b/debian/preinst.in
index 280a4f0..830e191 100755
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -24,7 +24,7 @@ case "$1" in
 	fi
 	adduser www-data @INSTALL_GROUP@ > /dev/null
 	adduser @INSTALL_USER@ www-data > /dev/null
-	a2dismod mpm_event > /dev/null
+	a2dismod -q mpm_event > /dev/null
 	a2enmod mpm_prefork > /dev/null
     ;;
 
-- 
1.7.0.4


From b46f9885ad31694b67a7042b7e6937ae43c0c68b Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Thu, 22 Jan 2015 17:07:24 +0000
Subject: [PATCH 04/29] Added if statement to check where mpm apache modules need to be swtiched berween event and prefork for deb package preinst.

---
 debian/preinst.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/preinst.in b/debian/preinst.in
index 830e191..d43d6b3 100755
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -24,8 +24,10 @@ case "$1" in
 	fi
 	adduser www-data @INSTALL_GROUP@ > /dev/null
 	adduser @INSTALL_USER@ www-data > /dev/null
-	a2dismod -q mpm_event > /dev/null
-	a2enmod mpm_prefork > /dev/null
+        if -f /etc/apache2/mods-enabled/mpm_event.load; then 
+  		a2dismod mpm_event > /dev/null
+		a2enmod mpm_prefork > /dev/null
+	fi
     ;;
 
     abort-upgrade)
-- 
1.7.0.4


From 2e653928c759f4e827071577394da8abc8341628 Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Thu, 22 Jan 2015 17:21:35 +0000
Subject: [PATCH 05/29] Amended mpm check if statement for debian preinst so it is /bin/sh compliant.

---
 debian/preinst.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/preinst.in b/debian/preinst.in
index d43d6b3..d80d057 100755
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -24,7 +24,7 @@ case "$1" in
 	fi
 	adduser www-data @INSTALL_GROUP@ > /dev/null
 	adduser @INSTALL_USER@ www-data > /dev/null
-        if -f /etc/apache2/mods-enabled/mpm_event.load; then 
+        if [ -e /etc/apache2/mods-enabled/mpm_event.load ];  then 
   		a2dismod mpm_event > /dev/null
 		a2enmod mpm_prefork > /dev/null
 	fi
-- 
1.7.0.4


From a80263dd54afb13015ea16800cb26c1a83e0e47e Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Fri, 23 Jan 2015 11:32:51 +0000
Subject: [PATCH 06/29] Used a2dissite rather than removing conf file from sites-enabled and run check for correct file to delete from sites-available.

---
 debian/postrm.in |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/postrm.in b/debian/postrm.in
index 59a13d4..9cf4ce4 100755
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -29,8 +29,12 @@ reload_apache()
 
 case "$1" in
     purge|remove|abort-install|disappear)
-	rm -f /etc/apache2/sites-enabled/@PACKAGE@
-	rm -f /etc/apache2/sites-available/@PACKAGE@
+	a2dissite @PACKAGE@
+	if [ -f /etc/apache2/sites-available/@PACKAGE@.conf ]; then
+	        rm -f /etc/apache2/sites-available/@PACKAGE@.conf
+	else
+		rm -f /etc/apache2/sites-available/@PACKAGE@
+	fi
 	update-rc.d -f epindexer remove
 	rm -f /etc/init.d/epindexer
 	if getent passwd @INSTALL_USER@ >/dev/null; then
-- 
1.7.0.4


From 6677dc9c3d87e507e5aa2ca250aee75a475eb287 Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Fri, 23 Jan 2015 13:54:34 +0000
Subject: [PATCH 07/29] Moved a2dissite to post remove but runs only if config file is a .conf.

---
 debian/postrm.in |    1 -
 debian/prerm.in  |    4 ++++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/postrm.in b/debian/postrm.in
index 9cf4ce4..639acb2 100755
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -29,7 +29,6 @@ reload_apache()
 
 case "$1" in
     purge|remove|abort-install|disappear)
-	a2dissite @PACKAGE@
 	if [ -f /etc/apache2/sites-available/@PACKAGE@.conf ]; then
 	        rm -f /etc/apache2/sites-available/@PACKAGE@.conf
 	else
diff --git a/debian/prerm.in b/debian/prerm.in
index 1c7553d..92f4b1e 100755
--- a/debian/prerm.in
+++ b/debian/prerm.in
@@ -24,6 +24,10 @@ case "$1" in
 	#`update-rc.d -f epindexer remove /dev/null` >&2
 	#`rm -f /etc/init.d/epindexer` >&2
 	#`/etc/init.d/apache2 force-reload /dev/null` >&2
+	if [ -f /etc/apache2/sites-enabled/@PACKAGE@.conf ]; then
+                `a2dissite @PACKAGE@ > /dev/null` >&2
+	fi
+		
     ;;
     
     failed-upgrade)
-- 
1.7.0.4


From 9f2f38ac3bbc6f6fd5051314477a9822a95e51cf Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Mon, 26 Jan 2015 14:14:52 +0000
Subject: [PATCH 08/29] Updated EPrints:Update::Views module to allow grouping of authors ignoring accents on characters.

---
 perl_lib/EPrints/Update/Views.pm |   60 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/perl_lib/EPrints/Update/Views.pm b/perl_lib/EPrints/Update/Views.pm
index fbd32f5..4baf2bb 100644
--- a/perl_lib/EPrints/Update/Views.pm
+++ b/perl_lib/EPrints/Update/Views.pm
@@ -1188,6 +1188,66 @@ sub group_by_n_chars
 	return $sections;
 }
 
+# [2015-01-26/drn] A-Z group treating accented characters as the same letter as unaccented ones.
+sub group_by_a_to_z_unidecode
+{
+
+        my $grouping = group_by_n_chars_unidecode( @_, 1 );
+
+        foreach my $c ( 'A'..'Z' )
+        {
+                next if defined $grouping->{$c};
+                $grouping->{$c} = [];
+        }
+        return $grouping;
+}
+
+sub group_by_first_character_unidecode { return group_by_n_chars_unidecode( @_, 1 ); }
+sub group_by_2_characters_unidecode { return group_by_n_chars_unidecode( @_, 2 ); }
+sub group_by_3_characters_unidecode { return group_by_n_chars_unidecode( @_, 3 ); }
+sub group_by_4_characters_unidecode { return group_by_n_chars_unidecode( @_, 4 ); }
+sub group_by_5_characters_unidecode { return group_by_n_chars_unidecoee( @_, 5 ); }
+
+sub group_by_n_chars_unidecode 
+{
+        my( $session, $menu, $menu_fields, $values, $n ) = @_;
+
+        # cache rendered values
+        my %rvals;
+        for( @$values )
+        {
+                $rvals{$_} = EPrints::Utils::tree_to_utf8( $menu_fields->[0]->render_single_value( $session, $_ ) );
+        }
+
+        # sort using cache
+        my @sorted = sort {
+                Text::Unidecode::unidecode(lc $rvals{$a} )
+                cmp
+                Text::Unidecode::unidecode(lc $rvals{$b} )
+        } @{$values};
+
+        my $sections = {};
+        foreach my $value ( @sorted )
+        {
+                # get rendered value from cache
+                my $v = $rvals{$value};
+
+                # lose everything not a letter or number
+                $v =~ s/[^\p{L}\p{N}]//g;
+
+                my $dc =  Text::Unidecode::unidecode( $v );
+
+                my $start = uc substr( $dc, 0, $n );
+                $start = "?" if( $start eq "" );
+
+                push @{$sections->{$start}}, $value;
+        }
+
+        return $sections;
+}
+# END: A-Z group treating accented characters as the same letter as unaccented ones.
+
+
 sub default_sort
 {
 	my( $repo, $menu, $values ) = @_;
-- 
1.7.0.4


From 6f6afc7649b44b4a72f678347d9f5f9464ae4d8a Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Tue, 27 Jan 2015 18:18:23 +0000
Subject: [PATCH 09/29] Change from url to uri for rendering 'more docs' link for individual EPrint results.  So if the EPrint is not yet live, admins get redirected to the admin page rather than a non-existent EPrint abstract page.

---
 lib/defaultcfg/citations/eprint/result.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/defaultcfg/citations/eprint/result.xml b/lib/defaultcfg/citations/eprint/result.xml
index ffc8ef5..4e2b08d 100644
--- a/lib/defaultcfg/citations/eprint/result.xml
+++ b/lib/defaultcfg/citations/eprint/result.xml
@@ -22,7 +22,7 @@
           </div>
         </epc:if>
         <epc:if test="length($docs) gt 2">
-          <div><a href='{$item.url()}'>+<epc:print expr="length($docs)-2" /> <epc:phrase ref="page:more"/></a></div>
+          <div><a href='{$item.uri()}'>+<epc:print expr="length($docs)-2" /> <epc:phrase ref="page:more"/></a></div>
         </epc:if>
       </epc:set>
     </td>
-- 
1.7.0.4


From 1f19458e99fb5eacdbf6c0b73ddc72f6f220e545 Mon Sep 17 00:00:00 2001
From: David R Newman <drn@ecs.soton.ac.uk>
Date: Wed, 28 Jan 2015 14:47:42 +0000
Subject: [PATCH 10/29] Removed a2dissite from Debian prerm and used symbolic links to make sure both eprints and eprints.conf appear in sites-available.  Ensured older versions of /etc/sites-available/eprints are maintained but with a warning if the do need match the package version.

---
 debian/postinst.in |    9 +++++++--
 debian/prerm.in    |    3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/postinst.in b/debian/postinst.in
index e85c0d9..64900c5 100755
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -26,7 +26,12 @@ case "$1" in
 	# Why disable the site in configure?!
 	#rm -f /etc/apache2/sites-available/@PACKAGE@
 	#rm -f /etc/apache2/sites-enabled/@PACKAGE@
-	echo "Include @PREFIX@/cfg/apache.conf" > /etc/apache2/sites-available/@PACKAGE@.conf
+	if [ ! -e /etc/apache2/sites-available/@PACKAGE@ ]; then 
+		echo "Include @PREFIX@/cfg/apache.conf" > /etc/apache2/sites-available/@PACKAGE@
+	elif [ "`cat /etc/apache2/sites-available/@PACKAGE@`" != "Include @PREFIX@/cfg/apache.conf" ]; then
+		echo "WARNING: /etc/apache2/sites-available/@PACKAGE@ differs from maintainer's version.  Apache may have problems loading this configuration."
+	fi
+	ln -fs /etc/apache2/sites-available/@PACKAGE@ /etc/apache2/sites-available/@PACKAGE@.conf
 	ln -fs @PREFIX@/bin/epindexer /etc/init.d/epindexer
 	update-rc.d epindexer defaults 99 99 > /dev/null
 	chown @INSTALL_USER@:www-data @PREFIX@ -R > /dev/null
@@ -56,7 +61,7 @@ case "$1" in
 	echo "##                                                               ##";
 	echo "##  # exit                                                       ##";
 	echo "##                                                               ##";
-	echo "##  # a2ensite eprints3                                          ##";
+	echo "##  # a2ensite eprints                                           ##";
 	echo "##                                                               ##";
 	echo "##  # apache2ctl restart                                         ##";
 	echo "##                                                               ##";
diff --git a/debian/prerm.in b/debian/prerm.in
index 92f4b1e..4bd2df4 100755
--- a/debian/prerm.in
+++ b/debian/prerm.in
@@ -24,9 +24,6 @@ case "$1" in
 	#`update-rc.d -f epindexer remove /dev/null` >&2
 	#`rm -f /etc/init.d/epindexer` >&2
 	#`/etc/init.d/apache2 force-reload /dev/null` >&2
-	if [ -f /etc/apache2/sites-enabled/@PACKAGE@.conf ]; then
-                `a2dissite @PACKAGE@ > /dev/null` >&2
-	fi
 		
     ;;
     
-- 
1.7.0.4


From af3424c84b76307348b0332d44cde83a20ddea79 Mon Sep 17 00:00:00 2001
From: Matthew Kerwin <matthew.kerwin@qut.edu.au>
Date: Tue, 3 Feb 2015 09:15:30 +1000
Subject: [PATCH 11/29] don't assign value of map/s back to array

Resolves #291
---
 perl_lib/EPrints/Plugin/Import/FlatSubjects.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Plugin/Import/FlatSubjects.pm b/perl_lib/EPrints/Plugin/Import/FlatSubjects.pm
index 064abfa..a5faeef 100644
--- a/perl_lib/EPrints/Plugin/Import/FlatSubjects.pm
+++ b/perl_lib/EPrints/Plugin/Import/FlatSubjects.pm
@@ -62,7 +62,7 @@ sub convert_input
 	my @vals = split /:/ , $input_data;
 
 	# percent-decode "%3A" to ":"
-	@vals = map { s/%3A/:/g } @vals;
+	@vals = map { ( my $s = $_ ) =~ s/%3A/:/g; $s } @vals;
 
 	my @parents = split( ",", $vals[2] );
 
-- 
1.7.0.4


From b46c7ae89a376f6d8d4ee0fe313eedb792e1e004 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Fri, 6 Feb 2015 12:32:39 +0000
Subject: [PATCH 12/29] FIX: subjects not clickable in subject editor in IE7-9

---
 lib/citations/subject/edit.xml   |    2 +-
 lib/citations/subject/screen.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/citations/subject/edit.xml b/lib/citations/subject/edit.xml
index a3622b0..d0abe98 100644
--- a/lib/citations/subject/edit.xml
+++ b/lib/citations/subject/edit.xml
@@ -7,7 +7,7 @@
 <cite:citation xmlns="http://www.w3.org/1999/xhtml" xmlns:cite="http://eprints.org/ep3/citation" xmlns:epc="http://eprints.org/ep3/control">
 
 <cite:linkhere><epc:choose>
-  <epc:when test="is_set(name_name)"><epc:print expr="name"/></epc:when> 
+  <epc:when test="is_set(name_name)"><epc:print expr="name_name"/></epc:when> 
   <epc:otherwise>Untitled subject #<epc:print expr="subjectid"/></epc:otherwise>
 </epc:choose></cite:linkhere>
 
diff --git a/lib/citations/subject/screen.xml b/lib/citations/subject/screen.xml
index c386279..8a8bad3 100644
--- a/lib/citations/subject/screen.xml
+++ b/lib/citations/subject/screen.xml
@@ -7,7 +7,7 @@
 <cite:citation xmlns="http://www.w3.org/1999/xhtml" xmlns:cite="http://eprints.org/ep3/citation" xmlns:epc="http://eprints.org/ep3/control">
 
 <cite:linkhere><epc:choose>
-  <epc:when test="name_name"><epc:print expr="name"/></epc:when> 
+  <epc:when test="name_name"><epc:print expr="name_name"/></epc:when> 
   <epc:otherwise>Untitled subject #<epc:print expr="subjectid"/></epc:otherwise>
 </epc:choose></cite:linkhere>
 
-- 
1.7.0.4


From d8ef0f565032abce7db66b297993813548fca4c8 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Fri, 6 Feb 2015 12:36:56 +0000
Subject: [PATCH 13/29] FIX: Multi-parent subjects are not rendered in workflow. CAUTION:this may cause page hang if the subject tree contains cycle. Cycle is checked in the subject editor, but may be introduced from the commandline.

---
 .../Plugin/InputForm/Component/Field/Subject.pm    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm b/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
index f634b8f..a248a2e 100644
--- a/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
+++ b/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
@@ -382,7 +382,8 @@ sub _tree
 	my $id = $top->id;
 
 	# infinite loop protection
-	return if $seen->{$id}++;
+##this prevents multi parent node to be rendered, hence commented out
+#	return if $seen->{$id}++;
 
 	return if defined($self->{whitelist}) && !$self->{whitelist}->{$id};
 
-- 
1.7.0.4


From ab2b758cf977129f4eddc0950c781efd4c171bc3 Mon Sep 17 00:00:00 2001
From: Matthew Kerwin <matthew.kerwin@qut.edu.au>
Date: Mon, 2 Mar 2015 12:18:43 +1000
Subject: [PATCH 14/29] old "replacedby" fallback, if "succeeds" is not set

---
 perl_lib/EPrints/DataObj/EPrint.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl_lib/EPrints/DataObj/EPrint.pm b/perl_lib/EPrints/DataObj/EPrint.pm
index 0c1c598..76ee843 100644
--- a/perl_lib/EPrints/DataObj/EPrint.pm
+++ b/perl_lib/EPrints/DataObj/EPrint.pm
@@ -1520,9 +1520,9 @@ sub render
 		{
 			$replacement = $later->item( 0 );
 		}
-		elsif( $self->is_set( "succeeds" ) )
+		elsif( $self->is_set( "replacedby" ) )
 		{
-			$replacement = $self->{session}->eprint( $self->value( "succeeds" ) );
+			$replacement = $self->{session}->eprint( $self->value( "replacedby" ) );
 		}
 		if( defined $replacement && $replacement->value( "eprint_status" ) eq "archive" )
 		{
-- 
1.7.0.4


From 267a3334034de4d2f98b836713062576df507180 Mon Sep 17 00:00:00 2001
From: William Fyson <williamfyson89@hotmail.com>
Date: Tue, 3 Mar 2015 11:28:09 +0000
Subject: [PATCH 15/29] Added an extra check for getting the remote IP as some servers didn't seem to be able to respond to either 'useragent_ip' or 'client_ip' and as such the requester ID wasn't being populated in the 'access' table.

---
 perl_lib/EPrints/Repository.pm |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/perl_lib/EPrints/Repository.pm b/perl_lib/EPrints/Repository.pm
index 00df201..722683d 100644
--- a/perl_lib/EPrints/Repository.pm
+++ b/perl_lib/EPrints/Repository.pm
@@ -460,6 +460,10 @@ sub remote_ip
                 $ip = $r->connection->client_ip;
         }
 
+	if( !EPrints::Utils::is_set( $ip ) && $r->connection->can( "remote_ip" ) )
+	{
+		$ip = $r->connection->remote_ip;
+	}
         return $ip;
 }
 
-- 
1.7.0.4


From 589de7eedc9f3b3a2f4499310b83e950cb5a223d Mon Sep 17 00:00:00 2001
From: Matthew Kerwin <matthew.kerwin@qut.edu.au>
Date: Fri, 6 Mar 2015 11:54:29 +1000
Subject: [PATCH 16/29] armor previous commit against 3.3.13 breaking changes

---
 perl_lib/EPrints/DataObj/EPrint.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/DataObj/EPrint.pm b/perl_lib/EPrints/DataObj/EPrint.pm
index 76ee843..1898334 100644
--- a/perl_lib/EPrints/DataObj/EPrint.pm
+++ b/perl_lib/EPrints/DataObj/EPrint.pm
@@ -1520,7 +1520,7 @@ sub render
 		{
 			$replacement = $later->item( 0 );
 		}
-		elsif( $self->is_set( "replacedby" ) )
+		elsif( $self->{dataset}->has_field( "replacedby" ) && $self->is_set( "replacedby" ) )
 		{
 			$replacement = $self->{session}->eprint( $self->value( "replacedby" ) );
 		}
-- 
1.7.0.4


From 19fd3cd8c30a28a9cba894433ba4fb3d3dab03bd Mon Sep 17 00:00:00 2001
From: Matthew Kerwin <matthew.kerwin@qut.edu.au>
Date: Thu, 12 Mar 2015 12:56:41 +1000
Subject: [PATCH 17/29] rename dx.doi.org to doi.org

---
 perl_lib/EPrints/Plugin/Import/DOI.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Plugin/Import/DOI.pm b/perl_lib/EPrints/Plugin/Import/DOI.pm
index 246d1ff..2f68bc1 100644
--- a/perl_lib/EPrints/Plugin/Import/DOI.pm
+++ b/perl_lib/EPrints/Plugin/Import/DOI.pm
@@ -236,7 +236,7 @@ sub convert_input
 		$epdata->{$doi_field} = $data->{"doi"};
 		my $doi = $data->{"doi"};
 		$doi =~ s/^\s*doi:\s*//gi;
-		$epdata->{official_url} = "http://dx.doi.org/$doi";
+		$epdata->{official_url} = "http://doi.org/$doi";
 	}
 	if( defined $data->{"volume_title"} )
 	{
-- 
1.7.0.4


From 12d2b197bf5f03cef536c649534b5b91a95d2f1c Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Tue, 17 Mar 2015 16:32:51 +0000
Subject: [PATCH 18/29] fix issue 265 https://github.com/eprints/eprints/issues/265 EPrints dies with unhelpful error message if Time::HiRes is not installed. code provided by MrkGrgsn

---
 perl_lib/EPrints/Config.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl_lib/EPrints/Config.pm b/perl_lib/EPrints/Config.pm
index 60207ad..85ec8fc 100644
--- a/perl_lib/EPrints/Config.pm
+++ b/perl_lib/EPrints/Config.pm
@@ -140,7 +140,7 @@ sub load_system_config
 		${"EPrints::SystemSettings::config"} = $SYSTEMCONF;
 	}
 
-	eval &_bootstrap( "EPrints::SystemSettings" );
+	eval &_bootstrap( "EPrints::SystemSettings" ) or die $@;
 
 	# we want to sort by filename because we interleave files from default and
 	# custom locations
@@ -269,7 +269,7 @@ sub load_repository_config_module
 		${"EPrints::Config::${id}::config"} = $info;
 	}
 
-	eval &_bootstrap( "EPrints::Config::".$id );
+	eval &_bootstrap( "EPrints::Config::".$id ) or die $@;
 
 	# we want to sort by filename because we interleave files from default and
 	# custom locations
@@ -317,6 +317,7 @@ sub load_config_file
 }
 }
 
+1;
 EOP
 }
 
-- 
1.7.0.4


From df22dc6019a9e3c657fc7204fe1018b491138cc6 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Tue, 17 Mar 2015 17:41:02 +0000
Subject: [PATCH 19/29] Temp fix for the subject search in workflow. q style is different depending on whether xapian is enabled on the system. Related issue https://github.com/eprints/eprints/issues/117

---
 .../Plugin/InputForm/Component/Field/Subject.pm    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm b/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
index a248a2e..db6e239 100644
--- a/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
+++ b/perl_lib/EPrints/Plugin/InputForm/Component/Field/Subject.pm
@@ -21,6 +21,7 @@ sub new
 	$self->{name} = "Subject";
 	$self->{visible} = "all";
 	$self->{visdepth} = 1;
+	$self->{search_q_style} = ( EPrints::Utils::require_if_exists( "Search::Xapian" ) ) ? "_q" : "q"; # sorry
 	return $self;
 }
 
@@ -407,7 +408,7 @@ sub get_state_params
 	my( $self ) = @_;
 
 	my $params = "";
-	foreach my $id ( $self->{prefix}."_q" )
+	foreach my $id ( $self->{prefix}.$self->{search_q_style} )
 	{
 		my $v = $self->{session}->param( $id );
 		next unless defined $v;
-- 
1.7.0.4


From 1423f5b468aa0155e47b472da49d883bacad80db Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Thu, 19 Mar 2015 13:41:11 +0000
Subject: [PATCH 20/29] Added check for 'replacedby' for backward compatibility of upgraded repositories. Added phrase 'alternative version' since the suggested item can be a later or eariler version.

---
 lib/lang/en/phrases/system.xml     |    1 +
 perl_lib/EPrints/DataObj/EPrint.pm |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/lang/en/phrases/system.xml b/lib/lang/en/phrases/system.xml
index c495fcd..7f0e7c7 100644
--- a/lib/lang/en/phrases/system.xml
+++ b/lib/lang/en/phrases/system.xml
@@ -1388,6 +1388,7 @@ For more information see <a href="http://eprints.org/d/?keyword=MetaFields">Meta
     <epp:phrase id="lib/eprint:eprint_gone_title">Item Removed</epp:phrase>
     <epp:phrase id="lib/eprint:eprint_gone"><p>You seem to be attempting to access an item that has been removed from the repository.</p></epp:phrase>
     <epp:phrase id="lib/eprint:later_version"><p>There is a later version of the item you are trying to access:<br/><epc:pin name="citation"/></p></epp:phrase>
+    <epp:phrase id="lib/eprint:replaced_version"><p>There is an alternative version of the item you are trying to access:<br/><epc:pin name="citation"/></p></epp:phrase>
     <epp:phrase id="lib/eprint:curr_disp"><strong>[Currently Displayed]</strong></epp:phrase>
     <epp:phrase id="lib/eprint:not_locked">Not currently locked.</epp:phrase>
     <epp:phrase id="lib/eprint:locked">Locked by <epc:pin name='locked_by' /> until <epc:pin name='locked_until' /></epp:phrase>
diff --git a/perl_lib/EPrints/DataObj/EPrint.pm b/perl_lib/EPrints/DataObj/EPrint.pm
index 1898334..524f557 100644
--- a/perl_lib/EPrints/DataObj/EPrint.pm
+++ b/perl_lib/EPrints/DataObj/EPrint.pm
@@ -1520,7 +1520,11 @@ sub render
 		{
 			$replacement = $later->item( 0 );
 		}
-		elsif( $self->{dataset}->has_field( "replacedby" ) && $self->is_set( "replacedby" ) )
+		elsif( $self->is_set( "succeeds" ) )
+		{
+			$replacement = $self->{session}->eprint( $self->value( "succeeds" ) );
+		}
+		elsif( $self->{dataset}->has_field( "replacedby" ) && $self->is_set( "replacedby" ) ) ##backward compatibility for repository upgraded from older version, which had replacedby. 
 		{
 			$replacement = $self->{session}->eprint( $self->value( "replacedby" ) );
 		}
@@ -1528,7 +1532,7 @@ sub render
 		{
 			$dom->appendChild( 
 				$self->{session}->html_phrase( 
-					"lib/eprint:later_version", 
+					"lib/eprint:replaced_version", 
 					citation => $replacement->render_citation_link ) );
 		}
 	}
-- 
1.7.0.4


From 12f00ab14d1319e0783895312f4c08706607eba7 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Thu, 19 Mar 2015 13:42:53 +0000
Subject: [PATCH 21/29] Changed 'database' to 'dataset'. Typo? https://github.com/eprints/eprints/commit/a2c9961170fc0836660c61da1a0968f9c0239609

---
 perl_lib/EPrints/Apache/CRUD.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Apache/CRUD.pm b/perl_lib/EPrints/Apache/CRUD.pm
index a8d7a89..621d2ab 100644
--- a/perl_lib/EPrints/Apache/CRUD.pm
+++ b/perl_lib/EPrints/Apache/CRUD.pm
@@ -894,7 +894,7 @@ sub content_negotiate_best_plugin
 	{
 		# summary page is higher priority than anything else for /id/eprint/23
 		# and /id/contents
-		if( ( $self->scope == CRUD_SCOPE_DATAOBJ && $self->{database}->base_id ne "subject" ) || $self->scope == CRUD_SCOPE_USER_CONTENTS )
+		if( ( $self->scope == CRUD_SCOPE_DATAOBJ && $self->{dataset}->base_id ne "subject" ) || $self->scope == CRUD_SCOPE_USER_CONTENTS )
 		{
 			my $plugin = $repo->plugin( "Export::SummaryPage" );
 			my $mimetype = $plugin->param( "produce" );
-- 
1.7.0.4


From e79a6b20c455a8af06909ba1ced94cd3e7e6dd3f Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Thu, 19 Mar 2015 13:59:04 +0000
Subject: [PATCH 22/29] added the missing 'remove_field' to SYNOPSIS

---
 bin/epadmin |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bin/epadmin b/bin/epadmin
index 65f9c5d..891e754 100755
--- a/bin/epadmin
+++ b/bin/epadmin
@@ -68,6 +68,8 @@ Where I<command> is one of:
 
 =item reload
 
+=item remove_field
+
 =item schema
 
 =item set_developer_mode
-- 
1.7.0.4


From d14e5c81f2dc79aa32c8f790c810a9eb9899d892 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Fri, 27 Mar 2015 16:46:46 +0000
Subject: [PATCH 23/29] Bazaar Client improvements: Added - show package accolade attribute; Added - search and filtering packages by accolade. Committed on behalf of jb4.

---
 lib/citations/epm/default.xml                      |    3 +-
 .../javascript/screen_admin_epm_available.js       |   37 +++++++---
 perl_lib/EPrints/DataObj/EPM.pm                    |   21 ++++++
 perl_lib/EPrints/EPM/Source.pm                     |   75 +++++++++++++++++++-
 .../EPrints/Plugin/Screen/Admin/EPM/Available.pm   |   25 ++++++-
 5 files changed, 147 insertions(+), 14 deletions(-)

diff --git a/lib/citations/epm/default.xml b/lib/citations/epm/default.xml
index a33bcb2..63a79ba 100644
--- a/lib/citations/epm/default.xml
+++ b/lib/citations/epm/default.xml
@@ -6,7 +6,7 @@
 
 <cite:citation xmlns="http://www.w3.org/1999/xhtml" xmlns:cite="http://eprints.org/ep3/citation" xmlns:epc="http://eprints.org/ep3/control">
 	<div style="position: absolute;"><cite:linkhere><epc:print expr="icon" /></cite:linkhere></div>
-	<div style="margin-left: 80px; min-height: 80px;">
+	<div style="margin-left: 80px; min-height: 80px; padding-top: 6px; padding-bottom: 6px;">
 	<strong>
 	<epc:choose>
 	<epc:when test="is_set(title)">
@@ -18,6 +18,7 @@
 	</epc:choose>
 	</strong>
 	- version <epc:print expr="version" />
+	<epc:if test="is_set(verb_rendered)">- <epc:print expr="verb_rendered" /></epc:if>
 	<epc:if test="is_set(home_page)"><p><epc:print expr="home_page" /></p></epc:if>
 	<epc:if test="is_set(description)"><p><epc:print expr="description" /></p></epc:if>
 	</div>
diff --git a/lib/static/javascript/screen_admin_epm_available.js b/lib/static/javascript/screen_admin_epm_available.js
index eb3ca01..6a5c763 100644
--- a/lib/static/javascript/screen_admin_epm_available.js
+++ b/lib/static/javascript/screen_admin_epm_available.js
@@ -5,21 +5,32 @@ function js_admin_epm_available_update(pe)
 {
 	var screenid = 'Admin::EPM::Available';
 
-	var input = $(screenid + '_q');
-	if( !input )
+	var input_q = $(screenid + '_q');
+	var input_v = $(screenid + '_v');
+
+	if( !input_q || !input_v)
 		return;
 
-	if( !input._pvalue )
-		input._pvalue = '';
+	if( !input_q._pvalue )
+		input_q._pvalue = '';
+
+	if( !input_v._pvalue )
+		input_v._pvalue = '';
+
+	var input_v_value = input_v.options[input_v.selectedIndex].value; 
 
-	if( input.value == input._pvalue )
+	if( input_q.value == input_q._pvalue &&
+	    input_v_value == input_v._pvalue )
 		return;
 
-	if( input._inprogress )
+	if( input_q._inprogress )
 		return;
-	
-	input._inprogress = 1;
 
+	if( input_v._inprogress )
+		return;
+	
+	input_q._inprogress = 1;
+	input_v._inprogress = 1;
 	var container = $(screenid + '_results');
 	var loading = $('loading').cloneNode( 1 );
 
@@ -28,17 +39,21 @@ function js_admin_epm_available_update(pe)
 	loading.clonePosition( container );
 	loading.show();
 
-	var qvalue = input.value;
+	var qvalue = input_q.value;
+	var vvalue = input_v_value;
 	var params = {};
 	params['screen'] = screenid;
 	params['ajax'] = 1;
 	params[screenid + '_q'] = qvalue;
+	params[screenid + '_v'] = vvalue;
 	new Ajax.Updater(container, eprints_http_cgiroot+'/users/home', {
 		method: 'get',
 		parameters: params,
 		onComplete: function () {
-			input._pvalue = qvalue;
-			input._inprogress = 0;
+			input_q._pvalue = qvalue;
+			input_v._pvalue = vvalue;
+			input_q._inprogress = 0;
+			input_v._inprogress = 0;
 		}
 	});
 }
diff --git a/perl_lib/EPrints/DataObj/EPM.pm b/perl_lib/EPrints/DataObj/EPM.pm
index 6f9e605..c6bc3e7 100644
--- a/perl_lib/EPrints/DataObj/EPM.pm
+++ b/perl_lib/EPrints/DataObj/EPM.pm
@@ -98,6 +98,27 @@ sub get_system_field_info
 	# icon filename
 	{ name=>"icon", type=>"url", render_value => \&render_icon, },
 
+	{
+ 		name=>"verb",
+ 		type=>"text",
+ 		multiple => 1,
+ 	},
+ 	{
+ 		name=>"verb_rendered",
+ 		type=>"text",
+ 		render_single_value => "EPrints::Extras::render_xhtml_field",
+ 		multiple => 1,
+ 	},
+ 	{
+ 		name=>"verb_rendered_long",
+ 		type=>"text",
+ 		render_single_value => "EPrints::Extras::render_xhtml_field",
+ 		multiple => 1,
+ 	},
+
+
+
+
 	);
 }
 
diff --git a/perl_lib/EPrints/EPM/Source.pm b/perl_lib/EPrints/EPM/Source.pm
index c24ba76..f1f6dc4 100644
--- a/perl_lib/EPrints/EPM/Source.pm
+++ b/perl_lib/EPrints/EPM/Source.pm
@@ -68,7 +68,53 @@ sub query
 
 	my $url = URI->new( $base_url );
 	$url->path( $url->path . "cgi/search" );
-	$url->query_form( q => $q, output => "EPMI" );
+	$url->query_form( q => $q, output => "EPMI2" );
+	my $tmpfile = File::Temp->new;
+
+	my $r = $ua->get( $url,
+		':content_file' => "$tmpfile",
+	);
+	$self->{err} = $r->request->uri . " " . $r->status_line, return if !$r->is_success;
+
+	sysseek($tmpfile, 0, 0);
+
+	$repo->plugin( "Import::XML",
+		Handler => EPrints::CLIProcessor->new(
+			epdata_to_dataobj => sub {
+				push @epms, $repo->dataset( "epm" )->make_dataobj( $_[0] );
+				return undef;
+			},
+		),
+	)->input_fh(
+		fh => $tmpfile,
+		dataset => $repo->dataset( "epm" ),
+	);
+
+	return \@epms;
+}
+
+sub query2
+{
+	my( $self, $q, $v ) = @_;
+
+	my $repo = $self->{repository};
+
+	my $base_url = $self->{base_url};
+	my $ua = $self->{ua};
+
+	my @epms;
+
+	my $url = URI->new( $base_url );
+	$url->path( $url->path . "cgi/search/simple2" );
+
+	if( $v eq "_all")
+	{
+		$url->query_form( q => $q, "q_merge" => "ALL", output => "EPMI2" );
+	}
+	else
+	{
+		$url->query_form( q => $q, v => $v, "q_merge" => "ALL", output => "EPMI2" );
+	}
 
 	my $tmpfile = File::Temp->new;
 
@@ -94,6 +140,33 @@ sub query
 	return \@epms;
 }
 
+sub accolades
+{
+	my( $_ua, $_base_url ) = @_;
+
+	my $ua = ( $_ua ) ? $_ua : LWP::UserAgent->new;
+	my $base_url = ( $_base_url ) ? $_base_url : "http://bazaar.eprints.org/";
+
+#	my $ua = $self->{ua};
+# my $ua = LWP::UserAgent->new;
+#	my $r = $ua->get( $self->{base_url} . "cgi/accolades" );
+# my $r = $ua->get( "http://bazaar.eprints.org/cgi/accolades" );
+
+	my $r = $ua->get( $base_url . "cgi/accolades" );
+	my $str = $r->content;
+
+	my %kv;
+	$kv{ "_all" } = "All";
+
+	for my $line ( split(/\n/, $str) )
+	{
+		my ($k, $v) = split(":", $line, 2);
+		$kv{ $k } = $v;
+	}
+
+	return %kv;
+}
+
 =item $epm = $source->epm_by_eprintid( $eprintid )
 
 Retrieves an installable EPM from the source with $eprintid.
diff --git a/perl_lib/EPrints/Plugin/Screen/Admin/EPM/Available.pm b/perl_lib/EPrints/Plugin/Screen/Admin/EPM/Available.pm
index 802acfe..833c9ee 100644
--- a/perl_lib/EPrints/Plugin/Screen/Admin/EPM/Available.pm
+++ b/perl_lib/EPrints/Plugin/Screen/Admin/EPM/Available.pm
@@ -240,6 +240,10 @@ sub action_search
 
 	$self->{processor}->{notes}->{$self->get_subtype."_q"} =
 		$self->{repository}->param($self->get_subtype."_q");
+
+	$self->{processor}->{notes}->{$self->get_subtype."_v"} =
+		$self->{repository}->param($self->get_subtype."_v");
+
 	$self->{processor}->{notes}->{ep_tabs_current} = $self->get_subtype;
 
 	$self->{processor}->{screenid} = "Admin::EPM";
@@ -276,6 +280,21 @@ sub render
 		"${prefix}_q" => scalar($repo->param( "${prefix}_q" )),
 		id => "${prefix}_q",
 	) );
+
+
+	my $base_url = $repo->param( "base_url" );
+	my $ua;
+	my %acc = EPrints::EPM::Source::accolades( $ua, $base_url );
+
+	my $default = ( defined $repo->param( "${prefix}_v" ) ) ? scalar( $repo->param( "${prefix}_v" ) ) : "_all";
+	$form->appendChild( $self->{session}->render_option_list(
+		name => "${prefix}_v",
+		id => "${prefix}_v",
+		values => [ sort { $acc{$a} cmp $acc{$b} } keys %acc ],
+		default => $default,
+		labels => \%acc,
+	) );
+
 	$form->appendChild( $xhtml->input_field(
 		"_action_search" => $repo->phrase( "lib/searchexpression:action_search" ),
 		type => "submit",
@@ -328,7 +347,11 @@ sub render_results
 	EPrints::EPM::Source->map( $repo, sub {
 		my( undef, $source ) = @_;
 
-		my $epms = $source->query( scalar($repo->param( $self->get_subtype."_q" )) );
+		# my $epms = $source->query( scalar($repo->param( $self->get_subtype."_q" )) );
+		my $epms = $source->query2(
+			scalar($repo->param( $self->get_subtype."_q" )),
+			scalar($repo->param( $self->get_subtype."_v" ))
+		);
 		if( !defined $epms )
 		{
 			$self->{processor}->add_message( "warning", $self->html_phrase( "source_error",
-- 
1.7.0.4


From dce1d9c2eca1dcdd89f1906388ba0e45825092ff Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Wed, 1 Apr 2015 15:26:51 +0100
Subject: [PATCH 24/29] added template for overwrite the default max_items variable

---
 lib/defaultcfg/cfg.d/views.pl |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/lib/defaultcfg/cfg.d/views.pl b/lib/defaultcfg/cfg.d/views.pl
index 0a4b158..9175a01 100644
--- a/lib/defaultcfg/cfg.d/views.pl
+++ b/lib/defaultcfg/cfg.d/views.pl
@@ -3,6 +3,21 @@
 # a valid result. 
 # Multiple fields may be specified for one view, but avoid
 # subject or allowing null in this case.
+
+
+
+##
+# set a global max_items limit:
+#	$c->{browse_views_max_items} = 3000;
+
+# set a per view max_item limit:
+#        $c->{browse_views} = [{
+#                ...
+#                max_items => 3000,
+#        }];
+# To disable the limit set max_items to 0.
+
+
 $c->{browse_views} = [
         {
                 id => "year",
-- 
1.7.0.4


From 377e33cd6081c9ba1b37c0e9d0d28081f3ad4b84 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Wed, 1 Apr 2015 15:27:48 +0100
Subject: [PATCH 25/29] bug fixes. Atom.pm - added missing const use statement; Grid.pm - set visibly to none for this abstract exporter

---
 perl_lib/EPrints/Plugin/Export/Atom.pm |    1 +
 perl_lib/EPrints/Plugin/Export/Grid.pm |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/perl_lib/EPrints/Plugin/Export/Atom.pm b/perl_lib/EPrints/Plugin/Export/Atom.pm
index e782dbd..c722253 100644
--- a/perl_lib/EPrints/Plugin/Export/Atom.pm
+++ b/perl_lib/EPrints/Plugin/Export/Atom.pm
@@ -7,6 +7,7 @@ EPrints::Plugin::Export::Atom
 package EPrints::Plugin::Export::Atom;
 
 use EPrints::Plugin::Export::Feed;
+use EPrints::Const qw( :namespace );
 
 @ISA = ( "EPrints::Plugin::Export::Feed" );
 
diff --git a/perl_lib/EPrints/Plugin/Export/Grid.pm b/perl_lib/EPrints/Plugin/Export/Grid.pm
index ea818da..f5d1681 100644
--- a/perl_lib/EPrints/Plugin/Export/Grid.pm
+++ b/perl_lib/EPrints/Plugin/Export/Grid.pm
@@ -22,7 +22,7 @@ sub new
 
 	$self->{name} = "Grid (abstract)";
 	$self->{accept} = [ 'dataobj/*', 'list/*', ];
-	
+	$self->{visible} = "none";	
 	return $self;
 }
 
-- 
1.7.0.4


From 14d498d227a8fd7a2d39c3ef4587a2e37c85b830 Mon Sep 17 00:00:00 2001
From: Timothy Miles-Board <timothy.miles-board@london.ac.uk>
Date: Tue, 14 Apr 2015 22:26:46 +0100
Subject: [PATCH 26/29] Fix subjects/divisions being displayed in all languages after upgrade to 3.3.13

---
 perl_lib/EPrints/DataObj/Subject.pm     |    3 +--
 perl_lib/EPrints/MetaField/Multilang.pm |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/perl_lib/EPrints/DataObj/Subject.pm b/perl_lib/EPrints/DataObj/Subject.pm
index 9196e4e..9c451c6 100644
--- a/perl_lib/EPrints/DataObj/Subject.pm
+++ b/perl_lib/EPrints/DataObj/Subject.pm
@@ -952,8 +952,7 @@ sub render_description
 {
 	my( $self ) = @_;
 
-	# EPrints Services/sf2 2011-12-13 - render 'name_name' otherwise it will render 'name_name' and 'name_sortvalue'
-	return $self->render_value( "name_name" );
+	return $self->render_value( "name" );
 }
 
 
diff --git a/perl_lib/EPrints/MetaField/Multilang.pm b/perl_lib/EPrints/MetaField/Multilang.pm
index 311204d..05b845e 100644
--- a/perl_lib/EPrints/MetaField/Multilang.pm
+++ b/perl_lib/EPrints/MetaField/Multilang.pm
@@ -89,7 +89,8 @@ sub render_value
 	$value = $self->lang_value( undef, $value )
 		if $self->property( "multiple" );
 
-	if( @$f > 2 ) # value + lang
+    # always render sub_name
+	if( 0 && @$f > 2 ) # value + lang
 	{
 		return $self->render_single_value( $session, $value );
 	}
-- 
1.7.0.4


From c277b2c62f6fc3de9fcb80d32d990b1fd079f48e Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Wed, 15 Apr 2015 14:03:55 +0100
Subject: [PATCH 27/29] phrase change as now multilang field is default to the 1st sub-field. https://github.com/eprints/eprints/pull/306

---
 lib/citations/subject/edit.xml   |    2 +-
 lib/citations/subject/screen.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/citations/subject/edit.xml b/lib/citations/subject/edit.xml
index d0abe98..66a3f89 100644
--- a/lib/citations/subject/edit.xml
+++ b/lib/citations/subject/edit.xml
@@ -7,7 +7,7 @@
 <cite:citation xmlns="http://www.w3.org/1999/xhtml" xmlns:cite="http://eprints.org/ep3/citation" xmlns:epc="http://eprints.org/ep3/control">
 
 <cite:linkhere><epc:choose>
-  <epc:when test="is_set(name_name)"><epc:print expr="name_name"/></epc:when> 
+  <epc:when test="is_set(name)"><epc:print expr="name"/></epc:when> 
   <epc:otherwise>Untitled subject #<epc:print expr="subjectid"/></epc:otherwise>
 </epc:choose></cite:linkhere>
 
diff --git a/lib/citations/subject/screen.xml b/lib/citations/subject/screen.xml
index 8a8bad3..ae37860 100644
--- a/lib/citations/subject/screen.xml
+++ b/lib/citations/subject/screen.xml
@@ -7,7 +7,7 @@
 <cite:citation xmlns="http://www.w3.org/1999/xhtml" xmlns:cite="http://eprints.org/ep3/citation" xmlns:epc="http://eprints.org/ep3/control">
 
 <cite:linkhere><epc:choose>
-  <epc:when test="name_name"><epc:print expr="name_name"/></epc:when> 
+  <epc:when test="name"><epc:print expr="name"/></epc:when> 
   <epc:otherwise>Untitled subject #<epc:print expr="subjectid"/></epc:otherwise>
 </epc:choose></cite:linkhere>
 
-- 
1.7.0.4


From 22a197c6157551c994a119c4ee9cbad73d1feb92 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Wed, 15 Apr 2015 15:55:52 +0100
Subject: [PATCH 28/29] Multilang field: always render the 1st sub_field's sub_name. Override this render_value if you need something different to be rendered.

---
 perl_lib/EPrints/MetaField/Multilang.pm |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/perl_lib/EPrints/MetaField/Multilang.pm b/perl_lib/EPrints/MetaField/Multilang.pm
index 05b845e..546227b 100644
--- a/perl_lib/EPrints/MetaField/Multilang.pm
+++ b/perl_lib/EPrints/MetaField/Multilang.pm
@@ -89,16 +89,9 @@ sub render_value
 	$value = $self->lang_value( undef, $value )
 		if $self->property( "multiple" );
 
-    # always render sub_name
-	if( 0 && @$f > 2 ) # value + lang
-	{
-		return $self->render_single_value( $session, $value );
-	}
-	else
-	{
-		$value = $value->{$f->[0]->property( "sub_name" )};
-		return $f->[0]->render_single_value( $session, $value );
-	}
+    	# always render the 1st sub_field's sub_name. Override this render_value if you need something different to be rendered. 
+	$value = $value->{$f->[0]->property( "sub_name" )};
+	return $f->[0]->render_single_value( $session, $value );
 }
 
 sub value_to_langhash
-- 
1.7.0.4


From 2c9528bd520ff58a1c82314363e46f3a8d33a632 Mon Sep 17 00:00:00 2001
From: Jiadi Yao <jy2e08@ecs.soton.ac.uk>
Date: Thu, 16 Apr 2015 11:21:23 +0100
Subject: [PATCH 29/29] 3.3.14

---
 debian/files        |    2 +-
 perl_lib/EPrints.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/files b/debian/files
index 313ab4a..a5b029a 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-eprints_3.3.13_all.deb web extra
+eprints_3.3.14_all.deb web extra
diff --git a/perl_lib/EPrints.pm b/perl_lib/EPrints.pm
index 40f7832..9b21772 100644
--- a/perl_lib/EPrints.pm
+++ b/perl_lib/EPrints.pm
@@ -102,7 +102,7 @@ use Carp;
 
 use strict;
 
-our $VERSION = v3.3.13;
+our $VERSION = v3.3.14;
 $conf->{version} = "EPrints ".EPrints->human_version;
 $conf->{versionid} = "eprints-".EPrints->human_version;
 
-- 
1.7.0.4

--- a/VERSION	2015-04-24 13:00:51.035781698 +0100
+++ b/VERSION	2015-04-24 13:32:59.103778986 +0100
@@ -1 +1 @@
-3.3.13
+3.3.14