erp5_wendelin_telecom_ingestion: handle invalids alarm disabled and minor changes in logs

bt5/erp5_wendelin_telecom_ingestion/PathTemplateItem/portal_alarms/wendelin_handle_invalids.xml

@@ -22,7 +22,7 @@
         </item>
         <item>
             <key> <string>enabled</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_wendelin_telecom_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_telecom/ERP5Site_createDataAnalysisList.py

@@ -20,7 +20,7 @@ for line_data_ingestion in portal_catalog(**query_dict):
     # Create Analysis
     try:
       try:
-        log("creating Data Analysis for Data Ingestion " + str(data_ingestion.getReference()))
+        context.logEntry("creating Data Analysis for Data Ingestion " + str(data_ingestion.getReference()))
         data_analysis = portal.data_analysis_module.newContent(
                       portal_type = "Data Analysis",
                       id = data_ingestion.getId(),
@@ -35,13 +35,13 @@ for line_data_ingestion in portal_catalog(**query_dict):
                       destination = data_ingestion.getDestination(),
                       destination_section = data_ingestion.getDestinationSection(),
                       destination_project = data_ingestion.getDestinationProject())
-        context.logEntry("Data Analyisis created for Data Ingestion %s (ID: %s)" % (str(data_ingestion.getReference()), data_analysis.getId()))
+        context.logEntry("Data Analyisis created for Data Ingestion %s (ID: %s)" % (str(data_ingestion.getReference()), data_ingestion.getId()))
       except:
-        context.logEntry("[ERROR] Error creating Data Analysis for Data Ingestion '%s' (ID: %s). Script returned" % (str(data_ingestion.getReference()), data_analysis.getId()))
+        context.logEntry("[ERROR] Error creating Data Analysis for Data Ingestion '%s' (ID: %s). Script returned" % (str(data_ingestion.getReference()), data_ingestion.getId()))
         return # Data Analysis was already created
 
       # create input and output lines
-      log("creating input and output lines")
+      context.logEntry("creating input and output lines of data analysis %s (ID: %s)" % (str(data_ingestion.getReference()), data_ingestion.getId()))
       for transformation_line in transformation.objectValues(
           portal_type=["Data Transformation Resource Line",
                        "Data Transformation Operation Line"]):
@@ -69,8 +69,7 @@ for line_data_ingestion in portal_catalog(**query_dict):
               if(related_line.getParentValue().getReference() == data_ingestion.getReference() and related_line.getParentValue().getSimulationState() == "stopped"):
                 aggregate_set.update(related_line.getAggregateSet())
                 related_line.getParentValue().deliver()
-                log("DATA INGESTION DELIVERED")
-                context.logEntry("Data Ingestion '%s' delivered. (ID: %s)" % (str(data_ingestion.getReference()), data_analysis.getId()))
+                context.logEntry("Data Ingestion '%s' delivered. (ID: %s)" % (str(data_ingestion.getReference()), data_ingestion.getId()))
           else:
             # it is an output line
             # create new item based on item_type: data array, stream, descriptor, etc.
@@ -83,8 +82,7 @@ for line_data_ingestion in portal_catalog(**query_dict):
                               version = '001')
             if "Data Descriptor" not in item_type:
               item.validate()
-            log("Creating " + str(item_type))
-            context.logEntry(str(item_type) + " created.")
+            context.logEntry(str(item_type) + " %s created (ID: %s)" % (str(data_ingestion.getReference()), data_ingestion.getId()))
             aggregate_set = set()
             aggregate_set.add(item)
 
@@ -99,6 +97,6 @@ for line_data_ingestion in portal_catalog(**query_dict):
           aggregate_value_set = aggregate_set)
 
       data_analysis.plan()
-      log("DATA ANALYSIS PLANNED")
+      context.logEntry("Data Anaysis '%s' planned. (ID: %s)" % (str(data_ingestion.getReference()), data_ingestion.getId()))
     except Exception as e:
       context.logEntry("[ERROR] Error creating Data Analysis for Data Ingestion '%s' (ID: %s): %s" % (data_ingestion.getReference(), data_ingestion.getId(), str(e)))