svn commit: r599012 - in /lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron: jx/meta.jx neutron.js

Author: jann
Date: Wed Nov 28 06:32:37 2007
New Revision: 599012

URL: http://svn.apache.org/viewvc?rev=599012&view=rev
Log:
Applying patch http://issues.apache.org/bugzilla/show_bug.cgi?id=43961. Thanks to Thomas Comiotto

Modified:
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/jx/meta.jx
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/jx/meta.jx
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/jx/meta.jx?rev=599012&r1=599011&r2=599012&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/jx/meta.jx (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/jx/meta.jx Wed Nov 28 06:32:37 2007
@@ -1,19 +1,25 @@
-<?xml version="1.0"?>
-<dc:metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <dc:title>${title}</dc:title>
-  <dc:type></dc:type>
-  <dc:rights>All rights reserved.</dc:rights>
-  <dc:publisher></dc:publisher>
-  <dc:date></dc:date>
-  <dc:language></dc:language>
-  <dc:creator>${creator}</dc:creator>
-  <dc:coverage></dc:coverage>
-  <dc:description></dc:description>
-  <dc:extent></dc:extent>
-  <dc:identifier></dc:identifier>
-  <dc:subject></dc:subject>
-  <dc:relation></dc:relation>
-  <dc:contributor></dc:contributor>
-  <dc:source></dc:source>
-  <dc:format>${mimeType}</dc:format>
-</dc:metadata>
+<?xml version="1.0"?>
+<dc:metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <dc:title>${title}</dc:title>
+  <dc:type></dc:type>
+  <dc:rights>All rights reserved.</dc:rights>
+  <dc:publisher></dc:publisher>
+  <dc:date></dc:date>
+  <dc:language></dc:language>
+  <dc:creator>${creator}</dc:creator>
+  <dc:coverage></dc:coverage>
+  <dc:description></dc:description>
+  <dc:extent></dc:extent>
+  <dc:identifier></dc:identifier>
+  <dc:subject></dc:subject>
+  <dc:relation></dc:relation>
+  <dc:contributor></dc:contributor>
+  <dc:source></dc:source>
+  <dc:format>${mimeType}</dc:format>
+  <jx:if test="${dimensions}">
+    <lenya:meta xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+      <lenya:width>${dimensions.width}</lenya:width>
+      <lenya:height>${dimensions.height}</lenya:height>
+    </lenya:meta>
+  </jx:if>
+</dc:metadata>

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js?rev=599012&r1=599011&r2=599012&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js Wed Nov 28 06:32:37 2007
@@ -205,6 +205,11 @@
   var rights = cocoon.request.get("rights");
   var mimeType = cocoon.request.get("mimeType");
 
+  var width = cocoon.request.get("width");
+  var height = cocoon.request.get("height");  
+
+  cocoon.log.error("Width, height: " + width + ", " + height);   
+
   if (!uploadFile) {
     cocoon.sendStatus(403);
     return;
@@ -216,6 +221,7 @@
   var document = flowHelper.getPageEnvelope(cocoon).getDocument();
   var file = uploadHelper.save(cocoon.request, "upload-file"); 
   var fileName = file.getName();
+  var extent = file.length(); 
 
   var resolver = cocoon.getComponent(Packages.org.apache.excalibur.source.SourceResolver.ROLE);
   var resourcesManager = new ResourcesManager(document);
@@ -240,14 +246,25 @@
     os.close();
   }
 
+  // remove tmp file 
+  try {
+    file["delete"](); 
+  } catch(e) {}
+
 
   var metaFilePath = resolver.resolveURI(assetPath + ".meta");
   var metaOs = metaFilePath.getOutputStream();
 
-  cocoon.processPipelineTo("createmetadata", {"mimeType" : mimeType, "title" : title, "creator": creator}, metaOs);
+  if (width && height) {
+    var dimensions = new Object(); 
+    dimensions.width = width; 
+    dimensions.height = height; 
+    cocoon.processPipelineTo("createmetadata", {"mimeType" : mimeType, "extent" : extent, "title" : title, "creator": creator, "dimensions": dimensions }, metaOs);
+  } else {
+    cocoon.processPipelineTo("createmetadata", {"mimeType" : mimeType, "extent" : extent, "title" : title, "creator": creator }, metaOs);
+  }
 
   metaOs.close();
-
 
   var assetFile = new File(assetPath);