[Gug-cvs] gug/gug/common jsdl_parser.py,1.12,1.13

[Roczei G. <ro...@us...>]

Update of /cvsroot/gug/gug/gug/common
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv777

Modified Files:
	jsdl_parser.py 
Log Message:
directory structure correction



Index: jsdl_parser.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/common/jsdl_parser.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** jsdl_parser.py	30 Apr 2007 20:22:16 -0000	1.12
--- jsdl_parser.py	30 Apr 2007 22:02:58 -0000	1.13
***************
*** 36,40 ****
          print "%s" % SupportedFeatures[item]
  
! applicationtype_list = ['Compiler', 'BatchCompiler', 'Batch', 'Binary', 'PVM', 'MPI']
  
  applicationtype_list = [ str(a).upper() for a in applicationtype_list]
--- 36,40 ----
          print "%s" % SupportedFeatures[item]
  
! applicationtype_list = ['Compiler', 'BatchCompiler', 'Batch', 'Binary', 'PVM', 'MPI', 'seq']
  
  applicationtype_list = [ str(a).upper() for a in applicationtype_list]
***************
*** 69,73 ****
          raise UnsupportedFeatureFault, "Connection error: %s" % host
  
! def create_jsdl_from_desc(desc, staging_data = None, directory_structure = True):
          """
  
--- 69,73 ----
          raise UnsupportedFeatureFault, "Connection error: %s" % host
  
! def create_jsdl_from_desc(desc, staging_data = None):
          """
  
***************
*** 104,113 ****
              """ % (desc['name'], desc.get('description','No description.'), desc.get('jobproject','gug'))
              
-             if directory_structure:
-                 desc['executable'] = 'bin/' + desc['executable']
-                 desc['input'] = 'input/' + desc.get('input', 'stdin.txt')
-                 desc['output'] = 'output/' + desc.get('output', 'stdout.txt')
-                 desc['error'] = 'output/' + desc.get('error', 'stderr.txt')
-             
              jsdldoc += """
              <jsdl:Application>
--- 104,107 ----
***************
*** 249,253 ****
  
  
! def create_desc_from_jsdl(jsdl_str, directory_structure = True): 
      """
          Standards:
--- 243,247 ----
  
  
! def create_desc_from_jsdl(jsdl_str): 
      """
          Standards: