hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore IdentifierUtils after merge.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2756 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
2008-02-28 15:49:54 +00:00
parent 4625ae2195
commit a88c11eaca
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
View File

@@ -59,6 +59,7 @@ import org.dspace.app.xmlui.utils.DSpaceValidity;
import org.dspace.app.xmlui.utils.HandleUtil; import org.dspace.app.xmlui.utils.HandleUtil;
import org.dspace.app.xmlui.utils.RequestUtils; import org.dspace.app.xmlui.utils.RequestUtils;
import org.dspace.app.xmlui.utils.UIException; import org.dspace.app.xmlui.utils.UIException;
import org.dspace.app.xmlui.utils.URIUtil;
import org.dspace.app.xmlui.wing.Message; import org.dspace.app.xmlui.wing.Message;
import org.dspace.app.xmlui.wing.WingException; import org.dspace.app.xmlui.wing.WingException;
import org.dspace.app.xmlui.wing.element.Body; import org.dspace.app.xmlui.wing.element.Body;
@@ -86,6 +87,7 @@ import org.dspace.content.DCDate;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.core.ConfigurationManager; import org.dspace.core.ConfigurationManager;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.uri.IdentifierService;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
@@ -172,9 +174,9 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
if (key != null) if (key != null)
{ {
DSpaceObject dso = HandleUtil.obtainHandle(objectModel); DSpaceObject dso = URIUtil.resolve(objectModel);
if (dso != null) if (dso != null)
key += "-" + dso.getHandle(); key += "-" + IdentifierService.getCanonicalForm(dso);
return HashUtil.hash(key); return HashUtil.hash(key);
} }
@@ -194,7 +196,7 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
try try
{ {
DSpaceValidity validity = new DSpaceValidity(); DSpaceValidity validity = new DSpaceValidity();
DSpaceObject dso = HandleUtil.obtainHandle(objectModel); DSpaceObject dso = URIUtil.resolve(objectModel);
if (dso != null) if (dso != null)
validity.add(dso); validity.add(dso);
@@ -242,7 +244,7 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
pageMeta.addMetadata("title").addContent(getTitleMessage(info)); pageMeta.addMetadata("title").addContent(getTitleMessage(info));
DSpaceObject dso = HandleUtil.obtainHandle(objectModel); DSpaceObject dso = URIUtil.resolve(objectModel);
pageMeta.addTrailLink(contextPath + "/", T_dspace_home); pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
if (dso != null) if (dso != null)
@@ -597,7 +599,7 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
params.scope = new BrowserScope(context); params.scope = new BrowserScope(context);
// Are we in a community or collection? // Are we in a community or collection?
DSpaceObject dso = HandleUtil.obtainHandle(objectModel); DSpaceObject dso = URIUtil.resolve(objectModel);
if (dso instanceof Community) if (dso instanceof Community)
params.scope.setCommunity((Community) dso); params.scope.setCommunity((Community) dso);
if (dso instanceof Collection) if (dso instanceof Collection)