Changeset 973 for trunk

Timestamp:

Dec 22, 2020, 2:41:43 PM (4 years ago)

Author:

djay

Message:

Include caching.h on win32 or when json is activated and define loadHttpRequests when json is activated.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_json.h (modified) (1 diff)
• zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/service_json.h

@@ -50 +50 @@
   void printGetCapabilitiesForProcessJ(registry*, maps*,void*,void*,service*);
   void printExceptionReportResponseJ(maps*,map*);
-  void parseJRequest(maps*,service* s,json_object*,map*,maps**,maps**);
+  void parseJRequest(maps*,service*,json_object*,map*,maps**,maps**);
   json_object*  printJResult(maps*,service*,maps*,int);
   json_object* printJobStatus(maps*,char*);

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

@@ -69 +69 @@
 #include "service.h"
 
-#ifdef USE_JSON
+#ifdef defined(WIN32) || defined(USE_JSON)
 #include "caching.h"
 #endif
@@ -696 +696 @@
 }
 
+#ifdef USE_JSON
 /**
  * Run every HTTP request to download inputs passed as reference
@@ -738 +739 @@
   return 0;
 }
+#endif
 
 /**
@@ -985 +987 @@
     addToMap (request_inputs, "status", "true");
     setMapInMaps (conf, "lenv", "osid", test1->value);
-    status = getMap (request_inputs, "status");
+    //status = getMap (request_inputs, "status");
   }
   test1 = getMap (request_inputs, "usid");