Changeset 550 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Feb 3, 2015, 12:59:21 PM (9 years ago)

Author:

djay

Message:

Add otb2zcfg and OTB applications support without observer by now. Fix issue with maxOccurs and multiple downloaded value for the same input.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -23 +23 @@
  */
 
-#define length(x) (sizeof(x) / sizeof(x[0]))
+
 
 extern "C" int yylex ();
 extern "C" int crlex ();
+
+#ifdef USE_OTB
+#include "service_internal_otb.h"
+#else
+#define length(x) (sizeof(x) / sizeof(x[0]))
+#endif
 
 #include "cgic.h"
@@ -177 +183 @@
           && atoi (testMap->value) > 1)
         {
-          if (addMapsArrayToMaps (&mo, mi, tmap->name) < 0)
+          addMapsArrayToMaps (&mo, mi, tmap->name);
+          map* nb=getMapFromMaps(mo,mi->name,"length");
+          if (nb!=NULL && atoi(nb->value)>atoi(testMap->value))
             {
               char emsg[1024];
               sprintf (emsg,
-                       _
-                       ("You set maximum occurences for <%s> as %i but you tried to use it more than the limit you set. Please correct your ZCFG file or your request."),
+                       _("You set maximum occurences for <%s> as %i but you tried to use it more than the limit you set. Please correct your ZCFG file or your request."),
                        mi->name, atoi (testMap->value));
               errorException (m, emsg, "InternalError", NULL);
@@ -609 +616 @@
     }
   else
+
+#ifdef USE_OTB
+  if (strncasecmp (r_inputs->value, "OTB", 6) == 0)
+    {
+      *eres =
+        zoo_otb_support (&m, request_inputs, s1,
+                            &request_input_real_format,
+                            &request_output_real_format);
+    }
+  else
+#endif
+
 #ifdef USE_PYTHON
   if (strncasecmp (r_inputs->value, "PYTHON", 6) == 0)