Changeset 942 for tags

Timestamp:

Jun 14, 2019, 11:05:08 PM (6 years ago)

Author:

djay

Message:

Tag the 1.7.0 release.

Location:

tags/rel-1.7.0

Files:

• . (copied) (copied from branches/branch-1.7) (1 prop)
• docs/kernel/what.rst (modified) (3 diffs)
• docs/services/zcfg-reference.rst (modified) (1 diff)
• zoo-project/zoo-kernel/otbZooWatcher.cxx (modified) (4 diffs)
• zoo-project/zoo-kernel/request_parser.c (modified) (3 diffs)
• zoo-project/zoo-kernel/service_internal_hpc.c (modified) (3 diffs)
• zoo-project/zoo-kernel/service_internal_python.c (modified) (3 diffs)
• zoo-project/zoo-kernel/sshapi.c (modified) (1 diff)

tags/rel-1.7.0/docs/kernel/what.rst

@@ -88 +88 @@
 C / C++      Shared Library      maps* M                   integer
 Java         Class File          `HashMap`_                integer
+C#           Class File          `ZMaps`_                  integer
 Python       Module File         `Dictionary`_             integer
 PHP          Script File         `Array`_                  integer
@@ -93 +94 @@
 Ruby         Script File         `Hash`_                   integer
 Fortran      Shared Library      CHARACTER*(1024) M(10,30) integer
+R            Script file         `R List`_                 integer
 JavaScript   Script file         `Object`_ or Array        Object/Array
 ============ =================== ========================= ============
@@ -101 +103 @@
 .. _`Object`: http://www.json.org/
 .. _`Hash`: http://ruby-doc.org/core-2.2.0/Hash.html
+.. _`ZMaps`: https://docs.microsoft.com/fr-fr/dotnet/api/system.collections.generic.dictionary-2?view=netframework-4.8
+.. _`R List`: https://cran.r-project.org/doc/manuals/r-release/R-lang.html#List-objects
 

tags/rel-1.7.0/docs/services/zcfg-reference.rst

@@ -223 +223 @@
        AllowedValues = -10,-8,-7,-5,-1
        rangeMin = 0
-       rangeMin = 100
+       rangeMax = 100
        rangeClosure = co
      </Default>
      <Supported>
        rangeMin = 200
-       rangeMin = 600
+       rangeMax = 600
        rangeClosure = co
      </Supported>
      <Supported>
        rangeMin = 750
-       rangeMin = 990
+       rangeMax = 990
        rangeClosure = co
        rangeSpacing = 10

tags/rel-1.7.0/zoo-project/zoo-kernel/otbZooWatcher.cxx

@@ -16 +16 @@
 =========================================================================*/
 #include "otbZooWatcher.h"
+#include "otbConfigure.h"
 #include "service_internal.h"
 
@@ -52 +53 @@
 ::StartFilter()
 {
+#if OTB_VERSION_MAJOR < 6 
   m_TimeProbe.Start();
+#endif
 }
 
@@ -59 +62 @@
 ::EndFilter()
 {
+#if OTB_VERSION_MAJOR < 6 
   m_TimeProbe.Stop();
   std::ostringstream elapsedTime;
@@ -68 +72 @@
             << " seconds)"
             << std::endl;
+#endif
 }

tags/rel-1.7.0/zoo-project/zoo-kernel/request_parser.c

@@ -1070 +1070 @@
                                                buffersize);
                                 }
-                              else if (cur5 != NULL)/*
-                                     && cur5->type == XML_CDATA_SECTION_NODE)*/{
-                                xmlFree(mv);
-                                if(cur5->content!=NULL){
-                                  mv=xmlStrdup(cur5->content);
-                                }
+                              else if (cur5 != NULL){
+                                if(ltmp!= NULL && strstr(ltmp->value,"text/")!=NULL){
+                                  xmlChar *tmp = xmlNodeListGetRawString (doc,
+                                                                          cur4->xmlChildrenNode,
+                                                                          0);
+                                  addToMap (tmpmaps->content, "value",
+                                            (char *) tmp);
+                                  xmlFree (tmp);
+                                }else{
+                                  while(cur5!=NULL && cur5->type != XML_CDATA_SECTION_NODE)
+                                    cur5=cur5->next;
+                                  xmlFree(mv);
+                                  if(cur5!=NULL && cur5->content!=NULL){
+                                    mv=xmlStrdup(cur5->content);
+                                  }
+                                }
                               }
                             }
@@ -1859 +1869 @@
   if (r_inputs == NULL){
     if(mandatory>0){
-      char *replace=_("Mandatory parameter <%s> was not specified");
+      const char *replace=_("Mandatory parameter <%s> was not specified");
       char *message=(char*)malloc((strlen(replace)+strlen(toCheck)+1)*sizeof(char));
       sprintf(message,replace,toCheck);
@@ -1908 +1918 @@
     }
     if(hasValidValue<0){
-      char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
+      const char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
       nb=0;
       char *vvalues=NULL;
-      char* num=_("is");
+      const char* num=_("is");
       while(avalues[nb]!=NULL){
         char *tvalues;

tags/rel-1.7.0/zoo-project/zoo-kernel/service_internal_hpc.c

@@ -69 +69 @@
           dupElements(cur)
         };
-        char *geoLink="wcs_link";
+        const char *geoLink="wcs_link";
         if(geo==2){
           geoLink="wfs_link";
@@ -213 +213 @@
       zooLock* lck;
       if((lck=lockFile(*conf,argv[1]->value,'r'))==NULL){
-        char* templateStr=_("Unable to lock the file for %s in read mode.");
+        const char* templateStr=_("Unable to lock the file for %s in read mode.");
         char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv[0]->value)+1)*sizeof(char));
         sprintf(tmpMessage,templateStr,argv[0]->value);
@@ -251 +251 @@
       if(unlockFile(*conf,zoo_file_locks[i])<1){
         map* argv=getMapArray(queueMaps->content,"input",i);
-        char* templateStr=_("Unable to unlock the file for %s after execution.");
+        const char* templateStr=_("Unable to unlock the file for %s after execution.");
         char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv->value)+1)*sizeof(char));
         sprintf(tmpMessage,templateStr,argv->value);

tags/rel-1.7.0/zoo-project/zoo-kernel/service_internal_python.c

@@ -355 +355 @@
 #endif
     char *pStrErrorMessage = PyString_AsString(pvalue);
-  char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
+  const char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
   
   PyObject *trace=PyObject_Str(pvalue);
@@ -393 +393 @@
       if(pbt!=NULL)
         free(pbt);
-      char* format=_("%s\nUnable to run your python process properly. Please check the following messages : %s");
+      const char* format=_("%s\nUnable to run your python process properly. Please check the following messages : %s");
       pbt=(char*)malloc((strlen(format)+strlen(tpbt)+strlen(PyString_AsString(trace))+1)*sizeof(char));
       sprintf(pbt,format,tpbt,PyString_AsString(trace));
@@ -400 +400 @@
       if(pbt!=NULL)
         free(pbt);
-      char* format=_("%s \n Unable to run your python process properly. Unable to provide any further information.");
+      const char* format=_("%s \n Unable to run your python process properly. Unable to provide any further information.");
       pbt=(char*)malloc((strlen(format)+strlen(tpbt)+strlen(PyString_AsString(trace))+1)*sizeof(char));
       sprintf(pbt,format,tpbt);

tags/rel-1.7.0/zoo-project/zoo-kernel/sshapi.c

@@ -730 +730 @@
         if((lck=lockFile(*conf,argv[1]->value,'w'))!=NULL){/**/
           if(ssh_copy(*conf,argv[1]->value,argv[2]->value,ssh_get_cnt(*conf))!=true){
-            char* templateStr=_("Unable to copy over SSH the file requested for setting the value of %s.");
+            const char* templateStr=_("Unable to copy over SSH the file requested for setting the value of %s.");
             char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv[0]->value)+1)*sizeof(char));
             sprintf(tmpMessage,templateStr,argv[0]->value);