[dryad] r5318 committed - Re-enabling doi?lookup

[dr...@googlecode.com]

Revision: 5318
Author: fabio.bolognesi75
Date: Fri Mar 2 12:32:09 2012
Log: Re-enabling doi?lookup
http://code.google.com/p/dryad/source/detail?r=5318

Modified:

/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java

=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java
Fri Mar 2 09:17:02 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/springmvc/DoiController.java
Fri Mar 2 12:32:09 2012
@@ -1,8 +1,15 @@
package org.dspace.springmvc;

+import org.dspace.content.DCValue;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.core.ConfigurationManager;
+import org.dspace.core.Context;
import org.dspace.doi.DOI;
import org.dspace.doi.Minter;
+import org.dspace.identifier.DOIIdentifierProvider;
+import org.dspace.utils.DSpace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -41,40 +48,43 @@
DOI doi = myMinter.getKnownDOI(doiID);
if(doi != null){

- //return handle: http://datadryad.org/handle/10255/dryad.20
- writer.println(doi.getInternalIdentifier().toString());
-
+
if(doi.getInternalIdentifier().toString().contains("handle")){
+ //return handle:
http://datadryad.org/handle/10255/dryad.20
+ writer.println(doi.getInternalIdentifier().toString());
+ }
+ else{
+ Context context = new Context();
+ context.turnOffAuthorisationSystem();
+ DOIIdentifierProvider dis = new
DSpace().getSingletonService(DOIIdentifierProvider.class);
+ Item item = (Item)dis.resolve(context, doi.toString());
+
+ DCValue[] uris = item.getMetadata("dc.identifier.uri");
+ if(uris!=null && uris.length > 0){
+
+ String canonicalPrefix =
ConfigurationManager.getProperty("handle.canonical.prefix");
+ String dryadURL =
ConfigurationManager.getProperty("dryad.url");
+
+ String uri = uris[0].value;
+
+ // dryad.url = http://datadryad.org
+ // handle.canonical.prefix = http://hdl.handle.net/
+ uri = uri.replace(canonicalPrefix, dryadURL
+ "/handle/");
+ writer.println(uri);
+ }
+ else{
+ writer.println("DOI not present.");
+ }
+ }
// return resource:
http://localhost:8100/resource/doi:10.5061/dryad.20
- //writer.println(doi.getTargetURL().toString());
- }
- else{
- writer.println("DOI not present.");
- }
-
- } catch (Exception e) {
- writer.println("DOI not present.");
- }finally{
- writer.close();
- }
-
- }
+ // writer.println(doi.getTargetURL().toString());
+
+

- @RequestMapping("/doi/**")
- public void doiLookup_(HttpServletRequest request, HttpServletResponse
response) {
- PrintWriter writer = null;
- try {
- writer = response.getWriter();
- Minter myMinter = new Minter();
- String doiID = request.getParameter("lookup");
- DOI doi = myMinter.getKnownDOI(doiID);
- if(doi != null){
-
- // return handle:
http://datadryad.org/handle/10255/dryad.20
- //writer.println(doi.getInternalIdentifier().toString());
-
- // return resource:
http://localhost:8100/resource/doi:10.5061/dryad.20
- writer.println(doi.getTargetURL().toString());
+
+
+
+
}
else{
writer.println("DOI not present.");
@@ -87,4 +97,7 @@
}

}
-}
+
+
+
+}