Merge branch 'master' of git://git.onelab.eu/sfa into upmc

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index 4b5c7c1..8c4ab5e 100644 (file)
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -210,7 +210,7 @@ class PlImporter:
                 except:
                     # if the site import fails then there is no point in trying to import the
                     # site's child records (node, slices, persons), so skip them.
-                    self.logger.log_exc("PlImporter: failed to import site. Skipping child records") 
+                    self.logger.log_exc("PlImporter: failed to import site %s. Skipping child records"%site_hrn) 
                     continue 
             else:
                 # xxx update the record ...
@@ -244,7 +244,7 @@ class PlImporter:
                         self.logger.info("PlImporter: imported node: %s" % node_record)  
                         self.remember_record (node_record)
                     except:
-                        self.logger.log_exc("PlImporter: failed to import node") 
+                        self.logger.log_exc("PlImporter: failed to import node %s"%node_hrn) 
                 else:
                     # xxx update the record ...
                     pass
@@ -360,10 +360,10 @@ class PlImporter:
                         self.logger.info("PlImporter: imported slice: %s" % slice_record)  
                         self.remember_record ( slice_record )
                     except:
-                        self.logger.log_exc("PlImporter: failed to import slice")
+                        self.logger.log_exc("PlImporter: failed to import slice %s (%s)"%(slice_hrn,slice['name']))
                 else:
                     # xxx update the record ...
-                    self.logger.warning ("Slice update not yet implemented")
+                    self.logger.warning ("Slice update not yet implemented on slice %s (%s)"%(slice_hrn,slice['name']))
                     pass
                 # record current users affiliated with the slice
                 slice_record.reg_researchers = \

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 444ceeb..c25ec44 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -119,7 +119,56 @@ DO NOT EDIT. This file was automatically generated at
                     value = int(value)    
                 setattr(self, name, value)
                 setattr(self, name.upper(), value)
-        
+
+    def variables(self):
+        """
+        Return all variables.
+
+        Returns:
+
+        variables = { 'category_id': (category, variablelist) }
+
+        category = { 'id': "category_identifier",
+                     'name': "Category name",
+                     'description': "Category description" }
+
+        variablelist = { 'variable_id': variable }
+
+        variable = { 'id': "variable_identifier",
+                     'type': "variable_type",
+                     'value': "variable_value",
+                     'name': "Variable name",
+                     'description': "Variable description" }
+        """
+
+        variables = {}
+        for section in self.config.sections():
+            category = {
+                'id': section,
+                'name': section,
+                'description': section,
+            }
+            variable_list = {}
+            for item in self.config.items(section):
+                var_name = item[0] 
+                name = "%s_%s" % (section, var_name)
+                value = item[1]
+                if isbool(value):
+                    value_type = bool
+                elif value.isdigit():
+                    value_type = int
+                else:
+                    value_type = str
+                variable = {
+                    'id': var_name,
+                    'type': value_type,
+                    'value': value,
+                    'name': name,
+                    'description': name,
+                }
+                variable_list[name] = variable
+            variables[section] = (category, variable_list)
+        return variables      
 
     def verify(self, config1, config2, validate_method):
         return True