changeset 3:d25397969a4c draft default tip

Uploaded
author iuc
date Mon, 28 Jul 2014 04:42:50 -0400
parents ed64ded866dd
children
files ipynb.py
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ipynb.py	Mon Jul 28 03:47:05 2014 -0400
+++ b/ipynb.py	Mon Jul 28 04:42:50 2014 -0400
@@ -1,13 +1,19 @@
 # -*- coding: utf-8 -*-
 
-from galaxy.datatypes.json_datatyp import Json as JsonClass
+#from galaxy.datatypes.json_datatyp import Json as JsonClass
+from galaxy.datatypes.data import Text
 from galaxy.datatypes.data import get_file_peek
+from galaxy import util
 import subprocess
 import tempfile
+import logging
 import json
 import os
 
-class Ipynb( JsonClass ):
+log = logging.getLogger(__name__)
+
+#class Ipynb( JsonClass ):
+class Ipynb( Text ):
     file_ext = "ipynb"
 
     def set_peek( self, dataset, is_multi_byte=False ):
@@ -39,22 +45,16 @@
             return self._serve_raw(trans, dataset, to_ext)
         else:
             ofile_handle = tempfile.NamedTemporaryFile(delete=False)
-            ofilename = file_handle.name
+            ofilename = ofile_handle.name
             ofile_handle.close()
             try:
-                cmd = 'ipython nbconvert --to html --template basic %s %s' % (dataset.file_name, ofilename)
-                subprocess.call(cmd)
+                cmd = 'ipython nbconvert --to html --template basic %s --output %s' % (dataset.file_name, ofilename)
+                subprocess.call(cmd, shell=True)
                 ofilename = '%s.html' % ofilename
             except:
                 ofilename = dataset.file_name
                 log.exception( 'Command "%s" failed. Could not convert the IPython Notebook to HTML, defaulting to plain text.' % cmd )
             return open( ofilename )
-            """return trans.fill_template( "/dataset/tabular_chunked.mako",
-                        dataset = dataset,
-                        chunk = self.get_chunk(trans, dataset, 0),
-                        column_number = column_number,
-                        column_names = column_names,
-                        column_types = column_types )"""
 
     def set_meta( self, dataset, **kwd ):
         """