Affichage d'informations de config.xml

Alain Klotz
1 parent 7a3253ee
Showing 3 changed files with 28 additions and 5 deletions Show diff stats
config/config_unit_simulunit1.xml
config/configpyros.py
src/agent/Agent.py
@@ -37,6 +37,7 @@ options : HTML tag &lt;option&gt; contents in case of HTML element &lt;select&gt;
   <date_creation>2018-04-13 00:38:14</date_creation>
   <date_last_modification>2019-02-18 16:38:00</date_last_modification>
   <author_last_modification>Alain Klotz</author_last_modification>
+  <param section="unit" key="name" value="Unit of simulation No 1"/>
  
   <!-- Select the unit as one mount and one or more channels -->
   <param section="assembly" key="alias" value="PyROSDatabase" comment="database"/>
@@ -45,6 +46,7 @@ options : HTML tag &lt;option&gt; contents in case of HTML element &lt;select&gt;
  
   <!-- A database definition -->
   <database alias="PyROSDatabase">
+    <param section="database" key="name" value="PyROS database"/>
     <!-- Select the type of database (DBMS) -->
     <param section="management" key="system" value="MySQL"/>
     <!-- Access autorizations -->
@@ -41,6 +41,7 @@ class ConfigPyros:
     _tags_to_scan = None
     # --- XML contents
     _config_contents_valid = False
+    _config_contents_changed = False
     _tree = None
     _root = None
     _unit_subtags = None
@@ -419,6 +420,11 @@ class ConfigPyros:
         """ Get the current config file name
         """
         return self._config_filename
+    
+    def is_config_contents_changed(self):
+        response =self._config_contents_changed
+        self._config_contents_changed = False
+        return response
  
     def load(self, verbose:bool = False, force:bool = False):
         """ To load the config file if necessary
@@ -436,6 +442,7 @@ class ConfigPyros:
                 print("Load Error = {}".format(errno))            
             return
         if self._config_filename_need_to_be_read == False and force == False:
+            self._config_contents_changed = False
             return
  
         # --- Read the configuration file and parse it
@@ -462,6 +469,7 @@ class ConfigPyros:
             # --- Validation step
             if valid == True:
                 self._config_filename_mtime = os.path.getmtime(self._config_filename)
+                self._config_contents_changed = True
             else:
                 # --- Se the current tree and root from '_old'
                 self._config_contents_valid = False
@@ -591,6 +599,7 @@ class ConfigPyros:
         self._last_errno = self.NO_ERROR
         self._unit_component_params = []
         self.set_configfile(config_filename)
+        self._configfile_changed = False
  
 # =====================================================================
 # =====================================================================
@@ -277,11 +277,23 @@ class Agent:
             raise Exception(f"error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
         # --- display informations
         # --- Get all the assembly of this unit[0] (mount + channels)
-        unit_alias = self.config.get_aliases('unit')[0]
-        print("Unit alias is {}".format(unit_alias))
-        #params = self.config.get_params(unit_alias)
-        #for param in params:
-        #    print("Unit component is {}".format(param))
+        if self.config.is_config_contents_changed():
+            print("--------- Components of the unit -----------")
+            print("Configuration file is {}".format(self.config.get_configfile()))            
+            alias = self.config.get_aliases('unit')[0]
+            namevalue = self.config.get_paramvalue(alias,'unit','name')
+            print("Unit alias is {}. Name is {}".format(alias,namevalue))
+            unit_subtags = self.config.get_unit_subtags()
+            for unit_subtag in unit_subtags:
+                aliases = self.config.get_aliases(unit_subtag)
+                for alias in aliases:
+                    namevalue = self.config.get_paramvalue(alias,unit_subtag,'name')
+                    print("Unit {} alias is {}. Name is {}".format(unit_subtag,alias,namevalue))
+            print("------------------------------------------")
+                
+            #params = self.config.get_params(unit_alias)
+            #for param in params:
+            #    print("Unit component is {}".format(param))
  
         """
         # self.config = Config.objects.get(pk=1)