# HG changeset patch
# User nml
# Date 1463504094 14400
# Node ID a78a70d4806c0235a6540a91cc10ccfdf9bcb359
# Parent  49bd84e136c781fa9e9fd6f676e2b397b0cf7a4f
planemo upload commit b8a959738e856ac80cb2d58423f455337cdd4853

diff -r 49bd84e136c7 -r a78a70d4806c first
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/first	Tue May 17 12:54:54 2016 -0400
@@ -0,0 +1,1 @@
+1
\ No newline at end of file
diff -r 49bd84e136c7 -r a78a70d4806c merge.xml
--- a/merge.xml	Thu Dec 10 12:30:50 2015 -0500
+++ b/merge.xml	Tue May 17 12:54:54 2016 -0400
@@ -1,12 +1,38 @@
-<tool id="collapse_dataset" name="Collapse Collection" version="1.0">
+<tool id="collapse_dataset" name="Collapse Collection" version="2.0">
   <description>Collapse collection into single dataset in order of the collection</description>
   <command>
-    cat 
-    #for $f in $input_list# $f #end for#
+    <![CDATA[
+
+     (
+    #for $f in $input_list#
+    #if $filename.add_name:
+       #if str($filename.place_name) ==  "same":
+           printf "$f.name\t" ;
+       #else
+           printf "$f.name\n" ;
+       #end if
+    #end if
+    cat "$f" ;
+    #end for#
+    )
     > $output
+
+    ]]>
+    
   </command>
   <inputs>
      <param name="input_list" type="data_collection" label="Collection of files to collapse into single dataset" help="" optional="false" collection_type="list" />
+     <conditional name="filename">
+     <param name="add_name" type="boolean" display="checkboxes" label="Append File name"/>
+     <when value="true">
+       <param name="place_name" type="select" label="Where to add dataset name">
+         <option value="same">Same line</option>
+         <option value="above">Line Above</option>
+       </param>
+     </when>
+     <when value='false'>
+     </when>
+     </conditional>
   </inputs>
   <outputs>
     <data name="output" format_source="input_list" ></data>
@@ -23,7 +49,9 @@
 	</test>
   </tests>
   <help>
-	Single tool that combines a list collection into a single file
+	Combines a list collection into a single file dataset with option to include dataset names.
+        
+        
   </help>
   <citations>
   </citations>
diff -r 49bd84e136c7 -r a78a70d4806c second
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/second	Tue May 17 12:54:54 2016 -0400
@@ -0,0 +1,1 @@
+2
\ No newline at end of file
diff -r 49bd84e136c7 -r a78a70d4806c third
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third	Tue May 17 12:54:54 2016 -0400
@@ -0,0 +1,1 @@
+3
\ No newline at end of file