[DSpace-changelog] SF.net SVN: dspace: [2698] branches/dspace-1_5_x/dspace

[ScottP...@users.sourceforge.net]

Revision: 2698
http://dspace.svn.sourceforge.net/dspace/?rev=2698&view=rev
Author: ScottPhillips
Date: 2008-02-20 12:50:09 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
(Scott Phillips) SF#1895858 - unable to send feedback email.

Modified Paths:
--------------
branches/dspace-1_5_x/dspace/config/dspace.cfg
branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg 2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg 2008-02-20 20:50:09 UTC (rev 2698)
@@ -1013,6 +1013,10 @@
event.dispatcher.default.class = org.dspace.event.BasicDispatcher
event.dispatcher.default.consumers = search, browse, eperson

+# The noindex dispatcher will not create search or browse indexs (usefull for batch item imports)
+event.dispatcher.noindex.class = org.dspace.event.BasicDispatcher
+event.dispatcher.noindex.consumers = eperson
+
# consumer to maintain the search index
event.consumer.search.class = org.dspace.search.SearchConsumer
event.consumer.search.filters = Item|Collection|Community|Bundle+Create|Modify|Modify_Metadata|Delete:Bundle+Add|Remove

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java 2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java 2008-02-20 20:50:09 UTC (rev 2698)
@@ -48,6 +48,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.Calendar;
+import java.util.Locale;
import java.util.TimeZone;
import java.text.SimpleDateFormat;
import java.text.ParseException;
@@ -79,6 +80,7 @@
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
import org.dspace.core.LogManager;
import org.dspace.handle.HandleManager;
import org.dspace.sort.SortOption;
@@ -704,7 +706,7 @@
.getProperty("alert.recipient");

if (recipient != null) {
- Email email = ConfigurationManager.getEmail("internal_error");
+ Email email = ConfigurationManager.getEmail(I18nUtil.getEmailFilename(Locale.getDefault(), "internal_error"));
email.addRecipient(recipient);
email.addArgument(ConfigurationManager
.getProperty("dspace.url"));

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java 2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java 2008-02-20 20:50:09 UTC (rev 2698)
@@ -53,6 +53,7 @@
import org.dspace.core.ConfigurationManager;
import org.dspace.core.Context;
import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
import org.dspace.eperson.EPerson;

/**
@@ -108,7 +109,7 @@
}

// All data is there, send the email
- Email email = ConfigurationManager.getEmail("feedback");
+ Email email = ConfigurationManager.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(), "feedback"));
email.addRecipient(ConfigurationManager
.getProperty("feedback.recipient"));



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.