Tidying up X-datastream content grabbing

fcrepo4-archive · Jan 21, 2013 · bc5aadc · bc5aadc
1 parent 18bb92d
commit bc5aadc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraDatastreams.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraDatastreams.java
@@ -185,7 +185,7 @@ public Response getDatastreamContent(@PathParam("pid") final String pid,
 					.getProperty("fedora:contentType").getString()
 					: "application/octet-stream";
 			return Response.ok(
-					ds.getProperty("fedora:content").getBinary().getStream(),
+					ds.getNode("jcr:content").getProperty("jcr:data").getBinary().getStream(),
 					mimeType).build();
 		} else {
 			return four04;

diff --git a/src/main/scala/org/fcrepo/ffmodeshapeprototype/foxml/FOXMLParser.scala b/src/main/scala/org/fcrepo/ffmodeshapeprototype/foxml/FOXMLParser.scala
@@ -40,15 +40,16 @@ class FOXMLParser {
       //log.debug("Found datastream: " + datastream.toString)
       val dsId = (datastream \ "@ID").text
       val controlGroup = datastream \ "@CONTROL_GROUP" 
-      log.debug("Found control group: " + controlGroup) 
-      var latestVersion: InputStream = null
-      if (controlGroup == "X") {
-        latestVersion = new ByteArrayInputStream((datastream \\ "xmlContent").head.text.getBytes())
+      //log.debug("Found control group: " + controlGroup) 
+      var latestVersion: String = null
+      if (controlGroup.toString == "X") {
+        latestVersion = (datastream \\ "xmlContent" \ "_").head.toString
+        log.debug("Found content: \n" + latestVersion)
       } else {
         // insert placeholder
-    	  	latestVersion = new ByteArrayInputStream("PLACEHOLDER".getBytes())
+    	  	latestVersion = "PLACEHOLDER"
       }
-      val dsNode = jcrTools.uploadFile(objNode.getSession(), objNode.getPath() + "/" + dsId, latestVersion)
+      val dsNode = jcrTools.uploadFile(objNode.getSession(), objNode.getPath() + "/" + dsId, new ByteArrayInputStream(latestVersion.getBytes))
       dsNode.addMixin("fedora:datastream")
       dsNode.setProperty("fedora:contentType",
         (datastream \ "datastreamVersion").head \ "@MIMETYPE" text)