2 files changed, 24 insertions, 31 deletions

diff --git a/views/transform.c b/views/transform.c
index 986cfd7..ba2f48f 100644
--- a/views/transform.c
+++ b/views/transform.c
@@ -15,53 +15,46 @@ static int pcilib_transform_view_read(pcilib_t *ctx, pcilib_view_context_t *view
     const pcilib_model_description_t *model_info = pcilib_get_model_description(ctx);
     pcilib_transform_view_description_t *v = (pcilib_transform_view_description_t*)(model_info->views[view_ctx->view]);
 
-	if(v->script)
-	{
-		return pcilib_script_read(ctx, v->script, val);
-	}
-	else
-	{
-		int err;
-		
-		err = pcilib_set_value_from_register_value(ctx, val, regval);
-		if (err) return err;
+	int err;
 
+	err = pcilib_set_value_from_register_value(ctx, val, regval);
+	if (err) return err;
+
+	if(v->module)
+		return pcilib_script_read(ctx, v->module, val);
+	else
 		return  pcilib_py_eval_string(ctx, v->read_from_reg, val);
-	}
 }
 
 static int pcilib_transform_view_write(pcilib_t *ctx, pcilib_view_context_t *view_ctx, pcilib_register_value_t *regval, const pcilib_value_t *val) {
-    
-    
-
+	
     const pcilib_model_description_t *model_info = pcilib_get_model_description(ctx);
     pcilib_transform_view_description_t *v = (pcilib_transform_view_description_t*)(model_info->views[view_ctx->view]);
 
+	int err = 0;
+	
+	pcilib_value_t val_copy = {0};
+	err = pcilib_copy_value(ctx, &val_copy, val);
+	if (err) return err;
 
-	if(!v->script)
-	{
-		int err = 0;
-		
-		pcilib_value_t val_copy = {0};
-		err = pcilib_copy_value(ctx, &val_copy, val);
-		if (err) return err;
-
-		err = pcilib_py_eval_string(ctx, v->write_to_reg, &val_copy);
-		if (err) return err;
 
-		*regval = pcilib_get_value_as_register_value(ctx, &val_copy, &err);
-		return err;
-	}
+	if(v->module)
+		err = pcilib_script_write(ctx, v->module, &val_copy);
 	else
-		return pcilib_script_write(ctx, v->script, (pcilib_value_t *)val);
+		err = pcilib_py_eval_string(ctx, v->write_to_reg, &val_copy);
+		
+	if (err) return err;
+	
+	*regval = pcilib_get_value_as_register_value(ctx, &val_copy, &err);
+	return err;
 }
 
 void pcilib_transform_view_free_description (pcilib_t *ctx, pcilib_view_description_t *view)
 {
 	pcilib_transform_view_description_t *v = (pcilib_transform_view_description_t*)(view);
 	
-	if(v->script)
-		pcilib_free_py_script(v->script);
+	if(v->module)
+		pcilib_py_free_script(v->module);
 }
 
 
diff --git a/views/transform.h b/views/transform.h
index 8ab4f4f..c2f0a98 100644
--- a/views/transform.h
+++ b/views/transform.h
@@ -9,7 +9,7 @@ typedef struct {
     pcilib_view_description_t base;
     const char *read_from_reg;			/**< Formula explaining how to convert the register value to the view value */
     const char *write_to_reg;			/**< Formula explaining how to convert from the view value to the register value */
-	pcilib_script_t *script;
+	char *module; /**< Python script module name (without extension) */
 } pcilib_transform_view_description_t;
 
 #ifndef _PCILIB_VIEW_TRANSFORM_C