[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http BulkUploadUtil.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
In directory james.mmbase.org:/tmp/cvs-serv14727

Modified Files:
        BulkUploadUtil.java 
Log Message:
CMSC-681  Asset -Workflow bulk upload


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: BulkUploadUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- BulkUploadUtil.java 21 Nov 2008 02:33:00 -0000      1.12
+++ BulkUploadUtil.java 2 Dec 2008 08:43:11 -0000       1.13
@@ -101,15 +101,11 @@
    }
 
    public static List<Integer> store(Cloud cloud, NodeManager manager, String 
parentchannel, FormFile file) {
-      ArrayList<Integer> nodes = new ArrayList<Integer>();
+      List<Integer> nodes ;
       if (StringUtils.isEmpty(parentchannel)) {
          throw new NullPointerException("parentchannel is null");
       }
-      Node node = getNode(Integer.valueOf(parentchannel), manager, file);
-
-      if (node != null) {
-         nodes.add(node.getNumber());
-      }
+      nodes = getNodeList(Integer.valueOf(parentchannel), manager, file);
       return nodes;
    }
 
@@ -162,21 +158,26 @@
       return node;
    }
 
-   private static Node getNode(Integer parentChannel, NodeManager manager, 
FormFile file) {
-      Node node = null;
+   private static List<Integer> getNodeList(Integer parentChannel, NodeManager 
manager, FormFile file) {
+      List<Integer> nodes = null;
       try {
          if (isZipFile(file)) {
             ZipInputStream zip = new ZipInputStream(new 
BufferedInputStream(new ByteArrayInputStream(file.getFileData())));
-            createNodesInZip(parentChannel, manager, zip);
+            nodes = createNodesInZip(parentChannel, manager, zip);
          } else {
-            createNode(parentChannel, manager, file.getFileName(), 
file.getInputStream(), file.getFileSize());
+
+            Node node = createNode(parentChannel, manager, file.getFileName(), 
file.getInputStream(), file.getFileSize());
+            if(node!=null){
+               nodes = new ArrayList<Integer>();
+               nodes.add(node.getNumber());
+            }
          }
       } catch (Exception ex) {
          log.error("Failed to read uploaded file", ex);
       } finally {
          file.destroy();
       }
-      return node;
+      return nodes;
    }
 
    private static ArrayList<Integer> createNodesInZip(NodeManager manager, 
ZipInputStream zip) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs