[zypp-commit] r8244 - /trunk/sat-solver/bindings/satsolver.i

9 Jan 2008

Author: kkaempf
Date: Wed Jan  9 14:52:41 2008
New Revision: 8244

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8244&view=rev
Log:
Pass Pool to Action and define proper Action accessors 

Modified:
    trunk/sat-solver/bindings/satsolver.i

Modified: trunk/sat-solver/bindings/satsolver.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?rev=8244&r1=8243&r2=8244&view=diff
==============================================================================

--- trunk/sat-solver/bindings/satsolver.i (original)
+++ trunk/sat-solver/bindings/satsolver.i Wed Jan  9 14:52:41 2008
@@ -229,13 +229,15 @@
  */
  
 typedef struct _Action {
+  Pool *pool;
   SolverCmd cmd;
   Id id;
 } Action;
 
-static Action *action_new( SolverCmd cmd, Id id )
+static Action *action_new( Pool *pool, SolverCmd cmd, Id id )
 {
   Action *action = (Action *)malloc( sizeof( Action ));
+  action->pool = pool;
   action->cmd = cmd;
   action->id = id;
   return action;
@@ -975,6 +977,7 @@
   %rename("to_s") asString();
   const char *asString()
   {
+    if ( $self->id == ID_NULL ) return "";
     return solvable2str( $self->pool, xsolvable_solvable( $self ) );
   }
 
@@ -1005,21 +1008,47 @@
 /* Action */
 
 %extend Action {
-  %constant int INSTALL_SOLVABLE = 1;
-  %constant int REMOVE_SOLVABLE = 2;
-  %constant int INSTALL_SOLVABLE_NAME = 3;
-  %constant int REMOVE_SOLVABLE_NAME = 4;
-  %constant int INSTALL_SOLVABLE_PROVIDES = 5;
-  %constant int REMOVE_SOLVABLE_PROVIDES = 6;
-  
-  Action( int cmd, Id id )
-  { return action_new( cmd, id ); }
+  %constant int INSTALL_SOLVABLE = SOLVER_INSTALL_SOLVABLE;
+  %constant int REMOVE_SOLVABLE = SOLVER_ERASE_SOLVABLE;
+  %constant int INSTALL_SOLVABLE_NAME = SOLVER_INSTALL_SOLVABLE_NAME;
+  %constant int REMOVE_SOLVABLE_NAME = SOLVER_ERASE_SOLVABLE_NAME;
+  %constant int INSTALL_SOLVABLE_PROVIDES = SOLVER_INSTALL_SOLVABLE_PROVIDES;
+  %constant int REMOVE_SOLVABLE_PROVIDES = SOLVER_ERASE_SOLVABLE_PROVIDES;
+
+  /* no constructor defined, Actions are created by accessing a
+     Transaction */
   ~Action()
   { free( $self ); }
+  
   int cmd()
   { return $self->cmd; }
-  Id id()
-  { return $self->id; }
+
+  XSolvable *solvable()
+  {
+    if ($self->cmd == SOLVER_INSTALL_SOLVABLE
+        || $self->cmd == SOLVER_ERASE_SOLVABLE) {
+      return xsolvable_new( $self->pool, $self->id );
+    }
+    return NULL;
+  }
+
+  const char *name()
+  {
+    if ($self->cmd == SOLVER_INSTALL_SOLVABLE_NAME
+        || $self->cmd == SOLVER_ERASE_SOLVABLE_NAME) {
+      return my_id2str( $self->pool, $self->id );
+    }
+    return NULL;
+  }
+
+  Relation *relation()
+  {
+    if ($self->cmd == SOLVER_INSTALL_SOLVABLE_PROVIDES
+        || $self->cmd == SOLVER_ERASE_SOLVABLE_PROVIDES) {
+      return relation_new( $self->pool, $self->id );
+    }
+    return NULL;
+  }
 }
 
 /*-------------------------------------------------------------*/
@@ -1036,7 +1065,7 @@
   {
     int cmd = queue_shift( &($self->queue) );
     Id id = queue_shift( &($self->queue) );
-    return action_new( cmd, id );
+    return action_new( $self->pool, cmd, id );
   }
   
   void push( const Action *action )
@@ -1075,23 +1104,19 @@
   }
   void install( const Relation *rel )
   {
-    Reldep *rd;
     if (rel == NULL)
       SWIG_exception( SWIG_NullReferenceError, "bad Relation" );
     queue_push( &($self->queue), SOLVER_INSTALL_SOLVABLE_PROVIDES );
     /* FIXME: check: rel->pool == $self->pool */
-    rd = GETRELDEP( rel->pool, rel->id );
-    queue_push( &($self->queue), rd->name );
+    queue_push( &($self->queue), rel->id );
   }
   void remove( const Relation *rel )
   {
-    Reldep *rd;
     if (rel == NULL)
       SWIG_exception( SWIG_NullReferenceError, "bad Relation" );
     queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE_PROVIDES );
     /* FIXME: check: rel->pool == $self->pool */
-    rd = GETRELDEP( rel->pool, rel->id );
-    queue_push( &($self->queue), rd->name );
+    queue_push( &($self->queue), rel->id );
   }
 
 #if defined(SWIGRUBY)
@@ -1120,7 +1145,7 @@
     if (i-1 >= size) return NULL;
     cmd = $self->queue.elements[i];
     id = $self->queue.elements[i+1];
-    return action_new( cmd, id );
+    return action_new( $self->pool, cmd, id );
   }
 
 #if defined(SWIGRUBY)
@@ -1130,7 +1155,7 @@
     for (i = 0; i < $self->queue.count-1; ) {
       int cmd = $self->queue.elements[i++];
       Id id = $self->queue.elements[i++];
-      rb_yield(SWIG_NewPointerObj((void*) action_new( cmd, id ), SWIGTYPE_p__Action, 0));
+      rb_yield(SWIG_NewPointerObj((void*) action_new( $self->pool, cmd, id ), SWIGTYPE_p__Action, 0));
     }
   }
 #endif

-- 
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org

    

[zypp-commit] r8244 - /trunk/sat-solver/bindings/satsolver.i

kkaempf＠svn.opensuse.org