Merge branch 'release/2.0.19'

EOEPCA · Jul 17, 2023 · cf87ad6 · cf87ad6
2 parents 2cba0dd + 2db8707
commit cf87ad6
Show file tree

Hide file tree

Showing 11 changed files with 646 additions and 236 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,7 @@ charts/ades/values.ades2.eoepcacreodiasdev.yaml
 charts/ades/values.eoepca-dev-ades1.terradue.yaml
 charts/ades/values.wasdi.yaml
 charts/ades/values.eoepca-dev-eoepca.terradue.yaml
+charts/ades/values.minikube.yaml
 
 # workflow executor test not yet ready
 3ty/workflow_executor/workflow_executor/workflow_executor/test

diff --git a/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/response_print.c b/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/response_print.c
@@ -1,7 +1,7 @@
 /*
  * Author : Gérald FENOY
  *
- * Copyright (c) 2009-2020 GeoLabs SARL
+ * Copyright (c) 2009-2023 GeoLabs SARL
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -2000,7 +2000,7 @@ void printProcessResponse(maps* m,map* request, int pid,service* serv,const char
 
     tmp1 = (char*)malloc((TIME_SIZE+1)*sizeof(char));
 
-    len = strftime ( tmp1, TIME_SIZE, "%Y-%m-%dT%I:%M:%SZ", tm );
+    len = strftime ( tmp1, TIME_SIZE, zDateFormat, tm );
 
     xmlNewProp(nc,BAD_CAST "creationTime",BAD_CAST tmp1);
 
@@ -2632,16 +2632,16 @@ void _printExceptionReportResponse(maps* m,map* s){
  * (when required) depending on the code.
  * 
  * @param pmsConf the maps containing the settings of the main.cfg file
- * @param psService the service
+ * @param pmError the map containing the text,code,locator keys (or a map array)
  */
-void printExceptionReportResponse(maps* pmsConf,map* psService){
+void printExceptionReportResponse(maps* pmsConf,map* pmError){
   if(getMapFromMaps(pmsConf,"lenv","hasPrinted")!=NULL)
     return;
   map* pmExecutionType=getMapFromMaps(pmsConf,"main","executionType");
   if(pmExecutionType!=NULL && strncasecmp(pmExecutionType->value,"xml",3)==0)
-    _printExceptionReportResponse(pmsConf,psService);
+    _printExceptionReportResponse(pmsConf,pmError);
   else
-    printExceptionReportResponseJ(pmsConf,psService);
+    printExceptionReportResponseJ(pmsConf,pmError);
 }
 
 /**

diff --git a/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/service.c b/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/service.c
@@ -840,18 +840,23 @@ void loadMapBinary(map** ppmOut,map* pmIn,int iPos){
     sprintf(tmp,"value_%d",iPos);
     pmTmpVin=getMap(pmIn,tmp);
     pmTmpVout=getMap(pmOut,tmp);
-    free(pmTmpVout->value);
-    pmTmpVout->value=(char*)malloc((atoi(pmSize->value)+1)*sizeof(char));
-    memmove(pmTmpVout->value,pmTmpVin->value,atoi(pmSize->value)*sizeof(char));
-    pmTmpVout->value[atoi(pmSize->value)]=0;
+    if(pmTmpVin!=NULL && pmTmpVout!=NULL){
+      free(pmTmpVout->value);
+      pmTmpVout->value=(char*)malloc((atoi(pmSize->value)+1)*sizeof(char));
+      memmove(pmTmpVout->value,pmTmpVin->value,atoi(pmSize->value)*sizeof(char));
+      pmTmpVout->value[atoi(pmSize->value)]=0;
+    }
   }else{
     if(pmSize!=NULL){
       pmTmpVin=getMap(pmIn,"value");
       pmTmpVout=getMap(pmOut,"value");
       free(pmTmpVout->value);
-      pmTmpVout->value=(char*)malloc((atoi(pmSize->value)+1)*sizeof(char));
-      memmove(pmTmpVout->value,pmTmpVin->value,atoi(pmSize->value)*sizeof(char));
-      pmTmpVout->value[atoi(pmSize->value)]=0;
+      if(pmTmpVin!=NULL && pmTmpVout!=NULL){
+	free(pmTmpVout->value);
+	pmTmpVout->value=(char*)malloc((atoi(pmSize->value)+1)*sizeof(char));
+	memmove(pmTmpVout->value,pmTmpVin->value,atoi(pmSize->value)*sizeof(char));
+	pmTmpVout->value[atoi(pmSize->value)]=0;
+      }
     }
   }
 }

diff --git a/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/service.h b/3ty/proc-comm-zoo-1.2-alpha/assets/patch/zoo/service.h
@@ -33,7 +33,10 @@
 #define ZOO_DLL_EXPORT 
 #endif
 
- // knut: add bool if necessary
+// ISO8601 compatible date format (RFC 3339)
+#define zDateFormat "%Y-%m-%dT%H:%M:%SZ"
+
+// knut: add bool if necessary
 #ifndef __cplusplus
 #ifndef WIN32
 #include <stdbool.h>