[dryad] r5320 committed - fix RSS/Atom feeds to use canonical DOI link.
dr...@googlecode.com
Author: fabio.bolognesi75
Date: Fri Mar 2 14:16:32 2012
Log: fix RSS/Atom feeds to use canonical DOI link.
http://code.google.com/p/dryad/source/detail?r=5320
Modified:
/trunk/dryad/dspace/modules/api/src/main/java/org/dspace/app/util/SyndicationFeed.java
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/CocoonForwardController.java
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java
=======================================
---
/trunk/dryad/dspace/modules/api/src/main/java/org/dspace/app/util/SyndicationFeed.java
Fri Mar 2 13:37:04 2012
+++
/trunk/dryad/dspace/modules/api/src/main/java/org/dspace/app/util/SyndicationFeed.java
Fri Mar 2 14:16:32 2012
@@ -198,6 +198,13 @@
// add entries for items
if (items != null)
{
+
+ //http://dx.doi.org
+ String host = ConfigurationManager.getProperty("doi.hostname");
+
+ boolean localResolveeEnabled =
ConfigurationManager.getBooleanProperty("webui.feed.localresolve", false);
+ String dspaceURL =
ConfigurationManager.getProperty("dspace.url");
+
List<SyndEntry> entries = new ArrayList<SyndEntry>();
for (DSpaceObject itemDSO : items)
{
@@ -211,9 +218,38 @@
entries.add(entry);
String entryURL = resolveURL(request, item);
- entry.setLink(entryURL);
- entry.setUri(entryURL);
-
+
+ DCValue[] values = item.getMetadata("dc.identifier");
+ if(values!=null && values.length > 0){
+ // doi:10.5061/dryad.4q34p37b
+ String id = values[0].value;
+
+ // resource
+ if(localResolveeEnabled){
+ //
http://localhost:8100/resource/doi:10.5061/dryad.k3n80
+ entry.setLink(dspaceURL + "/resource/" + id);
+ entry.setUri(dspaceURL + "/resource/" + id);
+
+ }
+ // dx.doi.org
+ else{
+ // http://dx.doi.org/10.5061/dryad.j35f6.3
+ entry.setLink(host + "/" + id.replace("doi:", ""));
+ entry.setUri(host + "/" +id.replace("doi:", ""));
+ }
+ }
+ // hdl.handle.net
+ else{
+ // http://hdl.handle.net/10255/dryad.36287
+ entry.setLink(entryURL);
+ entry.setUri(entryURL);
+ }
+
+
+
+
+
+
String title = getOneDC(item, titleField);
entry.setTitle(title == null ? localize(labels,
MSG_UNTITLED) : title);
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java
Wed Feb 29 13:47:08 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java
Fri Mar 2 14:16:32 2012
@@ -168,7 +168,7 @@
*/
public SourceValidity getValidity() {
- log.warn("DSpaceFeedGenerator - getValidity() !!!!!");
+ log.debug("DSpaceFeedGenerator - getValidity() !!!!!");
if (this.validity == null) {
try {
@@ -205,7 +205,7 @@
* Setup component wide configuration
*/
public void configure(Configuration conf) throws
ConfigurationException {
- log.warn("DSpaceFeedGenerator - configure() !!!!!");
+ log.debug("DSpaceFeedGenerator - configure() !!!!!");
}
@@ -227,7 +227,7 @@
*/
public void generate() throws IOException, SAXException,
ProcessingException {
- log.warn("DSpaceFeedGenerator - generate() !!!!!");
+ log.debug("DSpaceFeedGenerator - generate() !!!!!");
try {
Context context = ContextUtil.obtainContext(objectModel);
@@ -249,7 +249,7 @@
SyndicationFeed feed = new
SyndicationFeed(SyndicationFeed.UITYPE_XMLUI);
- log.warn("generate() !!!!!! : calling
getRecentlySubmittedItemsUsingDiscovery(context, dso);");
+ log.debug("generate() !!!!!! : calling
getRecentlySubmittedItemsUsingDiscovery(context, dso);");
feed.populate(ObjectModelHelper.getRequest(objectModel), dso,
getRecentlySubmittedItemsUsingDiscovery(context, dso),
FeedUtils.i18nLabels);
feed.setType(this.format);
@@ -273,14 +273,14 @@
private Item[] getRecentlySubmittedItems(Context context, DSpaceObject
dso)
throws SQLException {
- log.warn("getRecentlySubmittedItems() !!!!!! :
recentSubmissionItems ==>> " + recentSubmissionItems);
+ log.debug("getRecentlySubmittedItems() !!!!!! :
recentSubmissionItems ==>> " + recentSubmissionItems);
if (recentSubmissionItems != null) {
return recentSubmissionItems;
}
- log.warn("getRecentlySubmittedItems() !!!!!! : calling
getRecentlySubmittedItemsUsingDiscovery(context, dso);");
+ log.debug("getRecentlySubmittedItems() !!!!!! : calling
getRecentlySubmittedItemsUsingDiscovery(context, dso);");
return getRecentlySubmittedItemsUsingDiscovery(context, dso);
}
@@ -319,17 +319,17 @@
private Item[] getRecentlySubmittedItemsUsingDiscovery(Context
context, DSpaceObject dso) throws SQLException {
- log.warn("getRecentlySubmittedItemsUsingDiscovery(Context context,
DSpaceObject dso)!!!!! ");
+ log.debug("getRecentlySubmittedItemsUsingDiscovery(Context
context, DSpaceObject dso)!!!!! ");
QueryResponse queryResults = performSearch(context, dso);
- log.warn("getRecentlySubmittedItemsUsingDiscovery(Context context,
DSpaceObject dso) - queryResults: " + queryResults);
+ log.debug("getRecentlySubmittedItemsUsingDiscovery(Context
context, DSpaceObject dso) - queryResults: " + queryResults);
Item[] items = new Item[queryResults.getResults().size()];
int index = 0;
- log.warn("getRecentlySubmittedItemsUsingDiscovery(Context context,
DSpaceObject dso) - items: " + items.length);
+ log.debug("getRecentlySubmittedItemsUsingDiscovery(Context
context, DSpaceObject dso) - items: " + items.length);
for (SolrDocument doc : queryResults.getResults()) {
@@ -341,7 +341,7 @@
// test scope.
- printfoundItems(items);
+ //printfoundItems(items);
List<Item> result = new ArrayList<Item>();
@@ -370,7 +370,7 @@
}
// test scope.
- printfoundItems(items);
+ //printfoundItems(items);
return items;
}
@@ -409,13 +409,13 @@
private String getView(DSpaceObject dso) {
// if (dso instanceof Collection) {
-// log.warn("getView(). return: collection");
+// log.debug("getView(). return: collection");
// return "collection";
// } else if (dso instanceof Community) {
-// log.warn("getView(). return: community");
+// log.debug("getView(). return: community");
// return "community";
// }
-// log.warn("getView(). return: site");
+// log.debug("getView(). return: site");
return "site";
}
@@ -434,7 +434,7 @@
if (values != null && values.length > 0)
title = values[0].value;
- log.warn("item " + item.getID() + ": " + id + " - " + title);
+ log.debug("item " + item.getID() + ": " + id + " - " + title);
}
}
@@ -462,11 +462,11 @@
// */
// public DSpaceValidity complete() {
//
-// log.warn("DSpaceFeedGenerator - complete() !!!!!");
+// log.debug("DSpaceFeedGenerator - complete() !!!!!");
//
// this.expires = System.currentTimeMillis() + CACHE_AGE;
//
-// log.warn("DSpaceFeedGenerator - complete(). this.expires: "
+ this.expires);
+// log.debug("DSpaceFeedGenerator - complete(). this.expires: "
+ this.expires);
//
// return super.complete();
// }
@@ -477,25 +477,25 @@
// */
// public int isValid() {
//
-// log.warn("DSpaceFeedGenerator - isValid(). this.completed: "
+ this.completed);
+// log.debug("DSpaceFeedGenerator - isValid().
this.completed: " + this.completed);
//
// // Return true if we have a hash.
// if (this.completed) {
-// log.warn("DSpaceFeedGenerator -
System.currentTimeMillis(): " + System.currentTimeMillis());
-// log.warn("DSpaceFeedGenerator - this.expires: " +
this.expires);
+// log.debug("DSpaceFeedGenerator -
System.currentTimeMillis(): " + System.currentTimeMillis());
+// log.debug("DSpaceFeedGenerator - this.expires: " +
this.expires);
// if (System.currentTimeMillis() < this.expires) {
// // If the cache hasn't expired the just assume that
it is still valid.
-// log.warn("DSpaceFeedGenerator -
SourceValidity.VALID !!!!!");
+// log.debug("DSpaceFeedGenerator -
SourceValidity.VALID !!!!!");
// return SourceValidity.VALID;
// } else {
// // The cache is past its age
-// log.warn("DSpaceFeedGenerator -
SourceValidity.UNKNOWN !!!!!");
+// log.debug("DSpaceFeedGenerator -
SourceValidity.UNKNOWN !!!!!");
// return SourceValidity.UNKNOWN;
// }
// } else {
// // This is an error, state. We are being asked whether
we are valid before
// // we have been initialized.
-// log.warn("DSpaceFeedGenerator -
SourceValidity.INVALID !!!!!");
+// log.debug("DSpaceFeedGenerator -
SourceValidity.INVALID !!!!!");
// return SourceValidity.INVALID;
// }
// }
@@ -507,7 +507,7 @@
// * @param otherValidity The other validity object.
// */
// public int isValid(SourceValidity otherValidity) {
-// log.warn("DSpaceFeedGenerator - (SourceValidity
otherValidity)");
+// log.debug("DSpaceFeedGenerator - (SourceValidity
otherValidity)");
//
// if (this.completed && otherValidity instanceof FeedValidity)
{
// FeedValidity other = (FeedValidity) otherValidity;
@@ -516,11 +516,11 @@
// this.expires = System.currentTimeMillis() +
CACHE_AGE;
// other.expires = System.currentTimeMillis() +
CACHE_AGE;
//
-// log.warn("DSpaceFeedGenerator -
SourceValidity.VALID !!!!!");
+// log.debug("DSpaceFeedGenerator -
SourceValidity.VALID !!!!!");
// return SourceValidity.VALID;
// }
// }
-// log.warn("DSpaceFeedGenerator -
SourceValidity.INVALID !!!!!");
+// log.debug("DSpaceFeedGenerator -
SourceValidity.INVALID !!!!!");
// return SourceValidity.INVALID;
// }
//
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/CocoonForwardController.java
Thu Mar 1 13:27:12 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/CocoonForwardController.java
Fri Mar 2 14:16:32 2012
@@ -34,7 +34,7 @@
@RequestMapping
public ModelAndView forwardRequest(HttpServletRequest request,
HttpServletResponse response) throws SQLException {
- log.warn("CocoonForwardController!!!!!");
+ log.debug("CocoonForwardController!!!!!");
return new ModelAndView(new CocoonView());
}
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java
Fri Mar 2 12:32:09 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java
Fri Mar 2 14:16:32 2012
@@ -40,7 +40,7 @@
PrintWriter writer = null;
try {
- log.warn("Inside Spring Controller!!! ");
+ log.debug("Inside Spring Controller!!! ");
writer = response.getWriter();
Minter myMinter = new Minter();