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

SF Patch #1597807 for SF bug #1597805 DIDL Crosswalk: wrong resource management

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@1683 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Scott Yeadon
2006-11-22 05:02:27 +00:00
parent 595b302c03
commit e7914be81d
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace/CHANGES
View File

@@ -1,3 +1,6 @@
(Andrea Bollini)
- SF Patch #1597807 for SF bug #1597805 DIDL Crosswalk: wrong resource management
(Claudia Juergen) (Claudia Juergen)
- SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen - SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen

37
dspace/src/org/dspace/app/oai/DIDLCrosswalk.java
View File

@@ -204,20 +204,24 @@ public class DIDLCrosswalk extends Crosswalk
} }
metadata.append("<didl:Component id=" + "\"uuid-"+ UUIDFactory.generateUUID().toString() + "\">"); metadata.append("<didl:Component id=" + "\"uuid-"+ UUIDFactory.generateUUID().toString() + "\">");
metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
metadata.append("\" mimeType=\""); if (bitstreams[k].getSize()> maxsize)
metadata.append(bitstreams[k].getFormat().getMIMEType()); {
metadata.append("\">"); metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
metadata.append("</didl:Resource>"); metadata.append("\" mimeType=\"");
metadata.append(bitstreams[k].getFormat().getMIMEType());
if (bitstreams[k].getSize()< maxsize) metadata.append("\">");
{ metadata.append("</didl:Resource>");
metadata.append("<didl:Resource mimeType=\""); }
metadata.append(bitstreams[k].getFormat().getMIMEType()); else
metadata.append("\" encoding=\"base64\">"); {
try try
{ {
metadata.append("<didl:Resource mimeType=\"");
metadata.append(bitstreams[k].getFormat().getMIMEType());
metadata.append("\" encoding=\"base64\">");
/* /*
* Assume that size of in-line bitstreams will always be * Assume that size of in-line bitstreams will always be
* smaller than MAXINT bytes * smaller than MAXINT bytes
@@ -237,9 +241,12 @@ public class DIDLCrosswalk extends Crosswalk
} }
catch (Exception ex) catch (Exception ex)
{ {
System.err.println("Caught exception:"+ex.getCause()); ex.printStackTrace();
ex.printStackTrace();
metadata.append("http://retrieve/"+ new Integer(bitstreams[k].getID()).toString() +"bitstream=" + k +"/" ); metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
metadata.append("\" mimeType=\"");
metadata.append(bitstreams[k].getFormat().getMIMEType());
metadata.append("\">");
} }
metadata.append("</didl:Resource>"); metadata.append("</didl:Resource>");