Changeset 208 for trunk

Timestamp:

01/15/10 14:50:17 (14 years ago)

Author:

bas

Message:

new generated pbs_wrap.c and pbs.py fixes an error in pbs_runjob()

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• debian/changelog (modified) (5 diffs)
• src/pbs.py (modified) (6 diffs)
• src/pbs_wrap.c (modified) (202 diffs)

trunk/CHANGES

@@ +1 @@
+=========== 3.6.0
+  * pbs, new generated pbs_wrap.c, pbs.py fixes a bug in pbs_runjob()
+    Reported by: Dennis Stam
+    Fixed by: Bas van der Vlies 
+
 =========== 3.5.0
   * PBSQuery

trunk/debian/changelog

@@ +1 @@
+pbs-python (3.6.0-1) lenny; urgency=low
+
+  * New generated files pbs_wrap.c and pbs.py fixes an error in pbs_runjob() 
+
+ -- root <root@gb-r31vn6.irc.sara.nl.irc.sara.nl>  Fri, 15 Jan 2010 04:40:35 +0100
+
 pbs-python (3.5.0-1) lenny; urgency=low
 
@@ -5 +11 @@
         structure.
 
-        Changed the behaviour of the new data stucture, We can use it as 
-        dictionary and as class attribute, this is equivalent, eg:
-          - print node['np'] and print node.np 
-
-        for a node we parse the 'status' line and split on '=' char, You now can 
-        use these statements, eg
-          - print node.status.arch     (node['status'].arch or node['status']['arch'])
-          - print node.status.nsession
-
-        for a job we parse the 'Variable_List' line and split on '=' char, You now can 
-        use the statements, eg:
-          - print job.Variable_List.PBS_O_WORKDIR
-          - print job.Variable_List.PBS_O_HOME
-
-        For more info see examples/new_interface.py
+    Changed the behaviour of the new data stucture, We can use it as 
+    dictionary and as class attribute, this is equivalent, eg:
+      - print node['np'] and print node.np 
+
+    for a node we parse the 'status' line and split on '=' char, You now can 
+    use these statements, eg
+     - print node.status.arch     (node['status'].arch or node['status']['arch'])
+     - print node.status.nsession
+
+    for a job we parse the 'Variable_List' line and split on '=' char, You now can 
+    use the statements, eg:
+     - print job.Variable_List.PBS_O_WORKDIR
+     - print job.Variable_List.PBS_O_HOME
+
+    for more info see examples/new_interface.py
 
     Author: Bas van der Vlies
 
- * new_rack_pbsmon.py
-        Rewrite to new data structure and automatically determine how many nodes
-        and racks cluster has and skip printing of empty racks (default), use -w/--wide
-        for old behaviour.
-        
-   Author: Bas van der Vlies
-
- -- Bas van der Vlies <bas@rc.sara.nl>  Mon, 12 Nov 2009 15:03:16 +0200
+  * new_rack_pbsmon.py
+    Rewrite to new data structure and automatically determine how many nodes
+    and racks cluster has and skip printing of empty racks (default), use -w/--wide
+    for old behaviour.
+
+    Author: Bas van der Vlies
+
+ -- Bas van der Vlies <bas@sara.nl>  Mon, 12 Nov 2009 15:03:16 +0200
 
 pbs-python (3.2.0-1) intrepid; urgency=low
 
   *  PBSQuery:
-         New data structure. In the old structure it is a dictionary
-         with a value and the value is a string. This is changed that
-         dictionary values are now of type list or dictionary depends
-         on the value of keyword, eg for a node:
-          - np = 2:
-                - node['np'] = [ '2' ]
-          - properties = cores2, mem4gb, parallel
-                - node['properties'] = [ 'cores2', 'mem4gb', 'parallel' ]
-          - status = arch=x86_64,sessions=22599,,size=70627864kb, ...
-                - node['status']['arch'] = [ 'x86_64' ]
-                - node['status']['sessions'] = [ '222599' ]
-                - ...
+     New data structure. In the old structure it is a dictionary
+     with a value and the value is a string. This is changed that
+     dictionary values are now of type list or dictionary depends
+     on the value of keyword, eg for a node:
+       - np = 2:
+       - node['np'] = [ '2' ]
+       - properties = cores2, mem4gb, parallel
+       - node['properties'] = [ 'cores2', 'mem4gb', 'parallel' ]
+       - status = arch=x86_64,sessions=22599,,size=70627864kb, ...
+       - node['status']['arch'] = [ 'x86_64' ]
+       - node['status']['sessions'] = [ '222599' ]
+       - ...
 
          The data structure is activated by the function:
@@ -53 +59 @@
          In a future release it will be come the default.
          example:
-                p = PBSQuery()
-                p.new_data_structure()
-
-                nodes = p.getnodes()
-                print nodes.np, nodes['np']
+         p = PBSQuery()
+         p.new_data_structure() 
+
+        nodes = p.getnodes()
+        print nodes.np, nodes['np']
 
          Author: Bas van der Vlies
@@ -63 +69 @@
   *  PBSQuery:
         For old and new data structure we now can use another syntax:
-         - node['np'] and node.np are equivalent
+     - node['np'] and node.np are equivalent
 
         This new syntax works for all keywords.
@@ -70 +76 @@
   *  PBSQuery:
         Added iter object for job, node, queue and server objects, eg:
-                node = p.getnode('gb-r1n1')
-                print node.name
-                for attrib in node:
-                        print '%\t%s = %s' %(attrib, node[attrib])
+        node = p.getnode('gb-r1n1')
+        print node.name
+        for attrib in node:
+           print '%\t%s = %s' %(attrib, node[attrib])
         Author: Bas van der Vlies
 

trunk/src/pbs.py

@@ -1 @@
-# This file was created automatically by SWIG 1.3.29.
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.36
+#
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -6 +8 @@
 import new
 new_instancemethod = new.instancemethod
+try:
+    _swig_property = property
+except NameError:
+    pass # Python < 2.2 doesn't have 'property'.
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
     if (name == "thisown"): return self.this.own(value)
@@ -268 +274 @@
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, attrl, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_setmethods__["name"] = _pbs.attrl_name_set
     __swig_getmethods__["name"] = _pbs.attrl_name_get
-    if _newclass:name = property(_pbs.attrl_name_get, _pbs.attrl_name_set)
+    if _newclass:name = _swig_property(_pbs.attrl_name_get, _pbs.attrl_name_set)
     __swig_setmethods__["resource"] = _pbs.attrl_resource_set
     __swig_getmethods__["resource"] = _pbs.attrl_resource_get
-    if _newclass:resource = property(_pbs.attrl_resource_get, _pbs.attrl_resource_set)
+    if _newclass:resource = _swig_property(_pbs.attrl_resource_get, _pbs.attrl_resource_set)
     __swig_setmethods__["value"] = _pbs.attrl_value_set
     __swig_getmethods__["value"] = _pbs.attrl_value_get
-    if _newclass:value = property(_pbs.attrl_value_get, _pbs.attrl_value_set)
+    if _newclass:value = _swig_property(_pbs.attrl_value_get, _pbs.attrl_value_set)
     __swig_setmethods__["op"] = _pbs.attrl_op_set
     __swig_getmethods__["op"] = _pbs.attrl_op_get
-    if _newclass:op = property(_pbs.attrl_op_get, _pbs.attrl_op_set)
+    if _newclass:op = _swig_property(_pbs.attrl_op_get, _pbs.attrl_op_set)
     def __str__(*args): return _pbs.attrl___str__(*args)
     __swig_destroy__ = _pbs.delete_attrl
@@ -293 +299 @@
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, attropl, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_setmethods__["name"] = _pbs.attropl_name_set
     __swig_getmethods__["name"] = _pbs.attropl_name_get
-    if _newclass:name = property(_pbs.attropl_name_get, _pbs.attropl_name_set)
+    if _newclass:name = _swig_property(_pbs.attropl_name_get, _pbs.attropl_name_set)
     __swig_setmethods__["resource"] = _pbs.attropl_resource_set
     __swig_getmethods__["resource"] = _pbs.attropl_resource_get
-    if _newclass:resource = property(_pbs.attropl_resource_get, _pbs.attropl_resource_set)
+    if _newclass:resource = _swig_property(_pbs.attropl_resource_get, _pbs.attropl_resource_set)
     __swig_setmethods__["value"] = _pbs.attropl_value_set
     __swig_getmethods__["value"] = _pbs.attropl_value_get
-    if _newclass:value = property(_pbs.attropl_value_get, _pbs.attropl_value_set)
+    if _newclass:value = _swig_property(_pbs.attropl_value_get, _pbs.attropl_value_set)
     __swig_setmethods__["op"] = _pbs.attropl_op_set
     __swig_getmethods__["op"] = _pbs.attropl_op_get
-    if _newclass:op = property(_pbs.attropl_op_get, _pbs.attropl_op_set)
+    if _newclass:op = _swig_property(_pbs.attropl_op_get, _pbs.attropl_op_set)
     def __str__(*args): return _pbs.attropl___str__(*args)
     __swig_destroy__ = _pbs.delete_attropl
@@ -318 +324 @@
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, batch_status, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_setmethods__["name"] = _pbs.batch_status_name_set
     __swig_getmethods__["name"] = _pbs.batch_status_name_get
-    if _newclass:name = property(_pbs.batch_status_name_get, _pbs.batch_status_name_set)
+    if _newclass:name = _swig_property(_pbs.batch_status_name_get, _pbs.batch_status_name_set)
     __swig_setmethods__["attribs"] = _pbs.batch_status_attribs_set
     __swig_getmethods__["attribs"] = _pbs.batch_status_attribs_get
-    if _newclass:attribs = property(_pbs.batch_status_attribs_get, _pbs.batch_status_attribs_set)
+    if _newclass:attribs = _swig_property(_pbs.batch_status_attribs_get, _pbs.batch_status_attribs_set)
     __swig_setmethods__["text"] = _pbs.batch_status_text_set
     __swig_getmethods__["text"] = _pbs.batch_status_text_get
-    if _newclass:text = property(_pbs.batch_status_text_get, _pbs.batch_status_text_set)
+    if _newclass:text = _swig_property(_pbs.batch_status_text_get, _pbs.batch_status_text_set)
 batch_status_swigregister = _pbs.batch_status_swigregister
 batch_status_swigregister(batch_status)
@@ -534 +540 @@
   Returns the pbs python interface version as a string. 
   """
-  return '3.5.0'
+  return '3.6.0'
 
 # A useful dict with error codes to text

trunk/src/pbs_wrap.c

@@ -1 +1 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.29
+ * Version 1.3.36
  * 
  * This file is not intended to be easily readable and contains a number of 
@@ -18 +18 @@
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
@@ -51 +51 @@
 #   define SWIGUNUSED 
 # endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
 #endif
 
@@ -104 +110 @@
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
 
 
@@ -121 +133 @@
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "2"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
@@ -156 +168 @@
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
@@ -296 +309 @@
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;                 /* mangled name of this type */
@@ -344 +357 @@
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
@@ -426 +439 @@
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
@@ -698 +711 @@
 
 
-/* Python.h has to appear first */
-#include <Python.h>
 
 /* Add PyOS_snprintf for old Pythons */
@@ -780 +791 @@
 #endif
 
+/* Py_ssize_t for old Pythons */
+/* This code is as recommended by: */
+/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+# define PY_SSIZE_T_MAX INT_MAX
+# define PY_SSIZE_T_MIN INT_MIN
+#endif
 
 /* -----------------------------------------------------------------------------
@@ -845 +864 @@
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
@@ -1085 +1104 @@
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
@@ -1092 +1111 @@
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-                   name, (min == max ? "" : "at least "), min);
+                   name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
@@ -1100 +1119 @@
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                   name, (min == max ? "" : "at least "), min, l);
+                   name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                   name, (min == max ? "" : "at most "), max, l);
+                   name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
@@ -1173 +1192 @@
 _SWIG_Py_None(void)
 {
-  PyObject *none = Py_BuildValue("");
+  PyObject *none = Py_BuildValue((char*)"");
   Py_DECREF(none);
   return none;
@@ -1405 +1424 @@
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
@@ -1423 +1442 @@
       }
       Py_XDECREF(res);
-    } else {
+    } 
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+    else {
       const char *name = SWIG_TypePrettyName(ty);
-#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
-    }
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
+    }
+#endif
   } 
   Py_XDECREF(next);
@@ -1586 +1606 @@
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
@@ -1931 +1953 @@
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
+  if (own == SWIG_POINTER_OWN) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
@@ -1952 +1974 @@
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
@@ -1965 +1989 @@
             sobj = (PySwigObject *)sobj->next;
           } else {
-            if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+            if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
             break;
           }
@@ -1975 +2007 @@
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
         sobj->own = 0;
@@ -2032 +2065 @@
     
     /* here we get the method pointer for callbacks */
-    char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
     if (desc) {
@@ -2040 +2073 @@
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
@@ -2153 +2191 @@
  }
 #endif
- dict = PyObject_GetAttrString(inst, "__dict__");
+ dict = PyObject_GetAttrString(inst, (char*)"__dict__");
  PyDict_SetItem(dict, SWIG_This(), swig_this);
  Py_DECREF(dict);
@@ -2294 +2332 @@
 /* The python cached type query */
 SWIGRUNTIME PyObject *
-SWIG_Python_TypeCache() {
+SWIG_Python_TypeCache(void) {
   static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
   return cache;
@@ -2459 +2497 @@
 #if (PY_VERSION_HEX <= 0x02000000)
 # if !defined(SWIG_PYTHON_CLASSIC)
-#  error "This python version requires to use swig with the '-classic' option"
+#  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
@@ -2470 +2508 @@
 #define SWIG_name    "_pbs"
 
-#define SWIGVERSION 0x010329 
+#define SWIGVERSION 0x010336 
+#define SWIG_VERSION SWIGVERSION
 
 
@@ -2605 +2644 @@
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN      LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX      LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX     ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
@@ -2762 +2799 @@
 
 SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor()
+SWIG_pchar_descriptor(void)
 {
   static int init = 0;
@@ -2802 +2839 @@
 {
   if (PyString_Check(obj)) {
-    char *cstr; int len;
+    char *cstr; Py_ssize_t len;
     PyString_AsStringAndSize(obj, &cstr, &len);
     if (cptr)  {
@@ -2972 +3009 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  struct attrl *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  struct attrl *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_attrl",&obj0)) SWIG_fail;
@@ -3019 +3056 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  struct attropl *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  struct attropl *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_attropl",&obj0)) SWIG_fail;
@@ -3142 +3179 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attrl_name_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->name) free((char*)arg1->name);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->name = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->name = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->name = 0;
@@ -3162 +3199 @@
   PyObject *resultobj = 0;
   struct attrl *arg1 = (struct attrl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attrl_name_get",&obj0)) SWIG_fail;
@@ -3174 +3211 @@
   arg1 = (struct attrl *)(argp1);
   result = (char *) ((arg1)->name);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3203 +3240 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attrl_resource_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->resource) free((char*)arg1->resource);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->resource = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->resource = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->resource = 0;
@@ -3223 +3260 @@
   PyObject *resultobj = 0;
   struct attrl *arg1 = (struct attrl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attrl_resource_get",&obj0)) SWIG_fail;
@@ -3235 +3272 @@
   arg1 = (struct attrl *)(argp1);
   result = (char *) ((arg1)->resource);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3264 +3301 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attrl_value_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->value) free((char*)arg1->value);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->value = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->value = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->value = 0;
@@ -3284 +3321 @@
   PyObject *resultobj = 0;
   struct attrl *arg1 = (struct attrl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attrl_value_get",&obj0)) SWIG_fail;
@@ -3296 +3333 @@
   arg1 = (struct attrl *)(argp1);
   result = (char *) ((arg1)->value);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3326 +3363 @@
   arg2 = (enum batch_op)(val2);
   if (arg1) (arg1)->op = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -3337 +3373 @@
   PyObject *resultobj = 0;
   struct attrl *arg1 = (struct attrl *) 0 ;
-  enum batch_op result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  enum batch_op result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attrl_op_get",&obj0)) SWIG_fail;
@@ -3359 +3395 @@
   PyObject *resultobj = 0;
   struct attrl *arg1 = (struct attrl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attrl___str__",&obj0)) SWIG_fail;
@@ -3371 +3407 @@
   arg1 = (struct attrl *)(argp1);
   result = (char *)attrl___str__(arg1);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3392 +3428 @@
   arg1 = (struct attrl *)(argp1);
   delete_attrl(arg1);
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -3402 +3437 @@
 SWIGINTERN PyObject *attrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_attrl, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
@@ -3429 +3464 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attropl_name_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->name) free((char*)arg1->name);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->name = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->name = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->name = 0;
@@ -3449 +3484 @@
   PyObject *resultobj = 0;
   struct attropl *arg1 = (struct attropl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attropl_name_get",&obj0)) SWIG_fail;
@@ -3461 +3496 @@
   arg1 = (struct attropl *)(argp1);
   result = (char *) ((arg1)->name);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3490 +3525 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attropl_resource_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->resource) free((char*)arg1->resource);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->resource = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->resource = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->resource = 0;
@@ -3510 +3545 @@
   PyObject *resultobj = 0;
   struct attropl *arg1 = (struct attropl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attropl_resource_get",&obj0)) SWIG_fail;
@@ -3522 +3557 @@
   arg1 = (struct attropl *)(argp1);
   result = (char *) ((arg1)->resource);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3551 +3586 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "attropl_value_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->value) free((char*)arg1->value);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->value = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->value = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->value = 0;
@@ -3571 +3606 @@
   PyObject *resultobj = 0;
   struct attropl *arg1 = (struct attropl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attropl_value_get",&obj0)) SWIG_fail;
@@ -3583 +3618 @@
   arg1 = (struct attropl *)(argp1);
   result = (char *) ((arg1)->value);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3613 +3648 @@
   arg2 = (enum batch_op)(val2);
   if (arg1) (arg1)->op = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -3624 +3658 @@
   PyObject *resultobj = 0;
   struct attropl *arg1 = (struct attropl *) 0 ;
-  enum batch_op result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  enum batch_op result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attropl_op_get",&obj0)) SWIG_fail;
@@ -3646 +3680 @@
   PyObject *resultobj = 0;
   struct attropl *arg1 = (struct attropl *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:attropl___str__",&obj0)) SWIG_fail;
@@ -3658 +3692 @@
   arg1 = (struct attropl *)(argp1);
   result = (char *)attropl___str__(arg1);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3679 +3713 @@
   arg1 = (struct attropl *)(argp1);
   delete_attropl(arg1);
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -3689 +3722 @@
 SWIGINTERN PyObject *attropl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_attropl, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
@@ -3716 +3749 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "batch_status_name_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->name) free((char*)arg1->name);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->name = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->name = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->name = 0;
@@ -3736 +3769 @@
   PyObject *resultobj = 0;
   struct batch_status *arg1 = (struct batch_status *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:batch_status_name_get",&obj0)) SWIG_fail;
@@ -3748 +3781 @@
   arg1 = (struct batch_status *)(argp1);
   result = (char *) ((arg1)->name);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3778 +3811 @@
   arg2 = (struct attrl *)(argp2);
   if (arg1) (arg1)->attribs = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -3789 +3821 @@
   PyObject *resultobj = 0;
   struct batch_status *arg1 = (struct batch_status *) 0 ;
-  struct attrl *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  struct attrl *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:batch_status_attribs_get",&obj0)) SWIG_fail;
@@ -3855 +3887 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "batch_status_text_set" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   if (arg1->text) free((char*)arg1->text);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->text = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->text = (char *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->text = 0;
@@ -3875 +3907 @@
   PyObject *resultobj = 0;
   struct batch_status *arg1 = (struct batch_status *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:batch_status_text_get",&obj0)) SWIG_fail;
@@ -3887 +3919 @@
   arg1 = (struct batch_status *)(argp1);
   result = (char *) ((arg1)->text);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3896 +3928 @@
 SWIGINTERN PyObject *batch_status_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_batch_status, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN int pbs_errno_set(PyObject *_val) {
+SWIGINTERN int Swig_var_pbs_errno_set(PyObject *_val) {
   {
     int val;
@@ -3916 +3948 @@
 
 
-SWIGINTERN PyObject *pbs_errno_get(void) {
+SWIGINTERN PyObject *Swig_var_pbs_errno_get(void) {
   PyObject *pyobj = 0;
   
@@ -3924 +3956 @@
 
 
-SWIGINTERN int pbs_server_set(PyObject *_val) {
+SWIGINTERN int Swig_var_pbs_server_set(PyObject *_val) {
   {
     char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
@@ -3935 +3967 @@
       pbs_server = cptr;
     } else {
-      pbs_server = csize ? (char *)memcpy((char *)malloc((csize)*sizeof(char)), cptr, sizeof(char)*(csize)) : 0;
+      pbs_server = csize ? (char *)(char *)memcpy((char *)malloc((csize)*sizeof(char)), cptr, sizeof(char)*(csize)) : 0;
     }
   }
@@ -3944 +3976 @@
 
 
-SWIGINTERN PyObject *pbs_server_get(void) {
+SWIGINTERN PyObject *Swig_var_pbs_server_get(void) {
   PyObject *pyobj = 0;
   
@@ -3956 +3988 @@
   int arg1 ;
   char *arg2 = (char *) 0 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -3964 +3995 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:avail",&obj0,&obj1)) SWIG_fail;
@@ -3975 +4007 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "avail" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   result = (char *)avail(arg1,arg2);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return resultobj;
@@ -3992 +4024 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4008 +4039 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_asyrunjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4019 +4051 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_asyrunjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_asyrunjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_asyrunjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_asyrunjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -4050 +4082 @@
   struct attrl *arg3 = (struct attrl *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4063 +4094 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_alterjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4074 +4106 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_alterjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   {
     PyObject    *py_obj;
@@ -4129 +4161 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_alterjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_alterjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -4145 +4177 @@
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:pbs_connect",&obj0)) SWIG_fail;
@@ -4156 +4188 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pbs_connect" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   result = (int)pbs_connect(arg1);
   resultobj = SWIG_From_int((int)(result));
@@ -4186 +4218 @@
   if (!PyArg_ParseTuple(args,(char *)":pbs_default")) SWIG_fail;
   result = (char *)pbs_default();
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -4198 +4230 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4210 +4241 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_deljob",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -4221 +4253 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_deljob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_deljob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (int)pbs_deljob(arg1,arg2,arg3);
   resultobj = SWIG_From_int((int)(result));
@@ -4242 +4274 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:pbs_disconnect",&obj0)) SWIG_fail;
@@ -4267 +4299 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4283 +4314 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_holdjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4294 +4326 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_holdjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_holdjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_holdjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_holdjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -4324 +4356 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -4336 +4367 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_locjob",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -4347 +4379 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_locjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_locjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (char *)pbs_locjob(arg1,arg2,arg3);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -4373 +4405 @@
   struct attropl *arg5 = (struct attropl *) 0 ;
   char *arg6 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4392 +4423 @@
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:pbs_manager",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
@@ -4413 +4445 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_manager" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   {
     PyObject            *py_obj;
@@ -4468 +4500 @@
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "pbs_manager" "', argument " "6"" of type '" "char *""'");
   }
-  arg6 = buf6;
+  arg6 = (char *)(buf6);
   result = (int)pbs_manager(arg1,arg2,arg3,arg4,arg5,arg6);
   resultobj = SWIG_From_int((int)(result));
@@ -4487 +4519 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4503 +4534 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_movejob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4514 +4546 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_movejob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_movejob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_movejob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_movejob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -4546 +4578 @@
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4565 +4596 @@
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:pbs_msgjob",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
@@ -4576 +4608 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_msgjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
@@ -4586 +4618 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_msgjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "pbs_msgjob" "', argument " "5"" of type '" "char *""'");
   }
-  arg5 = buf5;
+  arg5 = (char *)(buf5);
   result = (int)pbs_msgjob(arg1,arg2,arg3,arg4,arg5);
   resultobj = SWIG_From_int((int)(result));
@@ -4612 +4644 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4628 +4659 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_orderjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4639 +4671 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_orderjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_orderjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_orderjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_orderjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -4673 +4705 @@
   int *arg6 = (int *) 0 ;
   int *arg7 = (int *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4689 +4720 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   arg4 = &temp4;
@@ -4783 +4815 @@
   int arg3 ;
   int *arg4 = (int *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4793 +4824 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   arg4 = &temp4;
@@ -4864 +4896 @@
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4871 +4902 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:pbs_rescrelease",&obj0,&obj1)) SWIG_fail;
@@ -4896 +4928 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4908 +4939 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_rerunjob",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -4919 +4951 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_rerunjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_rerunjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (int)pbs_rerunjob(arg1,arg2,arg3);
   resultobj = SWIG_From_int((int)(result));
@@ -4943 +4975 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -4959 +4990 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_rlsjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -4970 +5002 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_rlsjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_rlsjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_rlsjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_rlsjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -5001 +5033 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -5017 +5048 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_runjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -5028 +5060 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_runjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_runjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_runjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_runjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -5058 +5090 @@
   struct attropl *arg2 = (struct attropl *) 0 ;
   char *arg3 = (char *) 0 ;
-  char **result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5067 +5098 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  char **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_selectjob",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -5128 +5160 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_selectjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (char **)pbs_selectjob(arg1,arg2,arg3);
   {
@@ -5172 +5204 @@
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -5188 +5219 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_sigjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -5199 +5231 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_sigjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_sigjob" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_sigjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (int)pbs_sigjob(arg1,arg2,arg3,arg4);
   resultobj = SWIG_From_int((int)(result));
@@ -5296 +5328 @@
   struct attrl *arg3 = (struct attrl *) 0 ;
   char *arg4 = (char *) 0 ;
-  struct batch_status *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5309 +5340 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  struct batch_status *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_statjob",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -5320 +5352 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_statjob" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   {
     PyObject    *py_obj;
@@ -5375 +5407 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_statjob" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (struct batch_status *)pbs_statjob(arg1,arg2,arg3,arg4);
   {
@@ -5426 +5458 @@
   struct attropl *arg2 = (struct attropl *) 0 ;
   char *arg3 = (char *) 0 ;
-  struct batch_status *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5435 +5466 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  struct batch_status *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_selstat",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -5496 +5528 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_selstat" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (struct batch_status *)pbs_selstat(arg1,arg2,arg3);
   {
@@ -5546 +5578 @@
   struct attrl *arg3 = (struct attrl *) 0 ;
   char *arg4 = (char *) 0 ;
-  struct batch_status *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5559 +5590 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  struct batch_status *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_statque",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -5570 +5602 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_statque" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   {
     PyObject    *py_obj;
@@ -5625 +5657 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_statque" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (struct batch_status *)pbs_statque(arg1,arg2,arg3,arg4);
   {
@@ -5676 +5708 @@
   struct attrl *arg2 = (struct attrl *) 0 ;
   char *arg3 = (char *) 0 ;
-  struct batch_status *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5685 +5716 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  struct batch_status *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_statserver",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -5746 +5778 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_statserver" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (struct batch_status *)pbs_statserver(arg1,arg2,arg3);
   {
@@ -5796 +5828 @@
   struct attrl *arg3 = (struct attrl *) 0 ;
   char *arg4 = (char *) 0 ;
-  struct batch_status *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5809 +5840 @@
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  struct batch_status *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:pbs_statnode",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -5820 +5852 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pbs_statnode" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   {
     PyObject    *py_obj;
@@ -5875 +5907 @@
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_statnode" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   result = (struct batch_status *)pbs_statnode(arg1,arg2,arg3,arg4);
   {
@@ -5928 +5960 @@
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -5945 +5976 @@
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:pbs_submit",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
@@ -6006 +6038 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_submit" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "pbs_submit" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "pbs_submit" "', argument " "5"" of type '" "char *""'");
   }
-  arg5 = buf5;
+  arg5 = (char *)(buf5);
   result = (char *)pbs_submit(arg1,arg2,arg3,arg4,arg5);
-  resultobj = SWIG_FromCharPtr(result);
+  resultobj = SWIG_FromCharPtr((const char *)result);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
@@ -6036 +6068 @@
   int arg2 ;
   char *arg3 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -6047 +6078 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:pbs_terminate",&obj0,&obj1,&obj2)) SWIG_fail;
@@ -6063 +6095 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pbs_terminate" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   result = (int)pbs_terminate(arg1,arg2,arg3);
   resultobj = SWIG_From_int((int)(result));
@@ -6078 +6110 @@
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -6085 +6116 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:totpool",&obj0,&obj1)) SWIG_fail;
@@ -6109 +6141 @@
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -6116 +6147 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:usepool",&obj0,&obj1)) SWIG_fail;
@@ -6140 +6172 @@
   char *arg1 = (char *) 0 ;
   unsigned int arg2 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
@@ -6148 +6179 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:openrm",&obj0,&obj1)) SWIG_fail;
@@ -6154 +6186 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "openrm" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
@@ -6173 +6205 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:closerm",&obj0)) SWIG_fail;
@@ -6195 +6227 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:downrm",&obj0)) SWIG_fail;
@@ -6218 +6250 @@
   int arg1 ;
   char *arg2 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -6226 +6257 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:configrm",&obj0,&obj1)) SWIG_fail;
@@ -6237 +6269 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "configrm" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   result = (int)configrm(arg1,arg2);
   resultobj = SWIG_From_int((int)(result));
@@ -6252 +6284 @@
   int arg1 ;
   char *arg2 = (char *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
@@ -6260 +6291 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:addreq",&obj0,&obj1)) SWIG_fail;
@@ -6271 +6303 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "addreq" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   result = (int)addreq(arg1,arg2);
   resultobj = SWIG_From_int((int)(result));
@@ -6285 +6317 @@
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:allreq",&obj0)) SWIG_fail;
@@ -6296 +6328 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "allreq" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   result = (int)allreq(arg1);
   resultobj = SWIG_From_int((int)(result));
@@ -6357 +6389 @@
   PyObject *resultobj = 0;
   int arg1 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:getreq",&obj0)) SWIG_fail;
@@ -6369 +6401 @@
   arg1 = (int)(val1);
   result = (char *)getreq(arg1);
-  resultobj = SWIG_FromCharPtr(result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN int log_event_mask_set(PyObject *_val) {
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN int Swig_var_log_event_mask_set(PyObject *_val) {
   {
     void *argp = 0;
@@ -6391 +6423 @@
 
 
-SWIGINTERN PyObject *log_event_mask_get(void) {
+SWIGINTERN PyObject *Swig_var_log_event_mask_get(void) {
   PyObject *pyobj = 0;
   
@@ -6447 +6479 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "log_err" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "log_err" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   log_err(arg1,arg2,arg3);
   resultobj = SWIG_Py_Void();
@@ -6501 +6533 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "log_event" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "log_event" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   log_event(arg1,arg2,arg3,arg4);
   resultobj = SWIG_Py_Void();
@@ -6523 +6555 @@
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
@@ -6532 +6563 @@
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:log_open",&obj0,&obj1)) SWIG_fail;
@@ -6538 +6570 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "log_open" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "log_open" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = buf2;
+  arg2 = (char *)(buf2);
   result = (int)log_open(arg1,arg2);
   resultobj = SWIG_From_int((int)(result));
@@ -6592 +6624 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "log_record" "', argument " "3"" of type '" "char *""'");
   }
-  arg3 = buf3;
+  arg3 = (char *)(buf3);
   res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "log_record" "', argument " "4"" of type '" "char *""'");
   }
-  arg4 = buf4;
+  arg4 = (char *)(buf4);
   log_record(arg1,arg2,arg3,arg4);
   resultobj = SWIG_Py_Void();
@@ -6644 +6676 @@
 
 
-SWIGINTERN int log_buffer_set(PyObject *_val) {
+SWIGINTERN int Swig_var_log_buffer_set(PyObject *_val) {
   {
     int res = SWIG_AsCharArray(_val, log_buffer, 4096);
@@ -6657 +6689 @@
 
 
-SWIGINTERN PyObject *log_buffer_get(void) {
+SWIGINTERN PyObject *Swig_var_log_buffer_get(void) {
   PyObject *pyobj = 0;
   
@@ -6672 +6704 @@
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:setup_env",&obj0)) SWIG_fail;
@@ -6683 +6715 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setup_env" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   result = (int)setup_env(arg1);
   resultobj = SWIG_From_int((int)(result));
@@ -6701 +6733 @@
   int arg4 ;
   int arg5 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
@@ -6718 +6749 @@
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:chk_file_sec",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
@@ -6724 +6756 @@
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "chk_file_sec" "', argument " "1"" of type '" "char *""'");
   }
-  arg1 = buf1;
+  arg1 = (char *)(buf1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
@@ -6755 +6787 @@
 
 
-SWIGINTERN int msg_daemonname_set(PyObject *_val) {
+SWIGINTERN int Swig_var_msg_daemonname_set(PyObject *_val) {
   {
     char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
@@ -6766 +6798 @@
       msg_daemonname = cptr;
     } else {
-      msg_daemonname = csize ? (char *)memcpy((char *)malloc((csize)*sizeof(char)), cptr, sizeof(char)*(csize)) : 0;
+      msg_daemonname = csize ? (char *)(char *)memcpy((char *)malloc((csize)*sizeof(char)), cptr, sizeof(char)*(csize)) : 0;
     }
   }
@@ -6775 +6807 @@
 
 
-SWIGINTERN PyObject *msg_daemonname_get(void) {
+SWIGINTERN PyObject *Swig_var_msg_daemonname_get(void) {
   PyObject *pyobj = 0;
   
@@ -6874 +6906 @@
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static swig_type_info _swigt__p_attrl = {"_p_attrl", "struct attrl *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_attropl = {"_p_attropl", "struct attropl *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_batch_status = {"_p_batch_status", "struct batch_status *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_attrl = {"_p_attrl", "struct attrl *|attrl *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_attropl = {"_p_attropl", "struct attropl *|attropl *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_batch_status = {"_p_batch_status", "struct batch_status *|batch_status *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
@@ -6933 +6965 @@
  *
  * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop though that array, and handle each type individually.
+ * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -6971 +7003 @@
 #endif
 
+
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
-  swig_module_info *module_head;
-  static int init_run = 0;
+  swig_module_info *module_head, *iter;
+  int found, init;
   
   clientdata = clientdata;
   
-  if (init_run) return;
-  init_run = 1;
-  
-  /* Initialize the swig_module */
-  swig_module.type_initial = swig_type_initial;
-  swig_module.cast_initial = swig_cast_initial;
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
+  }
   
   /* Try and load any already created modules */
   module_head = SWIG_GetModule(clientdata);
-  if (module_head) {
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+    module_head = &swig_module;
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    found=0;
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        found=1;
+        break;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+    
+    /* if the is found in the list, then all is done and we may leave */
+    if (found) return;
+    /* otherwise we must add out module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
-  } else {
-    /* This is the first module loaded */
-    swig_module.next = &swig_module;
-    SWIG_SetModule(clientdata, &swig_module);
-  }
+  }
+  
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
   
   /* Now work on filling in swig_module.types */
@@ -7307 +7365 @@
   
   SWIGINTERN PyObject *
-  SWIG_globals() {
+  SWIG_globals(void) {
     static PyObject *_SWIG_globals = 0; 
     if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
@@ -7352 +7410 @@
     size_t i;
     for (i = 0; methods[i].ml_name; ++i) {
-      char *c = methods[i].ml_doc;
+      const char *c = methods[i].ml_doc;
       if (c && (c = strstr(c, "swig_ptr: "))) {
         int j;
         swig_const_info *ci = 0;
-        char *name = c + 10;
+        const char *name = c + 10;
         for (j = 0; const_table[j].type; ++j) {
           if (strncmp(const_table[j].name, name, 
@@ -7630 +7688 @@
   SWIG_Python_SetConstant(d, "RESOURCE_T_ALL",SWIG_From_int((int)(-1)));
   PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"pbs_errno",pbs_errno_get, pbs_errno_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"pbs_server",pbs_server_get, pbs_server_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"pbs_errno",Swig_var_pbs_errno_get, Swig_var_pbs_errno_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"pbs_server",Swig_var_pbs_server_get, Swig_var_pbs_server_set);
   SWIG_Python_SetConstant(d, "LOG_BUF_SIZE",SWIG_From_int((int)(4096)));
-  SWIG_addvarlink(SWIG_globals(),(char*)"log_event_mask",log_event_mask_get, log_event_mask_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"log_buffer",log_buffer_get, log_buffer_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"log_event_mask",Swig_var_log_event_mask_get, Swig_var_log_event_mask_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"log_buffer",Swig_var_log_buffer_get, Swig_var_log_buffer_set);
   SWIG_Python_SetConstant(d, "PBSEVENT_ERROR",SWIG_From_int((int)(0x0001)));
   SWIG_Python_SetConstant(d, "PBSEVENT_SYSTEM",SWIG_From_int((int)(0x0002)));
@@ -7653 +7711 @@
   SWIG_Python_SetConstant(d, "PBS_EVENTCLASS_NODE",SWIG_From_int((int)(7)));
   SWIG_Python_SetConstant(d, "PBSEVENT_MASK",SWIG_From_int((int)(0x01ff)));
-  SWIG_addvarlink(SWIG_globals(),(char*)"msg_daemonname",msg_daemonname_get, msg_daemonname_set);
-}
-
+  SWIG_addvarlink(SWIG_globals(),(char*)"msg_daemonname",Swig_var_msg_daemonname_get, Swig_var_msg_daemonname_set);
+}
+