Changeset 335 for devel/5.X/pbs.i

Timestamp:

03/10/15 11:46:37 (9 years ago)

Author:

bas

Message:

finally version of pbs_python to 5.X, still no working rm interface

File:

• devel/5.X/pbs.i (modified) (16 diffs)

devel/5.X/pbs.i

@@ -23 +23 @@
 #include "log.h"
 
-#define SARA_DEBUG 1
-
-//extern int pbs_errno;
+#define SARA_DEBUG 0
 
 %}
@@ -44 +42 @@
   int                   i=0, size=0;
 
-  // printf("Python --> C\n");
-
-  if (SARA_DEBUG) printf("Converteren python -> c (struct batch_status *):\n");
+  if (SARA_DEBUG) printf("Convert python -> c (struct batch_status *):\n");
 
   size = Get_List_Size($input);
@@ -104 +100 @@
   // printf("Python --> C\n");
 
-  if (SARA_DEBUG) printf("Converteren python -> c (struct attrl *):\n");
+  if (SARA_DEBUG) printf("Convert python -> c (struct attrl *):\n");
 
   size = Get_List_Size($input);
@@ -125 +121 @@
       return NULL;
 
-      // This will skipp the wrong entry
+      // This will skip the wrong entry
       // continue;
     }
@@ -145 +141 @@
 
   } // end for
+
   if (SARA_DEBUG) printf("\t</Contents>\n");
 } // end struct attrl *IN typemap
@@ -159 +156 @@
   // printf("Python --> C\n");
 
-  if (SARA_DEBUG) printf("Converteren python -> c (struct attropl *):\n");
+  if (SARA_DEBUG) printf("Convert python -> c (struct attropl *):\n");
 
   size = Get_List_Size($input);
@@ -244 +241 @@
 
   PyObject              *obj_batch;
-  struct batch_status   *ptr;
+  struct batch_status   *ptr, *org;
   int                   i=0, len=0;
 
-  // printf("Ja we are in bussniss\n");
-  if (SARA_DEBUG) printf("Converteren c (struct batch_status *) -> python:\n");
+  if (SARA_DEBUG) printf("Convert c (struct batch_status *) -> python:\n");
  
   // Deterime length of list
   //
-  ptr = $1;
+  org = $1;
+  ptr = org;
   while (ptr != NULL) {
     len++;
@@ -274 +271 @@
   }
 
-  free(ptr);
   if (SARA_DEBUG) printf("\t</Contents>\n");
 } // end typemap struct batch_status *
@@ -283 +279 @@
   int           i=0, len=0;
 
-  if (SARA_DEBUG) printf("Converteren c (struct attrl *) -> python:\n");
+  if (SARA_DEBUG) printf("Convert c (struct attrl *) -> python:\n");
 
   ptr = $1;
@@ -302 +298 @@
     ptr = ptr->next;
   }
-
-  free(ptr);
   if (SARA_DEBUG) printf("\t</Contents>\n");
 } // end typemap struct attrl *
@@ -312 +306 @@
   int               i=0, len=0;
 
-  if (SARA_DEBUG) printf("Converteren c (struct attropl *) -> python:\n");
+  if (SARA_DEBUG) printf("Convert c (struct attropl *) -> python:\n");
   
   ptr = $1;
@@ -330 +324 @@
   }
 
-  free(ptr);
   if (SARA_DEBUG) printf("\t</Contents>\n");
 } // end typemap struct attropl *
@@ -340 +333 @@
 
    if (SARA_DEBUG) 
-     printf("Converteren char ** -> python list\n");
+     printf("Convert char ** -> python list\n");
 
 
@@ -513 +506 @@
 //
 %nodefault;
-// %include "pbs_python.h"
+
+
 %include "pbs_ifl.h"
 %include "rm.h"
 %include "log.h"
 %include "pbs_error.h"
-
-
-// Iets van uhhh..... obsolete
-// %ignore pbs_errno;
-//%include <pbs_error.h>
-
-
-/*
-%feature("shadow") attrl::__str__ {
-  def __str__(self): print self.name + self.value;
-}
-%extend attrl {
-  void __str__();
-}
-*/
 
 /* not used
@@ -561 +540 @@
        printf("Bas free attrl\n");
 
-    /*
-        free(self);
-    */
+    // free(self);
   }
 }
@@ -584 +561 @@
        printf("Bas free attropl\n");
 
-    /*
-        free(self);
-    */
+    // free(self);
   }
 }